From 85e48036e26729e7dd41e055654063da64f2d6d4 Mon Sep 17 00:00:00 2001
From: koinec <>
Date: Sun, 14 Mar 2010 11:10:39 +0000
Subject: [PATCH] *** empty log message ***

---
 deamon/drd64_marshald_cinfo.h              | 2 +-
 deamon/drd64_marshald_cmd_attach_link.c    | 1 +
 deamon/drd64_marshald_cmd_attach_report.c  | 2 +-
 deamon/drd64_marshald_cmd_attach_request.c | 5 +++--
 deamon/drd64_marshald_cmd_detach.c         | 1 +
 deamon/drd64_marshald_connect_debugd.c     | 3 +++
 6 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/deamon/drd64_marshald_cinfo.h b/deamon/drd64_marshald_cinfo.h
index db2a565..f550271 100644
--- a/deamon/drd64_marshald_cinfo.h
+++ b/deamon/drd64_marshald_cinfo.h
@@ -40,7 +40,7 @@ Comment:
 #include"drd64_marshald.h"
 
 #define	DRD64_MARSHALD_CINFOTYPE_SERVER	0x01
-#define	DRD64_MARSHALD_CINFOTYPE_DEBUG	0x02
+#define	DRD64_MARSHALD_CINFOTYPE_ATTACH	0x02
 #define	DRD64_MARSHALD_CINFOTYPE_CLIENT	0x03
 #define	DRD64_MARSHALD_CINFOTYPE_DEBUGD	0x21
 
diff --git a/deamon/drd64_marshald_cmd_attach_link.c b/deamon/drd64_marshald_cmd_attach_link.c
index cee138a..fd251a2 100644
--- a/deamon/drd64_marshald_cmd_attach_link.c
+++ b/deamon/drd64_marshald_cmd_attach_link.c
@@ -106,6 +106,7 @@ int
 	
 	p_cinfo_now->i_dest_socket		= p_cinfo_debugd->i_dest_socket;
 	p_cinfo_now->i_debugd_socket	= p_cinfo_debugd->i_dest_socket;
+	p_cinfo_now->p_dest_cinfo_connection	= p_cinfo_debugd;
 	p_cinfo_now->i_client_socket
 			= Drd64_Server_RecvStatus_GetSocketID( i_recv_id ); 
 	// p_cinfo_now->i_client_pid	= 
diff --git a/deamon/drd64_marshald_cmd_attach_report.c b/deamon/drd64_marshald_cmd_attach_report.c
index 095b979..a8455e7 100644
--- a/deamon/drd64_marshald_cmd_attach_report.c
+++ b/deamon/drd64_marshald_cmd_attach_report.c
@@ -100,7 +100,7 @@ int
 	
 	p_cinfo->i_dest_socket		= p_cinfo_debugd->i_dest_socket;
 	p_cinfo->i_debugd_socket	= p_cinfo_debugd->i_dest_socket;
-
+	p_cinfo->p_dest_cinfo_connection	= p_cinfo_debugd;
 
 	p_phead->w_packettype   |= DRD64_PACKETTYPE_OPTION_INDICATE;
 	p_phead->i_cid_client   = p_phead->i_cid_dest;
diff --git a/deamon/drd64_marshald_cmd_attach_request.c b/deamon/drd64_marshald_cmd_attach_request.c
index 3bfab74..658d59b 100644
--- a/deamon/drd64_marshald_cmd_attach_request.c
+++ b/deamon/drd64_marshald_cmd_attach_request.c
@@ -217,7 +217,7 @@ int
 
 	/* Phase 0 : Init ----------------------------*/
 	/* Phase 3-1 : Set ConnectInfo ---*/
-	p_cinfo_now->b_cinfo_type		= DRD64_MARSHALD_CINFOTYPE_DEBUG;
+	p_cinfo_now->b_cinfo_type		= DRD64_MARSHALD_CINFOTYPE_ATTACH;
 	p_cinfo_now->i_cinfo_refcount	= 1;
 
 	Drd64_LibBrownie_INetAddr_CopyInAddr(
@@ -356,7 +356,7 @@ int
 		DRD64_LOG_DEBUG("    [DEBUG]CMD: Attach Req. (Scn1) Debugd Booted");
 
 		/* Phase 3-1 : Set ConnectInfo ---*/
-		p_cinfo_now->b_cinfo_type		= DRD64_MARSHALD_CINFOTYPE_DEBUG;
+		p_cinfo_now->b_cinfo_type		= DRD64_MARSHALD_CINFOTYPE_ATTACH;
 		p_cinfo_now->i_cinfo_refcount	= 1;
 
 		Drd64_LibBrownie_INetAddr_SetInAddr_LocalHost(
@@ -367,6 +367,7 @@ int
 		strncpy( p_cinfo_now->str_dest_addr_local,
 					str_sockname_client, DRD64_MAX_PATH );
 		p_cinfo_now->p_dest_cinfo_connection	= NULL;
+				/* Set Value is AttachLink(Inet) or AttachReport(local) */
 
 		Drd64_LibBrownie_INetAddr_CopyInAddr(
 					&(p_cinfo_now->t_src_addr_inet),
diff --git a/deamon/drd64_marshald_cmd_detach.c b/deamon/drd64_marshald_cmd_detach.c
index a2d1825..438f915 100644
--- a/deamon/drd64_marshald_cmd_detach.c
+++ b/deamon/drd64_marshald_cmd_detach.c
@@ -130,6 +130,7 @@ int
 	assert( NULL != p_cinfo_now );
 
 	i_socket	= p_cinfo_now->i_src_socket;
+	Drd64_Marshald_Dispatch_CloseSocket( p_cinfo_now->i_dest_socket );
 
 	Drd64_Marshald_Cinfo_FreeConnectInfo( p_cinfo_now );
 	p_cinfo_now		= NULL;
diff --git a/deamon/drd64_marshald_connect_debugd.c b/deamon/drd64_marshald_connect_debugd.c
index 7f34b32..1d72e75 100644
--- a/deamon/drd64_marshald_connect_debugd.c
+++ b/deamon/drd64_marshald_connect_debugd.c
@@ -103,6 +103,9 @@ Drd64_Marshald_ConnectInfo *
 		p_cinfo->i_client_socket		= -1;
 		p_cinfo->i_client_pid			= -1;
 
+		Drd64_Server_RecvStatus_SetConnectionInfoPointer(
+									p_recv, (void *)p_cinfo );
+
 		DRD64_LOG_DEBUG("  [DEBUG]SEND: Connect Cmd (for Debugd) Ended");
 	}
 
-- 
2.11.0