From df31bdf239f5e09b19e28fc332008aa883442fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Witold=20Kr=C4=99cicki?= Date: Fri, 22 Nov 2019 14:41:22 +0100 Subject: [PATCH] fixup! WiP: shutdown active sockets when shutting down netmgr --- lib/isc/netmgr/netmgr.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/isc/netmgr/netmgr.c b/lib/isc/netmgr/netmgr.c index f6072e1d36..43876e1fdc 100644 --- a/lib/isc/netmgr/netmgr.c +++ b/lib/isc/netmgr/netmgr.c @@ -1186,13 +1186,12 @@ isc__nm_async_closecb(isc__networker_t *worker, isc__netievent_t *ievent0) { static void shutdown_walk_cb(uv_handle_t *handle, void *arg) { UNUSED(arg); - isc_nmsocket_t *sock; + isc_nmsocket_t *sock = (isc_nmsocket_t*) handle->data; switch(handle->type) { case UV_TCP: - case UV_UDP: - sock = (isc_nmsocket_t*) handle->data; INSIST(VALID_NMSOCK(sock)); - isc__nmsocket_prep_destroy(sock); + /* XXX TODO this should be in tcp.c, not here */ + sock->rcb.recv(sock->tcphandle, NULL, sock->rcbarg); break; default: break;