*** empty log message ***

diff --git a/deamon/Makefile b/deamon/Makefile
index 84679bc..2f276b2 100644 (file)
--- a/deamon/Makefile
+++ b/deamon/Makefile
@@ -57,7 +57,6 @@ SERVER_HEADER = drd64_server.h \
                                drd64_server_debuglog.h \
                                $(SUPER_HEADER)
 SERVER_OBJS =  drd64_server_common.o \
-                               drd64_server_inetaddr.o \
                                drd64_server_recvsocket.o \
                                drd64_server_recvstatus.o \
                                drd64_server_socket.o \
@@ -165,9 +164,6 @@ drd64_marshald_send_connect.o: drd64_marshald_send_connect.c $(MARSHALD_HEADER)
 #
 #
 
-drd64_server_inetaddr.o: drd64_server_inetaddr.c $(SERVER_HEADER)
-       $(CC) -c -o drd64_server_inetaddr.o $(FLAGS_DEBUG) drd64_server_inetaddr.c
-
 drd64_server_socket.o: drd64_server_socket.c $(SERVER_HEADER)
        $(CC) -c -o drd64_server_socket.o $(FLAGS_DEBUG) drd64_server_socket.c
 

diff --git a/deamon/drd64_debugd_main.c b/deamon/drd64_debugd_main.c
index cf9923a..c5e9433 100644 (file)
--- a/deamon/drd64_debugd_main.c
+++ b/deamon/drd64_debugd_main.c
@@ -99,7 +99,6 @@ int
        Drd64_Server_RecvSocket_InitReadBuffer();
 
        /* Create Socket from Local Client or Marshald */
-       /* GOMI : Drd64_Server_Socket_InitSocket_Local( p_debugd->str_socketname ); */
        p_debugd->i_socket_debugd =
                Drd64_LibBrownie_Socket_InitSocketServer_Local(
                        p_debugd->str_socketname );

diff --git a/deamon/drd64_debugd_send_cmd_bootinfo.c b/deamon/drd64_debugd_send_cmd_bootinfo.c
index ccb7c66..1852318 100644 (file)
--- a/deamon/drd64_debugd_send_cmd_bootinfo.c
+++ b/deamon/drd64_debugd_send_cmd_bootinfo.c
@@ -64,7 +64,6 @@ int
        p_phead->i_error                = 0x00;
 
        /* Phase 2 : Create Local-Marshald Socket ------*/
-       /* GOMI : Drd64_Server_Socket_InitSocket_Local_Client( */
        i_socket_temp   =
                Drd64_LibBrownie_Socket_InitSocketClient_Local(
                                                DRD64_SOCKET_LOCAL_NAME_MARSHALD ); 

