From b0270602f753b8e37cfe80f8793febd0da33cac9 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Thu, 19 Jan 2012 01:42:20 +0100 Subject: [PATCH] make this generaly in the ev interface. --- citadel/event_client.c | 7 ++++--- citadel/modules/network/serv_networkclient.c | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/citadel/event_client.c b/citadel/event_client.c index 833a270a7..5a32cea9b 100644 --- a/citadel/event_client.c +++ b/citadel/event_client.c @@ -240,8 +240,10 @@ void FreeAsyncIOContents(AsyncIO *IO) FreeURL(&IO->ConnectMe); FreeStrBuf(&IO->HttpReq.ReplyData); - Ctx->state = CON_IDLE; - Ctx->kill_me = 1; + if (Ctx) { + Ctx->state = CON_IDLE; + Ctx->kill_me = 1; + } } @@ -279,7 +281,6 @@ void ShutDownCLient(AsyncIO *IO) IO->Terminate(IO); } - eReadState HandleInbound(AsyncIO *IO) { const char *Err = NULL; diff --git a/citadel/modules/network/serv_networkclient.c b/citadel/modules/network/serv_networkclient.c index 647ec6ed6..7f4ca89d1 100644 --- a/citadel/modules/network/serv_networkclient.c +++ b/citadel/modules/network/serv_networkclient.c @@ -135,10 +135,6 @@ void DeleteNetworker(void *vptr) FreeStrBuf(&NW->port); FreeStrBuf(&NW->secret); FreeStrBuf(&NW->Url); - if (NW->IO.CitContext != NULL) { - ((struct CitContext*)NW->IO.CitContext)->state = CON_IDLE; - ((struct CitContext*)NW->IO.CitContext)->kill_me = 1; - } FreeAsyncIOContents(&NW->IO); free(NW); } -- 2.30.2