X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=libdrd64%2Fdrd64_libdrd64_cmd_connect.c;h=c85722215fc66b72c2061ef7b0b2874bed3dfbfb;hb=bdb2f7746a1b4a74df2bcb947779c9b9162048b4;hp=eb78cb29a8f48cb66ab36569b7390880d29bc47f;hpb=4af3e35cf718f8fce30ea04be16592a8c5e278ca;p=drdeamon64%2Fdrdeamon64.git

diff --git a/libdrd64/drd64_libdrd64_cmd_connect.c b/libdrd64/drd64_libdrd64_cmd_connect.c
index eb78cb2..c857222 100644
--- a/libdrd64/drd64_libdrd64_cmd_connect.c
+++ b/libdrd64/drd64_libdrd64_cmd_connect.c
@@ -36,6 +36,8 @@ Comment:
 
 #include"drd64_libdrd64.h"
 
+
+LIBDRD64_FUNC
 int
 	Drd64_LibDrd64_Cmd_Connect(
 		void )
@@ -47,28 +49,26 @@ int
 
 	p_phead	= (Drd64_PacketHeader *)gp_buffer;
 
-	p_phead->w_header		= DRD64_PACKET_HEADER;
-	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;
-	p_phead->i_result		= 0x00;
-	p_phead->i_error		= 0x00;
-	p_phead->i_datalen		= sizeof( Drd64_PacketData_Connect );
+	Drd64_LibDrd64_Packet_SetPacketHeader(
+							p_phead,
+        					DRD64_CONNECTID_NONE,
+							DRD64_PACKETTYPE_CONTROL, 
+							DRD64_COMMAND_CONNECT,
+        					sizeof( Drd64_PacketData_Connect ) );
+
 
-	p_connect	= gp_buffer + sizeof( Drd64_PacketHeader );
+	p_connect	= (Drd64_PacketData_Connect *)DRD64_PacketData( gp_buffer );
 	p_connect->i_client_pid	= getpid();
-	i_err	= Drd64_LibDrd64_INet_SetInAddr_LocalHost(
+	i_err	= Drd64_LibBrownie_INetAddr_SetInAddr_LocalHost(
 							&(p_connect->t_client_addr_inet) );
-	p_connect->i_client_cinfo_id	= -1;
 
+	p_connect->i_client_cinfo_id	= -1;
 	p_connect->i_connect_id		= -1;
 		
 	/* Create Local marshald Socket */
 	i_socket_marshald
-			= Drd64_LibDrd64_Socket_InitSocket_Local(
+			= Drd64_LibBrownie_Socket_InitSocketClient_Local(
 						DRD64_SOCKET_LOCAL_NAME_MARSHALD );
-	printf("cnt = %d\n", i_socket_marshald );
 
 	/* Request Attach */
 	i_err	= Drd64_LibDrd64_Packet_SendPacket(
@@ -76,7 +76,6 @@ int
 					sizeof( Drd64_PacketData_Connect ),
 					sizeof( Drd64_PacketData_Connect ),
 					0x01 );
-	printf("connect: %d\n", i_err );
 	if( 0 > i_err )		{
 		return 0x01;
 	}