OSDN Git Service

*** empty log message ***
authorkoinec <>
Mon, 22 Feb 2010 12:51:36 +0000 (12:51 +0000)
committerkoinec <>
Mon, 22 Feb 2010 12:51:36 +0000 (12:51 +0000)
deamon/drd64_marshald_cmd_attach_link.c
deamon/drd64_marshald_connect_debugd.c

index a49c577..ea2a98b 100644 (file)
@@ -101,22 +101,18 @@ int
        assert( NULL != p_cinfo_now );
 
        /* [Phase 1] Create UNIX-Sokcet for Debugd =========*/
-       /*p_cinfo_debugd        = Drd64_Marshald_Connect_Debugd(
+       p_cinfo_debugd  = Drd64_Marshald_Connect_Debugd(
                                                p_alink->str_debugd_sockname,
                                                p_cinfo_now->i_prog_pid,
                                                p_cinfo_now->i_debugd_pid );
-       */
-
-
-       DRD64_LOG_DEBUG("  [DEBUG]SEND: Connect Cmd (for Debugd) Start");
+       
 
-       p_cinfo_debugd = Drd64_Marshald_Search_DebugdConnection(
+       /*p_cinfo_debugd = Drd64_Marshald_Search_DebugdConnection(
                                                        p_cinfo_now->i_prog_pid );
        if( NULL != p_cinfo_debugd )   {
                p_cinfo_debugd->i_cinfo_refcount++;
        }
        else    {
-               /* Phase 3 : Create INet-Marshald Socket ------*/
                i_socket = Drd64_LibBrownie_Socket_InitSocketClient_Local(
                                                                                p_alink->str_debugd_sockname );
                if( 0 > i_socket )      { return i_result; }
@@ -132,17 +128,17 @@ int
                p_cinfo_debugd->i_dest_socket           = i_socket;
                strncpy( p_cinfo_debugd->str_dest_addr_local,
                                        p_alink->str_debugd_sockname, DRD64_MAX_PATH );
-               /* p_cinfo_debugd->t_src_addr_inet     = NONE */
+               // p_cinfo_debugd->t_src_addr_inet     = NONE 
                p_cinfo_debugd->i_src_cinfo_id          = -1;
                p_cinfo_debugd->i_src_socket            = -1;
-               /* t_prog_addr_inet             = NONE */
+               // t_prog_addr_inet             = NONE 
                p_cinfo_debugd->i_prog_pid                      = p_cinfo_now->i_prog_pid;
                p_cinfo_debugd->i_debugd_pid            = p_cinfo_now->i_debugd_pid;
                p_cinfo_debugd->i_debugd_socket         = i_socket;
-               /* p_cinfo->t_client_addr_inet  = NONE */
+               // p_cinfo->t_client_addr_inet  = NONE 
                p_cinfo_debugd->i_client_socket         = -1;
                p_cinfo_debugd->i_client_pid            = -1;
-       }
+       }*/
 
        printf("%p\n", p_cinfo_debugd);
 
index ed6614e..56a4586 100644 (file)
@@ -56,46 +56,44 @@ Drd64_Marshald_ConnectInfo *
                p_cinfo->i_cinfo_refcount++;
                
                DRD64_LOG_DEBUG("  [DEBUG]SEND: Connect Cmd (for Debugd) Exit");
-
-               return  p_cinfo;
        }
-
-       /* Phase 3 : Create INet-Marshald Socket ------*/
-       i_socket = Drd64_LibBrownie_Socket_InitSocketClient_Local(
+       else    {
+               /* Phase 3 : Create INet-Marshald Socket ------*/
+               i_socket = Drd64_LibBrownie_Socket_InitSocketClient_Local(
                                                                pstr_socketname_debugd );
-       if( 0 > i_socket )      { return NULL; }
+               if( 0 > i_socket )      { return NULL; }
 
-       /* Phase 2 : Init & Set Packet Data ----------*/
-       p_cinfo = Drd64_Marshald_CInfo_AllocConnectInfo();
-       if( NULL == p_cinfo )   { return NULL; }
+               /* Phase 2 : Init & Set Packet Data ----------*/
+               p_cinfo = Drd64_Marshald_CInfo_AllocConnectInfo();
+               if( NULL == p_cinfo )   { return NULL; }
 
-       /* Phase 5 : Set Cinfo Data ------------------*/
-       p_cinfo->b_cinfo_type                   = DRD64_MARSHALD_CINFOTYPE_DEBUGD;
-       p_cinfo->i_cinfo_refcount               = 1;
+               /* Phase 5 : Set Cinfo Data ------------------*/
+               p_cinfo->b_cinfo_type                   = DRD64_MARSHALD_CINFOTYPE_DEBUGD;
+               p_cinfo->i_cinfo_refcount               = 1;
 
-       //Drd64_LibBrownie_INetAddr_SetInAddr_LocalHost(
-       //                                      &(p_cinfo->t_dest_addr_inet) );
-       p_cinfo->i_dest_cinfo_id                = -1;
-       p_cinfo->i_dest_socket                  = i_socket;
-       //strncpy( p_cinfo->str_dest_addr_local,
-       //                      pstr_socketname_debugd, DRD64_MAX_PATH );
+               Drd64_LibBrownie_INetAddr_SetInAddr_LocalHost(
+                                                       &(p_cinfo->t_dest_addr_inet) );
+               p_cinfo->i_dest_cinfo_id                = -1;
+               p_cinfo->i_dest_socket                  = i_socket;
+               strncpy( p_cinfo->str_dest_addr_local,
+                                       pstr_socketname_debugd, DRD64_MAX_PATH );
 
-       /* p_cinfo->t_src_addr_inet             = NONE */
-       p_cinfo->i_src_cinfo_id                 = -1;
-       p_cinfo->i_src_socket                   = -1;
+               /* p_cinfo->t_src_addr_inet             = NONE */
+               p_cinfo->i_src_cinfo_id                 = -1;
+               p_cinfo->i_src_socket                   = -1;
 
-       /* t_prog_addr_inet                     = NONE */
-       p_cinfo->i_prog_pid                             = i_prog_pid;
+               /* t_prog_addr_inet                     = NONE */
+               p_cinfo->i_prog_pid                             = i_prog_pid;
 
-       p_cinfo->i_debugd_pid                   = i_debugd_pid;
-       p_cinfo->i_debugd_socket                = i_socket;
+               p_cinfo->i_debugd_pid                   = i_debugd_pid;
+               p_cinfo->i_debugd_socket                = i_socket;
 
-       /* p_cinfo->t_client_addr_inet  = NONE */
-       p_cinfo->i_client_socket                = -1;
-       p_cinfo->i_client_pid                   = -1;
+               /* p_cinfo->t_client_addr_inet  = NONE */
+               p_cinfo->i_client_socket                = -1;
+               p_cinfo->i_client_pid                   = -1;
 
-       DRD64_LOG_DEBUG("  [DEBUG]SEND: Connect Cmd (for Debugd) Ended");
-       printf("%p\n", p_cinfo);
+               DRD64_LOG_DEBUG("  [DEBUG]SEND: Connect Cmd (for Debugd) Ended");
+       }
 
        return p_cinfo;
 }