OSDN Git Service

*** empty log message ***
authorkoinec <>
Sun, 24 Jan 2010 12:00:06 +0000 (12:00 +0000)
committerkoinec <>
Sun, 24 Jan 2010 12:00:06 +0000 (12:00 +0000)
deamon/drd64_debugd_cmd_attach_link.c
deamon/drd64_debugd_dispatch.c
deamon/drd64_marshald_cmd_attach_link.c
include/drd64_packet.h
libdrd64/drd64_libdrd64_cmd_attach.c

index 8ebfd1a..de7984d 100644 (file)
@@ -40,6 +40,7 @@ int
        Drd64_Debugd_Cmd_AttachLink(
                int             i_recv_id,
                Drd64_PacketHeader      *p_phead,
+               Drd64_PacketData_AttachLink             *p_alink,
                Drd64_Debugd_MasterInformation  *p_debugd )
 {
        int             i_wlen;
index 0743f75..747fa31 100644 (file)
@@ -121,7 +121,7 @@ int
        /* CMD: Attach Link -------------------------------*/
        else if( DRD64_COMMAND_ATTACH_LINK == p_phead->dw_command )     {
                i_result        = Drd64_Debugd_Cmd_AttachLink(
-                                                       i_recv_id, p_phead, p_debugd );
+                                                       i_recv_id, p_phead, pv_data, p_debugd );
        }
        /* CMD: No Support Command ------------------------*/
        else    {
index 1be5b75..4c61ec7 100644 (file)
@@ -44,7 +44,7 @@ int
        Drd64_Marshald_Cmd_AttachLink(
                int             i_recv_id,
                Drd64_PacketHeader      *p_phead,
-               void                            *p_nondata,
+               Drd64_PacketData_AttachLink                     *p_alink,
                Drd64_Marshald_MasterInformation        *p_marshald )
 {
        int             i_result;
index 3fed9e9..63683bb 100644 (file)
@@ -126,6 +126,15 @@ typedef struct     {
 } __attribute((packed)) Drd64_PacketData_AttachRequest;
 
 
+/* CMD: Attach Link ===================================*/
+
+typedef struct {
+       /* Request Data */
+       char                            str_debugd_sockname[DRD64_MAX_PATH+1];
+
+       /* Answer Data */
+
+} __attribute((packed)) Drd64_PacketData_AttachLink;
 
 #endif /* DRD64_HEADER_XXX */
 
index 4154dda..4752de5 100644 (file)
@@ -44,7 +44,8 @@ int
        int             i_err;
        int             i_socket;
        int             i_socket_marshald;
-       Drd64_PacketHeader                      *p_phead;
+       Drd64_PacketHeader                              *p_phead;
+       Drd64_PacketData_AttachLink             *p_alink;
 
        assert( NULL != p_cinfo );
 
@@ -66,13 +67,19 @@ int
 
        Drd64_LibDrd64_Packet_SetPacketHeader(
                                                        p_phead,
-                                                       DRD64_CONNECTID_NONE,
+                                                       p_cinfo->i_debugd_cid,
                                                        DRD64_COMMAND_ATTACH_LINK,
-                                                       0 );
+                                                       sizeof( Drd64_PacketData_AttachLink ) );
+
+       p_alink
+               = (Drd64_PacketData_AttachLink *)DRD64_PacketData( gp_buffer );
 
        /* Phase 3 : Send & Recv. Attach-Link Cmd */
        i_err   = Drd64_LibDrd64_Packet_SendPacket(
-                                               i_socket, gp_buffer, 0, 0, 0x01 );
+                                               i_socket, gp_buffer,
+                                               sizeof( Drd64_PacketData_AttachLink ),
+                                               sizeof( Drd64_PacketData_AttachLink ),
+                                               0x01 );
        printf("attach Link: %d\n", i_err );
        if( 0 > i_err )         {
                return -2;
@@ -152,7 +159,6 @@ int
                        &(p_cinfo->t_debugd_addr_inet),
                        &(p_attach->t_prog_addr) );
        puts( p_cinfo->str_debugd_addr_local );
-
        
        p_cinfo->i_marshald_pid = drd64_libdrd64_minfo.i_marshald_pid;  
        p_cinfo->i_marshald_cid = p_attach->i_cid_marshald;