*** empty log message ***

diff --git a/deamon/drd64_debugd_send_cmd_bootinfo.c b/deamon/drd64_debugd_send_cmd_bootinfo.c
index b824182..93e377a 100644 (file)
--- a/deamon/drd64_debugd_send_cmd_bootinfo.c
+++ b/deamon/drd64_debugd_send_cmd_bootinfo.c
@@ -54,7 +54,7 @@ int
        memset( gp_sendbuffer, 0x00, ( sizeof( Drd64_PacketHeader ) ));
 
        p_phead->w_header               = DRD64_PACKET_HEADER;
-       p_phead->i_connect_id   = DRD64_CONNECTID_DIRECT;
+       p_phead->i_cid_dest             = DRD64_CONNECTID_DIRECT;
        p_phead->dw_command             = DRD64_COMMAND_DEBUGD_BOOTINFO;
        p_phead->w_packettype   = DRD64_PACKETTYPE_INFO;
        p_phead->i_datalen              = 0;

diff --git a/deamon/drd64_marshald_cmd_attach_request.c b/deamon/drd64_marshald_cmd_attach_request.c
index 4bb102f..2f95033 100644 (file)
--- a/deamon/drd64_marshald_cmd_attach_request.c
+++ b/deamon/drd64_marshald_cmd_attach_request.c
@@ -39,7 +39,7 @@ Comment:
 
 #define DRD64_CMDSTATUS_ATTACHREQ_NORMAL               0x00
 #define DRD64_CMDSTATUS_ATTACHREQ_WAITCONNECT  0x01
-#define DRD64_CMDSTATUS_ATTACHREQ_WAITTRANS            0x02
+//#define DRD64_CMDSTATUS_ATTACHREQ_WAITTRANS          0x02
 #define DRD64_CMDSTATUS_ATTACHREQ_WAITEXEC             0x03
 
 
@@ -58,7 +58,7 @@ int
        DRD64_LOG_DEBUG("  [DEBUG]CMD: Attach Req. (Scn5:RecvTransAttachReq) Start");
 
        p_cinfo = Drd64_Marshald_CInfo_GetConnectInfo(
-                                                                       p_phead->i_connect_id );
+                                                                       p_phead->i_cid_dest );
        assert( NULL != p_cinfo );
 
        i_fds   = Drd64_Server_RecvStatus_GetSocketID( i_recv_id );
@@ -66,7 +66,7 @@ int
 
        /* Set Answer Data ---------*/
        p_phead->w_packettype           = DRD64_PACKETTYPE_ANSWER;
-       p_attach->i_connect_id                  = p_phead->i_connect_id;
+       p_attach->i_connect_id                  = p_phead->i_cid_dest;
 
        i_wlen  = send( i_fds, (void *)p_phead,
                                                DRD64_PacketSize(p_phead), 0x00 );
@@ -94,7 +94,7 @@ int
        DRD64_LOG_DEBUG("  [DEBUG]CMD: Attach Req. (Scn4:RecvBootInfo) Start");
 
        p_cinfo = Drd64_Marshald_CInfo_GetConnectInfo(
-                                                                       p_phead->i_connect_id );
+                                                                       p_phead->i_cid_dest );
        assert( NULL != p_cinfo );
 
        i_fds   = Drd64_Server_RecvStatus_GetSocketID( i_recv_id );
@@ -102,7 +102,7 @@ int
 
        /* Set Answer Data ---------*/
        p_phead->w_packettype           = DRD64_PACKETTYPE_ANSWER;
-       p_attach->i_connect_id                  = p_phead->i_connect_id;
+       p_attach->i_connect_id                  = p_phead->i_cid_dest;
 
        i_fds = p_cinfo->i_src_socket;
        i_wlen  = send( i_fds, (void *)p_phead,
@@ -163,7 +163,6 @@ int
                Drd64_Marshald_MasterInformation        *p_marshald )
 {
        int             i_err;
-       //int           i_connect_id;
        Drd64_Marshald_ConnectInfo      *p_cinfo;
 
        /* XXX : Error Check from Connect */
@@ -173,10 +172,9 @@ int
                                                        &(p_attachreq->t_prog_addr) );
        assert( NULL != p_cinfo );
 
