From 2f35fbd42dc61f4f77982aada2e6ebd054081e05 Mon Sep 17 00:00:00 2001 From: Eugene K Date: Mon, 8 Jan 2024 16:47:43 -0500 Subject: [PATCH] check ch.connection in ziti_channel_close() --- library/channel.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/library/channel.c b/library/channel.c index 315456cc..2355d4d3 100644 --- a/library/channel.c +++ b/library/channel.c @@ -214,18 +214,7 @@ static void on_tls_close(uv_handle_t *s) { free(tls); } -static void close_handle_cb(uv_handle_t *h) { - tlsuv_stream_t *tls = (tlsuv_stream_t *) h; - ziti_channel_t *ch = tls->data; - tlsuv_stream_free(tls); - free(tls); - - ziti_channel_free(ch); - free(ch); -} - int ziti_channel_close(ziti_channel_t *ch, int err) { - int r = 0; if (ch->state != Closed) { CH_LOG(INFO, "closing[%s]", ch->name); @@ -235,9 +224,13 @@ int ziti_channel_close(ziti_channel_t *ch, int err) { uv_close((uv_handle_t *) ch->timer, (uv_close_cb) free); ch->timer = NULL; - tlsuv_stream_close(ch->connection, close_handle_cb); + + close_connection(ch); + + ziti_channel_free(ch); + free(ch); } - return r; + return 0; } void ziti_channel_add_receiver(ziti_channel_t *ch, int id, void *receiver, void (*receive_f)(void *, message *, int)) {