OSDN Git Service

*** empty log message ***
authorkoinec <>
Sun, 6 Dec 2009 11:59:20 +0000 (11:59 +0000)
committerkoinec <>
Sun, 6 Dec 2009 11:59:20 +0000 (11:59 +0000)
libdrd64/drd64_libdrd64.h
libdrd64/drd64_libdrd64_cmd_attach.c
libdrd64/drd64_libdrd64_cmd_connect.c

index 0c79827..5c67aaf 100644 (file)
@@ -44,6 +44,7 @@ Comment:
 #include<unistd.h>
 #include<time.h>
 #include<errno.h>
+#include<assert.h>
 #include<sys/types.h>
 #include<sys/param.h>
 #include<sys/select.h>
index 796c8e6..0515d00 100644 (file)
@@ -42,11 +42,26 @@ int
                Drd64_LibDrd64_ConnectInfo      *p_cinfo )
 {
        int             i_err;
+       int             i_socket;
        int             i_socket_marshald;
-       Byte    b_commtype;
        Drd64_PacketHeader                      *p_phead;
-       Drd64_PacketData_AttachRequest          *p_attach;
-       /* Phase 1 : Set Packet Data --- */
+
+       assert( NULL != p_cinfo );
+
+       /* Phase 1 : Create Socket for Debugd */
+       if( DRD64_LIBDRD64_CINFO_COMMTYPE_LOCAL == p_cinfo->b_commtype )        {
+               i_socket = Drd64_LibBrownie_Socket_InitSocketClient_Local(
+                                                                       p_cinfo->str_debugd_addr_local );
+       }
+       else    {
+               i_socket = Drd64_LibBrownie_Socket_InitSocketClient_INet(
+                                                                       &(p_cinfo->t_debugd_addr_inet),
+                                                                       DRD64_SOCKET_NETWORK_PORT );
+       }
+
+       if( 0 > i_socket )              { return -1; }
+
+       /* Phase 2 : Set Packet Data --- */
        p_phead = (Drd64_PacketHeader *)gp_buffer;
 
        Drd64_LibDrd64_Packet_SetPacketHeader(
@@ -55,11 +70,13 @@ int
                                                        DRD64_COMMAND_ATTACH_LINK,
                                                        0 );
 
-       /* Phase 2 : Create Socket for Debugd */
-       
-
-
        /* Phase 3 : Send & Recv. Attach-Link Cmd */
+       i_err   = Drd64_LibDrd64_Packet_SendPacket(
+                                               i_socket, gp_buffer, 0, 0, 0x01 );
+       printf("attach Link: %d\n", i_err );
+       if( 0 > i_err )         {
+               return -2;
+       }
 
 
        return 0x00;
@@ -92,15 +109,11 @@ int
                = (Drd64_PacketData_AttachRequest *)DRD64_PacketData( gp_buffer );
 
        if( !strcmp( pstr_hostname, "localhost" ) )             {
-               /* GOMI : i_err = Drd64_LibDrd64_INet_SetInAddr_LocalHost(
-                                               &(p_attach->t_prog_addr) );*/
                i_err   = Drd64_LibBrownie_INetAddr_SetInAddr_LocalHost(
                                                &(p_attach->t_prog_addr) );
                b_commtype      = DRD64_LIBDRD64_CINFO_COMMTYPE_LOCAL;
        }
        else    {
-               /* GOMI : i_err = Drd64_LibDrd64_INet_SetInAddr(
-                                               &(p_attach->t_prog_addr), pstr_hostname ); */
                i_err   = Drd64_LibBrownie_INetAddr_SetInAddr_fromFQDN(
                                                &(p_attach->t_prog_addr), pstr_hostname );
                b_commtype      = DRD64_LIBDRD64_CINFO_COMMTYPE_INET;
index 2cc1b8c..da4ae46 100644 (file)
@@ -58,8 +58,6 @@ int
 
        p_connect       = (Drd64_PacketData_Connect *)DRD64_PacketData( gp_buffer );
        p_connect->i_client_pid = getpid();
-       /* GOMI : i_err = Drd64_LibDrd64_INet_SetInAddr_LocalHost(
-                                                       &(p_connect->t_client_addr_inet) ); */
        i_err   = Drd64_LibBrownie_INetAddr_SetInAddr_LocalHost(
                                                        &(p_connect->t_client_addr_inet) );
 
@@ -67,7 +65,6 @@ int
        p_connect->i_connect_id         = -1;
                
        /* Create Local marshald Socket */
-       /* GOMI : Drd64_LibDrd64_Socket_InitSocket_Local( */
        i_socket_marshald
                        = Drd64_LibBrownie_Socket_InitSocketClient_Local(
                                                DRD64_SOCKET_LOCAL_NAME_MARSHALD );