diff --git a/deamon/drd64_marshald_cinfo.c b/deamon/drd64_marshald_cinfo.c
index 16be93d..67f072d 100644 (file)
--- a/deamon/drd64_marshald_cinfo.c
+++ b/deamon/drd64_marshald_cinfo.c
@@ -57,9 +57,6 @@ Drd64_Marshald_ConnectInfo    *
 
                if( DRD64_MARSHALD_CINFOTYPE_CLIENT
                                                                == p_cinfo->b_cinfo_type )      {
-                       /* GOMI: if( 0x00 == Drd64_Server_INetAddr_CmpInAddr( p_addr,
-                                                               &(p_cinfo->t_dest_addr_inet)) )
-                               { return p_cinfo; } */
                        if( 0x00 == Drd64_LibBrownie_INetAddr_CmpInAddr(
                                                        p_addr, &(p_cinfo->t_dest_addr_inet)) )
                                { return p_cinfo; }

diff --git a/deamon/drd64_marshald_cmd_attach_request.c b/deamon/drd64_marshald_cmd_attach_request.c
index 95c2d21..c00f3ad 100644 (file)
--- a/deamon/drd64_marshald_cmd_attach_request.c
+++ b/deamon/drd64_marshald_cmd_attach_request.c
@@ -279,8 +279,6 @@ int
                p_cinfo_now->b_cinfo_type               = DRD64_MARSHALD_CINFOTYPE_DEBUG;
                p_cinfo_now->i_cinfo_refcount   = 1;
 
-               /* GOMI : Drd64_Server_INetAddr_SetInAddr_LocalHost(
-                                                       &(p_cinfo_now->t_dest_addr_inet) ); */
                Drd64_LibBrownie_INetAddr_SetInAddr_LocalHost(
                                                        &(p_cinfo_now->t_dest_addr_inet) );
                p_cinfo_now->i_dest_cinfo_id            = -1;
@@ -288,27 +286,18 @@ int
                strncpy( p_cinfo_now->str_dest_addr_local,
                                        str_sockname_server, DRD64_MAX_PATH );
 
-               /* GOMI : Drd64_Server_INetAddr_CopyInAddr(
-                                       &(p_cinfo_now->t_src_addr_inet),
-                                       &(p_cinfo_marshald->t_client_addr_inet) ); */
                Drd64_LibBrownie_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_cid_dest;
                p_cinfo_now->i_src_socket                       = p_cinfo_marshald->i_src_socket;
 
-               /* GOMI : Drd64_Server_INetAddr_CopyInAddr(
-                                                       &(p_cinfo_now->t_prog_addr_inet),
-                                                       &(p_attach->t_prog_addr) ); */
                Drd64_LibBrownie_INetAddr_CopyInAddr(
                                                        &(p_cinfo_now->t_prog_addr_inet),
                                                        &(p_attach->t_prog_addr) );
                p_cinfo_now->i_prog_pid                         = p_attach->i_prog_pid;
                p_cinfo_now->i_debugd_pid                       = i_pid_debugd;
 
-               /* GOMI : Drd64_Server_INetAddr_CopyInAddr(
-                                                       &(p_cinfo_now->t_client_addr_inet),
-                                                       &(p_cinfo_marshald->t_client_addr_inet) ); */
                Drd64_LibBrownie_INetAddr_CopyInAddr(
                                                        &(p_cinfo_now->t_client_addr_inet),
                                                        &(p_cinfo_marshald->t_client_addr_inet) );
@@ -359,9 +348,6 @@ int
        if( -1 == i_cmd_status )
                { return i_result; }
        
-       /* GOMI : i_inet_flag   = Drd64_Server_INetAddr_CmpInAddr(
-                                               &(p_attachreq->t_prog_addr),
-                                               &(p_marshald->t_marshald_addr) );*/
        i_inet_flag     = Drd64_LibBrownie_INetAddr_CmpInAddr(
                                                &(p_attachreq->t_prog_addr),
                                                &(p_marshald->t_marshald_addr) );

diff --git a/deamon/drd64_marshald_cmd_connect.c b/deamon/drd64_marshald_cmd_connect.c
index 9fff96c..805b67d 100644 (file)
--- a/deamon/drd64_marshald_cmd_connect.c
+++ b/deamon/drd64_marshald_cmd_connect.c
@@ -91,9 +91,6 @@ int
        p_cinfo->i_dest_socket                  = -1;
        p_cinfo->str_dest_addr_local[0] = '\0'; 
 
-       /* GOMI : Drd64_Server_INetAddr_CopyInAddr(
-                                               &(p_cinfo->t_src_addr_inet),
-                                               &(p_connect->t_client_addr_inet) ); */
        Drd64_LibBrownie_INetAddr_CopyInAddr(
                                                &(p_cinfo->t_src_addr_inet),
                                                &(p_connect->t_client_addr_inet) );
@@ -105,9 +102,6 @@ int
 
        p_cinfo->i_debugd_pid                   = -1;
 
-       /* GOMI : Drd64_Server_INetAddr_CopyInAddr(
-                               &(p_cinfo->t_client_addr_inet),
-                               &(p_connect->t_client_addr_inet) ); */
        Drd64_LibBrownie_INetAddr_CopyInAddr(
                                &(p_cinfo->t_client_addr_inet),
                                &(p_connect->t_client_addr_inet) );

diff --git a/deamon/drd64_marshald_main.c b/deamon/drd64_marshald_main.c
index dc718ab..f6e9245 100644 (file)
--- a/deamon/drd64_marshald_main.c
+++ b/deamon/drd64_marshald_main.c
@@ -91,7 +91,6 @@ int
        if( 0x00 != i_err )             { return i_err; }
 
        /* */
-       /* GOMI : Drd64_Server_Socket_InitSocket_Local */
        p_marshald->i_socket_local
                = Drd64_LibBrownie_Socket_InitSocketServer_Local(
                                        DRD64_SOCKET_LOCAL_NAME_MARSHALD );
@@ -100,7 +99,6 @@ int
                                                                                                "errno",errno,NULL,0);
 
        /* */
