X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_networkclient.c;h=d0e9e6d197afd729d7ab38660907affe0e1b971c;hb=cf7cb2463d47a4a9ed36c8d1c13f188418389437;hp=839818efb2f74986cf91bea8ce73de6eaf3c72e4;hpb=a80ade9d4c5b3e0dcd31b44418c5271e0c89a337;p=citadel.git

diff --git a/citadel/modules/network/serv_networkclient.c b/citadel/modules/network/serv_networkclient.c
index 839818efb..d0e9e6d19 100644
--- a/citadel/modules/network/serv_networkclient.c
+++ b/citadel/modules/network/serv_networkclient.c
@@ -789,10 +789,10 @@ eNextState nwc_connect_ip(AsyncIO *IO)
 	       ChrPtr(NW->host),
 	       ChrPtr(NW->port));
 	
-	return InitEventIO(IO, NW, 
-			   NWC_ConnTimeout, 
-			   NWC_ReadTimeouts[0],
-			   1);
+	return EvConnectSock(IO, NW, 
+			     NWC_ConnTimeout, 
+			     NWC_ReadTimeouts[0],
+			     1);
 }
 
 void RunNetworker(AsyncNetworker *NW)
@@ -807,7 +807,7 @@ void RunNetworker(AsyncNetworker *NW)
 	NW->IO.Terminate     = NWC_Terminate;
 	NW->IO.LineReader    = NWC_ReadServerStatus;
 	NW->IO.ConnFail      = NWC_ConnFail;
-	NW->IO.DNSFail       = NWC_DNSFail;
+	NW->IO.DNS.Fail      = NWC_DNSFail;
 	NW->IO.Timeout       = NWC_Timeout;
 	NW->IO.ShutdownAbort = NWC_Shutdown;
 	
@@ -820,6 +820,10 @@ void RunNetworker(AsyncNetworker *NW)
 	SubC->session_specific_data = (char*) NW;
 	NW->IO.CitContext = SubC;
 
+	safestrncpy(SubC->cs_host, 
+		    ChrPtr(NW->host),
+		    sizeof(SubC->cs_host)); 
+
 	if (NW->IO.ConnectMe->IsIP) {
 		QueueEventContext(&NW->IO,
 				  nwc_connect_ip);