-       //i_connect_id  = p_phead->i_connect_id;
        p_phead->w_packettype   = DRD64_PACKETTYPE_TRANSPORT;
        //p_phead->i_resume_recvstatus_id = i_recv_id;
-       p_phead->i_connect_id   = p_cinfo->i_dest_cinfo_id;
+       p_phead->i_cid_dest             = p_cinfo->i_dest_cinfo_id;
 
        i_err  = send( p_cinfo->i_dest_socket, (void *)p_phead,
                                 DRD64_PacketSize(p_phead), 0x00 );
@@ -185,7 +183,6 @@ int
         return 0x02;
     }
 
-       //p_phead->i_connect_id = i_connect_id;
 
        /*Drd64_Server_RecvStatus_SetCmdStatus( i_recv_id,
                                                DRD64_CMDSTATUS_ATTACHREQ_WAITTRANS );*/
@@ -222,7 +219,7 @@ int
                { return 0x00; }
 
        p_cinfo_marshald
-               = Drd64_Marshald_CInfo_GetConnectInfo( p_phead->i_connect_id );
+               = Drd64_Marshald_CInfo_GetConnectInfo( p_phead->i_cid_dest );
 
 
        /* Phase 1 : Generate Debugd Param -----------*/
@@ -283,7 +280,7 @@ int
                Drd64_Server_INetAddr_CopyInAddr(
                                        &(p_cinfo_now->t_src_addr_inet),
                                        &(p_cinfo_marshald->t_client_addr_inet) );
-               p_cinfo_now->i_src_cinfo_id                     = p_phead->i_connect_id;
+               p_cinfo_now->i_src_cinfo_id                     = p_phead->i_cid_dest;
                p_cinfo_now->i_src_socket                       = p_cinfo_marshald->i_src_socket;
 
                /*Drd64_Server_INetAddr_SetInAddr_LocalHost(
@@ -344,7 +341,11 @@ int
 
 
        if( DRD64_SERVER_RECVSTATUS_STATUS_READ == b_packet_status )    {
+               /* Scenery 5 : Recv. Answer Trans. Attach req. from Inet Marshald -*/
                if( DRD64_PACKETTYPE_ANSWER == p_phead->w_packettype )  {
+                       i_result
+                               = Drd64_Marshald_Cmd_AttachRequest_Scn5_RecvTranAttachReq(
+                                               i_recv_id, p_phead, p_attachreq, p_marshald );
 
                }
                else    {
@@ -378,11 +379,11 @@ int
                                                i_recv_id, p_phead, p_attachreq, p_marshald );
                }
                /* Scenery 5 : Recv. Answer Trans. Attach req. from Inet Marshald -*/
-               else if( DRD64_CMDSTATUS_ATTACHREQ_WAITTRANS == i_cmd_status )  {
+               /*else if( DRD64_CMDSTATUS_ATTACHREQ_WAITTRANS == i_cmd_status )        {
                        i_result
                                = Drd64_Marshald_Cmd_AttachRequest_Scn5_RecvTranAttachReq(
                                                i_recv_id, p_phead, p_attachreq, p_marshald );
-               }
+               }*/
 
        }
        else    {

diff --git a/deamon/drd64_marshald_send_connect.c b/deamon/drd64_marshald_send_connect.c
index 96f3c8d..34998d2 100644 (file)
--- a/deamon/drd64_marshald_send_connect.c
+++ b/deamon/drd64_marshald_send_connect.c
@@ -71,7 +71,7 @@ Drd64_Marshald_ConnectInfo *
                                                                + sizeof( Drd64_PacketData_Connect ) ));
 
        p_phead->w_header               = DRD64_PACKET_HEADER;