-       /* GOMI : Drd64_Server_Socket_InitSocket_INet( */
        p_marshald->i_socket_inet =
                Drd64_LibBrownie_Socket_InitSocketServer_INet(
                                        "INADDR_ANY", DRD64_SOCKET_NETWORK_PORT );
@@ -109,8 +107,6 @@ int
                                                                                                "errno",errno,NULL,0);
 
        /* */
-       /* GOMI : i_err = Drd64_Server_INetAddr_SetInAddr_LocalHost(
-                                                               &(p_marshald->t_marshald_addr) ); */
        i_err   = Drd64_LibBrownie_INetAddr_SetInAddr_LocalHost(
                                                                &(p_marshald->t_marshald_addr) );
        if( 0x00 != i_err )             { return 0x02; }

diff --git a/deamon/drd64_marshald_send_connect.c b/deamon/drd64_marshald_send_connect.c
index 82f510e..db84ee6 100644 (file)
--- a/deamon/drd64_marshald_send_connect.c
+++ b/deamon/drd64_marshald_send_connect.c
@@ -86,15 +86,12 @@ Drd64_Marshald_ConnectInfo *
        p_connect->i_client_pid                 = getpid();
        p_connect->i_client_cinfo_id    = p_cinfo->i_cinfo_id;
        p_connect->i_connect_id                 = -1;
-       /* GOMI : i_err = Drd64_Server_INetAddr_SetInAddr_LocalHost(
-                                                               &(p_connect->t_client_addr_inet) ); */
        i_err   = Drd64_LibBrownie_INetAddr_SetInAddr_LocalHost(
                                                                &(p_connect->t_client_addr_inet) );
        /* XXX : i_err Handling  */
        
 
        /* Phase 3 : Create INet-Marshald Socket ------*/
-       /* GOMI:        Drd64_Server_Socket_InitSocketClient_INet( */
        i_socket_inet   =
                Drd64_LibBrownie_Socket_InitSocketClient_INet(
                                                p_addr_dest, DRD64_SOCKET_NETWORK_PORT ); 
@@ -119,9 +116,6 @@ Drd64_Marshald_ConnectInfo *
        p_cinfo->b_cinfo_type                   = DRD64_MARSHALD_CINFOTYPE_CLIENT;
        p_cinfo->i_cinfo_refcount               = 1;
 
-       /* GOMI : Drd64_Server_INetAddr_CopyInAddr(
-                                               &(p_cinfo->t_dest_addr_inet),
-                                               p_addr_dest ); */
        Drd64_LibBrownie_INetAddr_CopyInAddr(
                                                &(p_cinfo->t_dest_addr_inet),
                                                p_addr_dest );
@@ -139,8 +133,6 @@ Drd64_Marshald_ConnectInfo *
 
        p_cinfo->i_debugd_pid                   = -1;
 
-       /* GOMI : i_err = Drd64_Server_INetAddr_SetInAddr_LocalHost(
-                                                               &(p_cinfo->t_client_addr_inet) ); */
        i_err   = Drd64_LibBrownie_INetAddr_SetInAddr_LocalHost(
                                                                &(p_cinfo->t_client_addr_inet) );
        p_cinfo->i_client_pid                   = getpid();

