From 9183719e0c6693a9bd0bb1be1a669301b8d286bf Mon Sep 17 00:00:00 2001 From: koinec <> Date: Sun, 24 Jan 2010 04:26:15 +0000 Subject: [PATCH] *** empty log message *** --- deamon/drd64_marshald_cinfo.h | 2 ++ deamon/drd64_marshald_cmd_attach_request.c | 17 +++++++++++++++++ deamon/drd64_marshald_cmd_connect.c | 15 ++++++++++++++- deamon/drd64_marshald_send_connect.c | 4 ++++ include/drd64_packet.h | 2 +- 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/deamon/drd64_marshald_cinfo.h b/deamon/drd64_marshald_cinfo.h index 60ccda8..03d03d9 100644 --- a/deamon/drd64_marshald_cinfo.h +++ b/deamon/drd64_marshald_cinfo.h @@ -78,9 +78,11 @@ typedef struct { /* Debugd Info. */ /*struct in_addr t_debugd_addr_inet; (= t_prog_addr_inet )*/ int i_debugd_pid; + int i_debugd_socket; /* Client Info. */ struct in_addr t_client_addr_inet; + int i_client_socket; int i_client_pid; } Drd64_Marshald_ConnectInfo; diff --git a/deamon/drd64_marshald_cmd_attach_request.c b/deamon/drd64_marshald_cmd_attach_request.c index c00f3ad..dc56a14 100644 --- a/deamon/drd64_marshald_cmd_attach_request.c +++ b/deamon/drd64_marshald_cmd_attach_request.c @@ -43,6 +43,8 @@ Comment: #define DRD64_CMDSTATUS_ATTACHREQ_WAITEXEC 0x03 +/*---------------------------------------------------------------------- +----------------------------------------------------------------------*/ int Drd64_Marshald_Cmd_AttachRequest_Scn5_RecvTranAttachReq( int i_recv_id, @@ -86,6 +88,8 @@ int } +/*---------------------------------------------------------------------- +----------------------------------------------------------------------*/ int Drd64_Marshald_Cmd_AttachRequest_Scn4_RecvBootInfo( int i_recv_id, @@ -127,6 +131,8 @@ int } +/*---------------------------------------------------------------------- +----------------------------------------------------------------------*/ int Drd64_Marshald_Cmd_AttachRequest_Scn2_ConnectINetMarshald( int i_recv_id, @@ -162,6 +168,8 @@ int } +/*---------------------------------------------------------------------- +----------------------------------------------------------------------*/ int Drd64_Marshald_Cmd_AttachRequest_Scn3_TransAttachRequest( int i_recv_id, @@ -203,6 +211,8 @@ int } +/*---------------------------------------------------------------------- +----------------------------------------------------------------------*/ int Drd64_Marshald_Cmd_AttachRequest_Scn1_BootDebugd( int i_recv_id, @@ -296,11 +306,16 @@ int &(p_cinfo_now->t_prog_addr_inet), &(p_attach->t_prog_addr) ); p_cinfo_now->i_prog_pid = p_attach->i_prog_pid; + p_cinfo_now->i_debugd_pid = i_pid_debugd; + p_cinfo_now->i_debugd_socket = -1; + /* Set i_debugd_socket Value is AttachReport Phase */ Drd64_LibBrownie_INetAddr_CopyInAddr( &(p_cinfo_now->t_client_addr_inet), &(p_cinfo_marshald->t_client_addr_inet) ); + p_cinfo_now->i_client_socket = -1; + /* Set i_debugd_socket Value is AttachLink Phase */ p_cinfo_now->i_client_pid = p_cinfo_marshald->i_client_pid; /* Phase 3-2 : Set Attach Request Struct Answer data */ @@ -321,6 +336,8 @@ int } +/*---------------------------------------------------------------------- +----------------------------------------------------------------------*/ int Drd64_Marshald_Cmd_AttachRequest( int i_recv_id, diff --git a/deamon/drd64_marshald_cmd_connect.c b/deamon/drd64_marshald_cmd_connect.c index 805b67d..59eb85a 100644 --- a/deamon/drd64_marshald_cmd_connect.c +++ b/deamon/drd64_marshald_cmd_connect.c @@ -37,6 +37,15 @@ Comment: #include"drd64_marshald.h" +/*---------------------------------------------------------------------- +static int + Drd64_Intel64_DisAsm_GetSize_SizeID( + : Get Operand Size form Intel 64 DB SizeID + + int i_operandsize, : [src] Default Operand Size + Word w_methodtype, : [src] Method Type ID + Word w_sizeid ) : [src] Size ID +----------------------------------------------------------------------*/ int Drd64_Marshald_Cmd_Connect_Client( int i_fds, @@ -60,6 +69,8 @@ int } +/*---------------------------------------------------------------------- +----------------------------------------------------------------------*/ int Drd64_Marshald_Cmd_Connect_Server( int i_recv_id, @@ -101,11 +112,13 @@ int p_cinfo->i_prog_pid = -1; p_cinfo->i_debugd_pid = -1; + p_cinfo->i_debugd_socket = -1; Drd64_LibBrownie_INetAddr_CopyInAddr( &(p_cinfo->t_client_addr_inet), &(p_connect->t_client_addr_inet) ); - p_cinfo->i_client_pid = p_connect->i_client_pid; + p_cinfo->i_client_socket = i_fds; + p_cinfo->i_client_pid = p_connect->i_client_pid; /* Set Answer Data ---------*/ diff --git a/deamon/drd64_marshald_send_connect.c b/deamon/drd64_marshald_send_connect.c index 53ba9cd..f594fe0 100644 --- a/deamon/drd64_marshald_send_connect.c +++ b/deamon/drd64_marshald_send_connect.c @@ -37,6 +37,8 @@ Comment: #include"drd64_marshald.h" +/*---------------------------------------------------------------------- +----------------------------------------------------------------------*/ Drd64_Marshald_ConnectInfo * Drd64_Marshald_SendCmd_Connect( struct in_addr *p_addr_dest, @@ -132,9 +134,11 @@ Drd64_Marshald_ConnectInfo * p_cinfo->i_prog_pid = -1; p_cinfo->i_debugd_pid = -1; + p_cinfo->i_debugd_socket = -1; i_err = Drd64_LibBrownie_INetAddr_SetInAddr_LocalHost( &(p_cinfo->t_client_addr_inet) ); + p_cinfo->i_client_socket = i_socket_inet; p_cinfo->i_client_pid = getpid(); diff --git a/include/drd64_packet.h b/include/drd64_packet.h index b4819f0..37ec02c 100644 --- a/include/drd64_packet.h +++ b/include/drd64_packet.h @@ -110,7 +110,7 @@ typedef struct { } __attribute((packed)) Drd64_PacketData_Connect; -/* CMD: Attach Data ===================================*/ +/* CMD: Attach Request ===================================*/ typedef struct { /* Request Data */ -- 2.11.0