-       p_phead->i_connect_id   = DRD64_CONNECTID_DIRECT;
+       p_phead->i_cid_dest             = DRD64_CONNECTID_DIRECT;
        p_phead->dw_command             = DRD64_COMMAND_CONNECT;
        p_phead->w_packettype   = DRD64_PACKETTYPE_REQUEST;
        p_phead->i_datalen              = sizeof( Drd64_PacketData_Connect );

diff --git a/include/drd64_packet.h b/include/drd64_packet.h
index d80a3b0..a424754 100644 (file)
--- a/include/drd64_packet.h
+++ b/include/drd64_packet.h
@@ -69,7 +69,8 @@ typedef struct        {
        Word    w_header;       /* 0x8664*/
 
        /* Comm. */
-       INT             i_connect_id;
+       INT             i_cid_dest;
+       INT             i_cid_src;
        //Byte  b_commtype;
 
        /* Command */

diff --git a/libdrd64/drd64_libdrd64_cmd_attach.c b/libdrd64/drd64_libdrd64_cmd_attach.c
index 48f4cb3..ed143db 100644 (file)
--- a/libdrd64/drd64_libdrd64_cmd_attach.c
+++ b/libdrd64/drd64_libdrd64_cmd_attach.c
@@ -50,7 +50,7 @@ int
        p_phead = (Drd64_PacketHeader *)gp_buffer;
 
        p_phead->w_header               = DRD64_PACKET_HEADER;
-       p_phead->i_connect_id   = drd64_libdrd64_minfo.i_marshald_connectid;
+       p_phead->i_cid_dest             = drd64_libdrd64_minfo.i_marshald_connectid;
        p_phead->dw_command             = DRD64_COMMAND_ATTACH_REQUEST;
        p_phead->w_packettype   = DRD64_PACKETTYPE_REQUEST;
        p_phead->i_resume_recvstatus_id = -1;

diff --git a/libdrd64/drd64_libdrd64_cmd_connect.c b/libdrd64/drd64_libdrd64_cmd_connect.c
index e13af50..eb78cb2 100644 (file)
--- a/libdrd64/drd64_libdrd64_cmd_connect.c
+++ b/libdrd64/drd64_libdrd64_cmd_connect.c
@@ -48,7 +48,7 @@ int
        p_phead = (Drd64_PacketHeader *)gp_buffer;
 
        p_phead->w_header               = DRD64_PACKET_HEADER;
-       p_phead->i_connect_id   = DRD64_CONNECTID_DIRECT;
+       p_phead->i_cid_dest             = DRD64_CONNECTID_DIRECT;
        p_phead->dw_command             = DRD64_COMMAND_CONNECT;
        p_phead->w_packettype   = DRD64_PACKETTYPE_REQUEST;
        p_phead->i_resume_recvstatus_id = -1;

diff --git a/libdrd64/drd64_libdrd64_cmd_disconnect.c b/libdrd64/drd64_libdrd64_cmd_disconnect.c
index 6552abf..2a27d69 100644 (file)
--- a/libdrd64/drd64_libdrd64_cmd_disconnect.c
+++ b/libdrd64/drd64_libdrd64_cmd_disconnect.c
@@ -48,7 +48,7 @@ int
        p_phead = (Drd64_PacketHeader *)gp_buffer;
 
        p_phead->w_header               = DRD64_PACKET_HEADER;
-       p_phead->i_connect_id   = drd64_libdrd64_minfo.i_marshald_connectid;
+       p_phead->i_cid_dest             = drd64_libdrd64_minfo.i_marshald_connectid;
        p_phead->dw_command             = DRD64_COMMAND_DISCONNECT;
        p_phead->w_packettype   = DRD64_PACKETTYPE_REQUEST;
        p_phead->i_resume_recvstatus_id = -1;