fixes

radkesvat · Jun 14, 2024 · 1fb022c · 1fb022c
1 parent b6b3469
commit 1fb022c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/tunnels/server/halfduplex/halfduplex_server.c b/tunnels/server/halfduplex/halfduplex_server.c
@@ -69,6 +69,10 @@ static void onMainLinePaused(void *_cstate)
     {
         pipeOnUpLinePaused(cstate->pipe);
     }
+    else
+    {
+        pauseLineDownSide(cstate->upload_line);
+    }
     pauseLineDownSide(cstate->download_line);
 }
 
@@ -79,6 +83,10 @@ static void onMainLineResumed(void *_cstate)
     {
         pipeOnUpLineResumed(cstate->pipe);
     }
+    else
+    {
+        resumeLineDownSide(cstate->upload_line);
+    }
     resumeLineDownSide(cstate->download_line);
 }
 

diff --git a/tunnels/server/reality/reality_server.c b/tunnels/server/reality/reality_server.c
@@ -191,6 +191,12 @@ static void upStream(tunnel_t *self, context_t *c)
 
                     context_t *plain_data_ctx = newContextFrom(c);
                     plain_data_ctx->payload   = buf;
+
+                    if (WW_UNLIKELY(! cstate->init_sent))
+                    {
+                        plain_data_ctx->first = true;
+                        cstate->init_sent     = true;
+                    }
                     self->up->upStream(self->up, plain_data_ctx);
                 }
                 else

diff --git a/tunnels/server/reverse/reverse_server.c b/tunnels/server/reverse/reverse_server.c
@@ -74,7 +74,6 @@ static void upStream(tunnel_t *self, context_t *c)
                             setupLineUpSide(ucstate->u, onLinePausedU, ucstate, onLineResumedU);
                             setupLineUpSide(ucstate->d, onLinePausedD, ucstate, onLineResumedD);
 
-                            cleanup(CSTATE_D(c));
                             CSTATE_D_MUT(c)                                  = ucstate;
                             (ucstate->u->chains_state)[state->chain_index_u] = ucstate;
 

diff --git a/ww/loggers/network_logger.h b/ww/loggers/network_logger.h
@@ -27,4 +27,4 @@ static inline void setNetworkLoggerLevelByStr(const char *log_level)
     logger_set_level_by_str(getNetworkLogger(), log_level);
 }
 
-logger_handler getNetworkLoggerHandle(void);
+logger_handler getNetworkLoggerHandle(void);