X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetworkclient%2Fserv_networkclient.c;h=5c38f46ed762f258306ba873c159f11a6a86bf65;hb=2cee4d2ec180e6267d59d3ee4c4f9e38021a5cb1;hp=95badfb6854383974c3d9478ce20b5d2602105e7;hpb=1493fd8ff0de73d30336607b43b1c8113ffcffa2;p=citadel.git

diff --git a/citadel/modules/networkclient/serv_networkclient.c b/citadel/modules/networkclient/serv_networkclient.c
index 95badfb68..5c38f46ed 100644
--- a/citadel/modules/networkclient/serv_networkclient.c
+++ b/citadel/modules/networkclient/serv_networkclient.c
@@ -242,8 +242,8 @@ eNextState NWC_ReadGreeting(AsyncNetworker *NW)
 			     "Connected to node \"%s\" but I was expecting to connect to node \"%s\".",
 			     connected_to, ChrPtr(NW->node));
 		EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
-		StopClientWatchers(IO, 1);
-		return QueueDBOperation(IO, NWC_SendFailureMessage);
+
+		return EventQueueDBOperation(IO, NWC_SendFailureMessage, 1);
 	}
 	return eSendReply;
 }
@@ -286,8 +286,7 @@ eNextState NWC_ReadAuthReply(AsyncNetworker *NW)
 		else {
 			SetNWCState(IO, eNWCVSAuthFailNTT);
 			EVN_syslog(LOG_ERR, "%s\n", ChrPtr(NW->IO.ErrMsg));
-			StopClientWatchers(IO, 1);
-			return QueueDBOperation(IO, NWC_SendFailureMessage);
+			return EventQueueDBOperation(IO, NWC_SendFailureMessage, 1);
 		}
 		return eAbort;
 	}
@@ -844,8 +843,7 @@ eReadState NWC_ReadServerStatus(AsyncIO *IO)
 eNextState NWC_FailNetworkConnection(AsyncIO *IO)
 {
 	SetNWCState(IO, eNWCVSConnFail);
-	StopClientWatchers(IO, 1);
-	return QueueDBOperation(IO, NWC_SendFailureMessage);
+	return EventQueueDBOperation(IO, NWC_SendFailureMessage, 1);
 }
 
 void NWC_SetTimeout(eNextState NextTCPState, AsyncNetworker *NW)