fix some very easy bugs

radkesvat · Apr 3, 2024 · 5072cfa · 5072cfa
1 parent e2599f5
commit 5072cfa
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 5 deletions.
diff --git a/tunnels/adapters/connector/tcp.c b/tunnels/adapters/connector/tcp.c
@@ -6,12 +6,30 @@ static void cleanup(connector_con_state_t *cstate)
 {
     if (cstate->current_w)
     {
+        if (cstate->current_w->src_io)
+        {
+            hio_read(cstate->current_w->src_io);
+        }
         if (cstate->current_w->payload)
         {
             DISCARD_CONTEXT(cstate->current_w);
         }
+
         destroyContext(cstate->current_w);
     }
+    while (contextQueueLen(cstate->queue) > 0)
+    {
+        context_t *cw = contextQueuePop(cstate->queue);
+        if (cw->src_io)
+        {
+            hio_read(cw->src_io);
+        }
+        if (cw->payload)
+        {
+            DISCARD_CONTEXT(cw);
+        }
+        destroyContext(cw);
+    }
     destroyContextQueue(cstate->queue);
     free(cstate);
 }
@@ -29,7 +47,7 @@ static bool resume_write_queue(connector_con_state_t *cstate)
         {
             destroyContext(cw);
 
-            if (upstream_io && last_resumed_io != upstream_io)
+            if (upstream_io != NULL && (last_resumed_io != upstream_io))
             {
                 last_resumed_io = upstream_io;
                 hio_read(upstream_io);
@@ -63,7 +81,7 @@ static void on_write_complete(hio_t *io, const void *buf, int writebytes)
 
     if (hio_write_is_complete(io))
     {
-        hio_setcb_write(io, NULL);
+        hio_setcb_write(cstate->io, NULL);
         cstate->write_paused = false;
         context_t *cw = cstate->current_w;
         cstate->current_w = NULL;

diff --git a/tunnels/adapters/tcp_connector/tcp_connector.c b/tunnels/adapters/tcp_connector/tcp_connector.c
@@ -7,12 +7,30 @@ static void cleanup(tcp_connector_con_state_t *cstate)
 {
     if (cstate->current_w)
     {
+        if (cstate->current_w->src_io)
+        {
+            hio_read(cstate->current_w->src_io);
+        }
         if (cstate->current_w->payload)
         {
             DISCARD_CONTEXT(cstate->current_w);
         }
+
         destroyContext(cstate->current_w);
     }
+    while (contextQueueLen(cstate->queue) > 0)
+    {
+        context_t *cw = contextQueuePop(cstate->queue);
+        if (cw->src_io)
+        {
+            hio_read(cw->src_io);
+        }
+        if (cw->payload)
+        {
+            DISCARD_CONTEXT(cw);
+        }
+        destroyContext(cw);
+    }
     destroyContextQueue(cstate->queue);
     free(cstate);
 }
@@ -31,7 +49,7 @@ static bool resume_write_queue(tcp_connector_con_state_t *cstate)
         {
             destroyContext(cw);
 
-            if (upstream_io && last_resumed_io != upstream_io)
+            if (upstream_io != NULL && (last_resumed_io != upstream_io))
             {
                 last_resumed_io = upstream_io;
                 hio_read(upstream_io);

diff --git a/tunnels/adapters/tcp_listener/tcp_listener.c b/tunnels/adapters/tcp_listener/tcp_listener.c
@@ -46,12 +46,30 @@ static void cleanup(tcp_listener_con_state_t *cstate)
 {
     if (cstate->current_w)
     {
+        if (cstate->current_w->src_io)
+        {
+            hio_read(cstate->current_w->src_io);
+        }
         if (cstate->current_w->payload)
         {
             DISCARD_CONTEXT(cstate->current_w);
         }
+
         destroyContext(cstate->current_w);
     }
+    while (contextQueueLen(cstate->queue) > 0)
+    {
+        context_t *cw = contextQueuePop(cstate->queue);
+        if (cw->src_io)
+        {
+            hio_read(cstate->current_w->src_io);
+        }
+        if (cw->payload)
+        {
+            DISCARD_CONTEXT(cstate->current_w);
+        }
+        destroyContext(cw);
+    }
     destroyContextQueue(cstate->queue);
     free(cstate);
 }
@@ -70,7 +88,7 @@ static bool resume_write_queue(tcp_listener_con_state_t *cstate)
         {
             destroyContext(cw);
 
-            if (upstream_io && last_resumed_io != upstream_io)
+            if (upstream_io != NULL && (last_resumed_io != upstream_io))
             {
                 last_resumed_io = upstream_io;
                 hio_read(upstream_io);
@@ -104,7 +122,7 @@ static void on_write_complete(hio_t *io, const void *buf, int writebytes)
 
     if (hio_write_is_complete(io))
     {
-        hio_setcb_write(io, NULL);
+        hio_setcb_write(cstate->io, NULL);
         cstate->write_paused = false;
         context_t *cw = cstate->current_w;
         cstate->current_w = NULL;