From f4acee3bb437baf22f70bb9eeec02091c1a7ede2 Mon Sep 17 00:00:00 2001
From: koinec <>
Date: Sun, 28 Mar 2010 03:25:41 +0000
Subject: [PATCH] *** empty log message ***

---
 deamon/drd64_marshald_cmd_attach_request.c | 21 +++++++++++----------
 deamon/drd64_marshald_connect_marshald.c   |  9 +++++----
 deamon/drd64_marshald_send_connect_count.c | 19 ++++++++++++++++++-
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/deamon/drd64_marshald_cmd_attach_request.c b/deamon/drd64_marshald_cmd_attach_request.c
index f6432bb..52cdd14 100644
--- a/deamon/drd64_marshald_cmd_attach_request.c
+++ b/deamon/drd64_marshald_cmd_attach_request.c
@@ -170,7 +170,7 @@ int
 
 /*----------------------------------------------------------------------
 ----------------------------------------------------------------------*/
-#define	DRD64_FUNCID_Marshald_Cmd_AttachRequest_Scn2_ConnectINetMarshald	0x12
+#define	DRD64_FUNCID_Marshald_Cmd_AttachRequest_Scn2	0x12
 int
 	Drd64_Marshald_Cmd_AttachRequest_Scn2_ConnectINetMarshald(
 		int		i_recv_id,
@@ -184,23 +184,20 @@ int
 	DWord	dw_location;
 	Drd64_Marshald_ConnectInfo	*p_cinfo_inet;
 
-	DRD64_LOG_DEBUG("  [DEBUG]CMD: Attach Req. (Scn2:ConnectINetMarshald) Start");
+	DRD64_LOG_DEBUG(
+		"  [DEBUG]CMD: Attach Req. (Scn2:ConnectINetMarshald) Start");
 
-	i_result	= DRD64_MARSHALD_DISPATCH_RESULT_CLOSE;		// XXX > error
+	i_result	= DRD64_MARSHALD_DISPATCH_RESULT_CLOSE;
 	dw_errcode	= DRD64_ERROR_CODE_CLEAR;
 	dw_location	= DRD64_ERROR_SET_LOCATION(
 						DRD64_ERROR_MODULE_MARSHALD,
 						DRD64_ERROR_ARCH_NODEPEND,
 						DRD64_SRCID_MARSHALD_CMD_ATTACH_REQUEST,
-						DRD64_FUNCID_Marshald_Cmd_AttachRequest_Scn4 );
+						DRD64_FUNCID_Marshald_Cmd_AttachRequest_Scn2 );
 
 	i_err	= Drd64_Marshald_Connect_Marshald(
 				&p_cinfo_inet, &(p_attachreq->t_prog_addr), i_recv_id );
 
-	/*p_cinfo_inet = Drd64_Marshald_SendCmd_Connect(
-							&(p_attachreq->t_prog_addr), i_recv_id ); */
-
-	//if( NULL != p_cinfo_inet )	{
 	if( 0 < i_err )	{
 		i_result
 			= Drd64_Marshald_Cmd_AttachRequest_Scn3_TransAttachRequest(
@@ -214,10 +211,14 @@ int
 		i_result	= DRD64_MARSHALD_DISPATCH_RESULT_POLL; 
 	}
 	else	{
-
+		dw_errcode  = DRD64_ERROR_SET_CODE( DRD64_ERROR_TYPE_ERROR,
+						DRD64_ERROR_PTN_FUNCTION, 0x00, 0x01 );
+        Drd64_LibBrownie_Error_SetErrorInfo(
+						dw_errcode, dw_location, errno );
 	}
 
-	DRD64_LOG_DEBUG("  [DEBUG]CMD: Attach Req. (Scn2:ConnectINetMarshald) Ended");
+	DRD64_LOG_DEBUG(
+		"  [DEBUG]CMD: Attach Req. (Scn2:ConnectINetMarshald) Ended");
 
 	return i_result;
 }