diff --git a/deamon/drd64_server_inetaddr.c b/deamon/drd64_server_inetaddr.c
deleted file mode 100644 (file)
index ad2583b..0000000
--- a/deamon/drd64_server_inetaddr.c
+++ /dev/null
@@ -1,86 +0,0 @@
-/*DrDeAmOn64DrDeAmOn64DrDeAmOn64DrDeAmOn64DrDeAmOn64DrDeAmOn64DrDeAmOn64
-
-                         D r . D e a m o n  6 4
-                        for INTEL64(R), AMD64(R)
-       
-   Copyright(C) 2007-2009 Koine Yuusuke(koinec). All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY Koine Yuusuke(koinec) ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL Koine Yuusuke(koinec) OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-DrDeAmOn64DrDeAmOn64DrDeAmOn64DrDeAmOn64DrDeAmOn64DrDeAmOn64DrDeAmOn64*/
-
-/* File Info -----------------------------------------------------------
-File: drd64_.c
-Function: 
-Comment: 
-----------------------------------------------------------------------*/
-
-#include"drd64_server.h"
-
-int
-       Drd64_Server_INetAddr_CmpInAddr(
-               struct  in_addr *p_dest, 
-               struct  in_addr *p_src )
-{
-       /* XXX */
-       return (( p_dest->s_addr == p_src->s_addr ) ? 0x00 : 0x01 );
-}
-
-
-int
-       Drd64_Server_INetAddr_CopyInAddr(
-               struct  in_addr *p_dest,
-               struct  in_addr *p_src )
-{
-       /* XXX : only FreeBSD */
-       memcpy( p_dest, p_src, sizeof( struct in_addr ) );
-
-       return 0x00;
-}
-
-
-int
-       Drd64_Server_INetAddr_SetInAddr_LocalHost(
-               struct  in_addr *p_addr )
-{
-       char    str_hostname[ 256 ];
-       struct  hostent         *p_hent;
-
-       if( NULL == p_addr )    { return 0xff; }
-
-       if( 0 != gethostname( str_hostname, sizeof( str_hostname ) ))
-               { return 0x01; }
-
-       p_hent  = gethostbyname( str_hostname );
-       if( NULL == p_hent )    { return 0x02; }
-
-       if( NULL == p_hent->h_addr_list )       { return 0x03; }
- 
-       /* XXX : only FreeBSD */
-       memcpy( p_addr, *(p_hent->h_addr_list), p_hent->h_length );
-
-       return 0x00;
-}
-
-
-
-/* EOF of drd64_.c ----------------------------------- */

diff --git a/deamon/drd64_server_socket.c b/deamon/drd64_server_socket.c
index 60d93c6..624ad3f 100644 (file)
--- a/deamon/drd64_server_socket.c
+++ b/deamon/drd64_server_socket.c
@@ -99,7 +99,7 @@ int
 }
 
 
-
+/*
 int
        Drd64_Server_Socket_InitSocket_Local(
                const char *pstr_addr )
@@ -129,8 +129,9 @@ int
        
        return i_socket_local;
 }
+*/
 
-
+/*
 int
        Drd64_Server_Socket_InitSocket_INet(
                const char *pstr_addr, 
@@ -172,8 +173,8 @@ int
        
        return i_socket_inet;
 }
-
-
+*/
+/*
 int
        Drd64_Server_Socket_InitSocket_Local_Client(
                const char *pstr_socket )
@@ -194,8 +195,8 @@ int
 
        return i_socket_local;
 }
-
-
+*/
+/*
 int
        Drd64_Server_Socket_InitSocketClient_INet(
                struct  in_addr         *p_addr, 
@@ -226,6 +227,6 @@ int
 
        return i_socket_inet;
 }
-
+*/
 
 /* EOF of drd64_.c ----------------------------------- */

diff --git a/drdrv1.c b/drdrv1.c
index 0a3ff3e..0c36b2b 100644 (file)
--- a/drdrv1.c
+++ b/drdrv1.c
@@ -56,8 +56,8 @@ int
        Drd64_LibDrd64_InitSystem();
        Drd64_LibDrd64_Cmd_Connect();
 
-       Drd64_LibDrd64_Cmd_Attach( i_target_pid, "localhost" );
-       //Drd64_LibDrd64_Cmd_Attach( i_target_pid, "dev64.koinec.jp" );
+       //Drd64_LibDrd64_Cmd_Attach( i_target_pid, "localhost" );
+       Drd64_LibDrd64_Cmd_Attach( i_target_pid, "dev64.koinec.jp" );
 
        sleep(2);
        Drd64_LibDrd64_Cmd_DisConecct();