OSDN Git Service

*** empty log message ***
authorkoinec <>
Sun, 7 Feb 2010 07:05:50 +0000 (07:05 +0000)
committerkoinec <>
Sun, 7 Feb 2010 07:05:50 +0000 (07:05 +0000)
deamon/drd64_debugd_cmd_attach_link.c
deamon/drd64_marshald_cmd_attach_request.c
deamon/drd64_marshald_cmd_connect.c
deamon/drd64_marshald_cmd_disconnect.c
include/drd64_packet.h

index a9ba131..554ec68 100644 (file)
@@ -53,7 +53,6 @@ int
        assert( NULL != p_recv );
        i_fds   = p_recv->i_fds_id;
 
-       p_phead->w_packettype   = DRD64_PACKETTYPE_ANSWER;
        p_phead->w_packettype   |= DRD64_PACKETTYPE_FLAG_ANSWER;
 
        p_debugd->i_socket_client = i_fds;
index e4e92f1..6ece17b 100644 (file)
@@ -73,7 +73,6 @@ int
        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->w_packettype                   |= DRD64_PACKETTYPE_FLAG_ANSWER;
        p_phead->i_cid_dest                             = p_phead->i_cid_client;
        p_phead->i_cid_src                              = DRD64_CONNECTID_NONE;
@@ -115,7 +114,6 @@ int
        assert( -1 != i_fds );
 
        /* Set Answer Data ---------*/
-       p_phead->w_packettype           = DRD64_PACKETTYPE_ANSWER;
        p_phead->w_packettype                   |= DRD64_PACKETTYPE_FLAG_ANSWER;
        //p_attach->i_cid                                       = p_phead->i_cid_dest;
        //p_attach->i_cid_debugd                        = p_phead->i_cid_dest;
@@ -380,7 +378,6 @@ int
        if( DRD64_SERVER_RECVSTATUS_STATUS_READ == b_packet_status )    {
                /* Scenery 5 : Recv. Answer Trans. Attach req. from Inet Marshald -*/
                if( DRD64_IsPacketType_Answer( p_phead ) )      {
-               //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 );
index 5fd1ef5..f0ad667 100644 (file)
@@ -122,10 +122,7 @@ int
 
 
        /* Set Answer Data ---------*/
-       p_phead->w_packettype           = DRD64_PACKETTYPE_ANSWER;
-       printf("type: %x\n", p_phead->w_packettype );
        p_phead->w_packettype           |= DRD64_PACKETTYPE_FLAG_ANSWER;
-       printf("type: %x\n", p_phead->w_packettype );
     p_connect->i_connect_id            = p_cinfo->i_cinfo_id;
     p_connect->i_marshald_pid  = getpid();
 
@@ -151,7 +148,6 @@ int
        DRD64_LOG_VERBOSE("[STAT]CMD: Connect");
        
        if( DRD64_IsPacketType_Answer( p_phead ) )      {
-       //if( DRD64_PACKETTYPE_ANSWER == p_phead->w_packettype )        {
                i_result        = Drd64_Marshald_Cmd_Connect_Client(
                                                                i_recv_id, p_phead, p_connect );
 
index d709e2f..a8e311f 100644 (file)
@@ -63,10 +63,7 @@ int
 
        Drd64_Marshald_Cinfo_FreeConnectInfo( p_cinfo );
 
-       //XXX
-       p_phead->w_packettype   = DRD64_PACKETTYPE_ANSWER;
        p_phead->w_packettype   |= DRD64_PACKETTYPE_FLAG_ANSWER;
-
        p_phead->i_result               = 0x00;
        p_phead->i_error                = 0x00;
        p_phead->i_datalen              = 0;
index 97b01ef..10b4e2d 100644 (file)
@@ -60,7 +60,7 @@ Comment:
 
 #define        DRD64_PACKETTYPE_REQUEST        0x0001
 #define        DRD64_PACKETTYPE_TRANSPORT      0x0002
-#define        DRD64_PACKETTYPE_ANSWER         0x0003
+//#define      DRD64_PACKETTYPE_ANSWER         0x0003
 #define        DRD64_PACKETTYPE_INFO           0x0004
 
 #define        DRD64_PACKETTYPE_FLAG_ANSWER            0x1000