diff --git a/deamon/drd64_marshald_connect_marshald.c b/deamon/drd64_marshald_connect_marshald.c
index ef7ac24..7388249 100644
--- a/deamon/drd64_marshald_connect_marshald.c
+++ b/deamon/drd64_marshald_connect_marshald.c
@@ -71,10 +71,10 @@ int
 									p_cinfo, 1, i_resume_rid );
 		if( 0x00 != i_err )		{
 			dw_errcode  = DRD64_ERROR_SET_CODE( DRD64_ERROR_TYPE_ERROR,
-								DRD64_ERROR_PTN_FUNCTION, 0x00, 0x06 );
+								DRD64_ERROR_PTN_FUNCTION, 0x00, 0x01 );
 			Drd64_LibBrownie_Error_SetErrorInfo(
 								dw_errcode, dw_location, errno );
-			i_result	= -0x02;
+			i_result	= -0x01;
 		}
 		else	{
 			*pp_cinfo	= p_cinfo;
@@ -86,13 +86,14 @@ int
 							&p_cinfo, p_addr_dest, i_resume_rid );
 		if( 0x00 != i_err )		{
 			dw_errcode  = DRD64_ERROR_SET_CODE( DRD64_ERROR_TYPE_ERROR,
-								DRD64_ERROR_PTN_FUNCTION, 0x00, 0x06 );
+								DRD64_ERROR_PTN_FUNCTION, 0x00, 0x02 );
 			Drd64_LibBrownie_Error_SetErrorInfo(
 								dw_errcode, dw_location, errno );
-			i_result	= -0x01;
+			i_result	= -0x02;
 		}
 		else	{
 			*pp_cinfo	= p_cinfo;
+			i_result	= 0;
 		}
 	}
 
diff --git a/deamon/drd64_marshald_send_connect_count.c b/deamon/drd64_marshald_send_connect_count.c
index 90642f6..d0d7d39 100644
--- a/deamon/drd64_marshald_send_connect_count.c
+++ b/deamon/drd64_marshald_send_connect_count.c
@@ -34,11 +34,13 @@ Function:
 Comment: 
 ----------------------------------------------------------------------*/
 
+#define	DRD64_SRCID_MARSHALD_SEND_CONNECT_COUNT		0x0000
 #include"drd64_marshald.h"
 
 
 /*----------------------------------------------------------------------
 ----------------------------------------------------------------------*/
+#define	DRD64_FUNCID_Marshald_SendCmd_ConnectCount	0x01
 int
 	Drd64_Marshald_SendCmd_ConnectCount(
 		Drd64_Marshald_ConnectInfo	*p_cinfo,
@@ -46,12 +48,22 @@ int
 		int		i_rid_resume )
 {
 	int							i_wlen;
+	DWord						dw_errcode;
+	DWord						dw_location;
 	Drd64_PacketHeader			*p_phead;
 	Drd64_PacketData_ConnectCount	*p_ccount;
 
 	DRD64_LOG_DEBUG(
 		"  [DEBUG]SEND: ConnectCount Cmd (for INet-Marshald) Start");
 
+	dw_errcode  = DRD64_ERROR_CODE_CLEAR;
+	dw_location = DRD64_ERROR_SET_LOCATION(
+						DRD64_ERROR_MODULE_MARSHALD,
+						DRD64_ERROR_ARCH_NODEPEND,
+						DRD64_SRCID_MARSHALD_SEND_CONNECT_COUNT,
+						DRD64_FUNCID_Marshald_SendCmd_ConnectCount );
+
+
 	/* Phase 1 : Check Exist Same-Connection */
 	p_phead	= (Drd64_PacketHeader *)gp_sendbuffer;
 	memset( gp_sendbuffer, 0x00, ( sizeof( Drd64_PacketHeader )
@@ -87,7 +99,12 @@ int
 								DRD64_PacketSize(p_phead), 0x00 );
 	DRD64_DEBUG_PRINT("send",i_wlen,"FD",p_cinfo->i_dest_socket,"errno",errno);
 	if( i_wlen != DRD64_PacketSize(p_phead) )	{
-		return -1; 
+		dw_errcode  = DRD64_ERROR_SET_CODE( DRD64_ERROR_TYPE_ERROR,
+						DRD64_ERROR_PTN_SOCKET, 0x00, 0x01 );
+		Drd64_LibBrownie_Error_SetErrorInfo(
+						dw_errcode, dw_location, errno );
+
+		return -0x01; 
 	} 
 
 	DRD64_LOG_DEBUG(
-- 
2.11.0