*** empty log message ***

diff --git a/deamon/drd64_marshald_cmd_attach_request.c b/deamon/drd64_marshald_cmd_attach_request.c
index dc56a14..17bb07c 100644 (file)
--- a/deamon/drd64_marshald_cmd_attach_request.c
+++ b/deamon/drd64_marshald_cmd_attach_request.c
@@ -69,7 +69,9 @@ int
        //assert( -1 != i_fds );
 
        /* Set Answer Data ---------*/
-       p_attach->i_connect_id                  = p_phead->i_cid_dest;  //XXX
+       //p_attach->i_cid                                       = p_phead->i_cid_dest;  //XXX
+       p_attach->i_cid_debugd                  = p_attach->i_cid_marshald;
+       p_attach->i_cid_marshald                = DRD64_CONNECTID_NONE;
 
        p_phead->w_packettype           = DRD64_PACKETTYPE_ANSWER;
        p_phead->i_cid_dest                             = p_phead->i_cid_client;
@@ -113,7 +115,8 @@ int
 
        /* Set Answer Data ---------*/
        p_phead->w_packettype           = DRD64_PACKETTYPE_ANSWER;
-       p_attach->i_connect_id                  = p_phead->i_cid_dest;
+       //p_attach->i_cid                                       = p_phead->i_cid_dest;
+       //p_attach->i_cid_debugd                        = p_phead->i_cid_dest;
 
        i_fds = p_cinfo->i_src_socket;
        i_wlen  = send( i_fds, (void *)p_phead,
@@ -321,7 +324,9 @@ int
                /* Phase 3-2 : Set Attach Request Struct Answer data */
                strncpy( p_attach->str_debugd_sockname,
                                        str_sockname_client, DRD64_MAX_PATH );
-               p_attach->i_debugd_pid  = i_pid_debugd;
+               p_attach->i_debugd_pid          = i_pid_debugd;
+               p_attach->i_cid_debugd          = DRD64_CONNECTID_NONE;
+               p_attach->i_cid_marshald        = p_cinfo_now->i_cinfo_id;
                
        }
 

diff --git a/include/drd64_packet.h b/include/drd64_packet.h
index 37ec02c..3fed9e9 100644 (file)
--- a/include/drd64_packet.h
+++ b/include/drd64_packet.h
@@ -118,7 +118,8 @@ typedef struct      {
        struct  in_addr         t_prog_addr;
 
        /* Answer Data */
-       INT                                     i_connect_id;
+       INT                                     i_cid_debugd;
+       INT                                     i_cid_marshald;
        INT                                     i_debugd_pid;
        char                            str_debugd_sockname[DRD64_MAX_PATH+1];
 

diff --git a/libdrd64/drd64_libdrd64_cmd_attach.c b/libdrd64/drd64_libdrd64_cmd_attach.c
index 0515d00..4154dda 100644 (file)
--- a/libdrd64/drd64_libdrd64_cmd_attach.c
+++ b/libdrd64/drd64_libdrd64_cmd_attach.c
@@ -120,8 +120,9 @@ int
        }
        if( 0x00 != i_err )             { return 0x01; }
 
-       p_attach->i_prog_pid    = i_prog_pid;
-       p_attach->i_connect_id  = -1;
+       p_attach->i_prog_pid            = i_prog_pid;
+       p_attach->i_cid_debugd          = DRD64_CONNECTID_NONE;
+       p_attach->i_cid_marshald        = DRD64_CONNECTID_NONE;
 
        /* Phase 2 : Send Attach-Request Packet --- */
        i_err   = Drd64_LibDrd64_Packet_SendPacket(
@@ -140,6 +141,7 @@ int
        p_cinfo->i_prog_pid             = i_prog_pid;
        
        p_cinfo->i_debugd_pid   = p_attach->i_debugd_pid;
+       p_cinfo->i_debugd_cid   = p_attach->i_cid_debugd;
        strncpy( p_cinfo->str_debugd_addr_local,
                                p_attach->str_debugd_sockname,
                                DRD64_MAX_PATH );
@@ -153,8 +155,9 @@ int
 
        
        p_cinfo->i_marshald_pid = drd64_libdrd64_minfo.i_marshald_pid;  
-       p_cinfo->i_marshald_cid = p_attach->i_connect_id;
+       p_cinfo->i_marshald_cid = p_attach->i_cid_marshald;
        p_cinfo->i_marshald_socket      = drd64_libdrd64_minfo.i_marshald_socket;
+
        
        return 0x00;
 }