From a7148a014666684cea566a559c8c498935c4a102 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Mon, 27 Oct 2014 21:21:37 +0100 Subject: [PATCH] find places which access information after the context is not owned anymore --- citadel/modules/networkclient/serv_networkclient.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/citadel/modules/networkclient/serv_networkclient.c b/citadel/modules/networkclient/serv_networkclient.c index 5c38f46ed..41ce83c04 100644 --- a/citadel/modules/networkclient/serv_networkclient.c +++ b/citadel/modules/networkclient/serv_networkclient.c @@ -200,6 +200,8 @@ eNextState NWC_SendFailureMessage(AsyncIO *IO) long lens[2]; const char *strs[2]; + EVN_syslog(LOG_DEBUG, "NWC: %s\n", __FUNCTION__); + strs[0] = ChrPtr(NW->node); lens[0] = StrLength(NW->node); @@ -848,10 +850,9 @@ eNextState NWC_FailNetworkConnection(AsyncIO *IO) void NWC_SetTimeout(eNextState NextTCPState, AsyncNetworker *NW) { - AsyncIO *IO = &NW->IO; double Timeout = 0.0; - EVN_syslog(LOG_DEBUG, "%s - %d\n", __FUNCTION__, NextTCPState); + //EVN_syslog(LOG_DEBUG, "%s - %d\n", __FUNCTION__, NextTCPState); switch (NextTCPState) { case eSendMore: @@ -874,6 +875,7 @@ void NWC_SetTimeout(eNextState NextTCPState, AsyncNetworker *NW) return; } if (Timeout > 0) { + AsyncIO *IO = &NW->IO; EVN_syslog(LOG_DEBUG, "%s - %d %f\n", __FUNCTION__, @@ -892,8 +894,11 @@ eNextState NWC_DispatchReadDone(AsyncIO *IO) rc = NWC_ReadHandlers[NW->State](NW); - if (rc != eReadMore) + if ((rc != eReadMore) && + (rc != eAbort) && + (rc != eDBQuery)) { NW->State++; + } NWC_SetTimeout(rc, NW); -- 2.30.2