use bufferStreamPushContextPayload

radkesvat · Jun 20, 2024 · 6e7a618 · 6e7a618
1 parent c22b04c
commit 6e7a618
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 19 deletions.
diff --git a/tunnels/client/protobuf/protobuf_client.c b/tunnels/client/protobuf/protobuf_client.c
@@ -73,8 +73,7 @@ static void downStream(tunnel_t *self, context_t *c)
     if (c->payload != NULL)
     {
         buffer_stream_t *bstream = cstate->stream_buf;
-        bufferStreamPush(bstream, c->payload);
-        c->payload = NULL;
+        bufferStreamPushContextPayload(bstream, c);
 
         while (true)
         {

diff --git a/tunnels/client/reality/reality_client.c b/tunnels/client/reality/reality_client.c
@@ -243,8 +243,7 @@ static void downStream(tunnel_t *self, context_t *c)
 
         if (cstate->handshake_completed)
         {
-            bufferStreamPush(cstate->read_stream, c->payload);
-            c->payload = NULL;
+            bufferStreamPushContextPayload(cstate->read_stream, c);
             uint8_t tls_header[1 + 2 + 2];
             while (isAlive(c->line) && bufferStreamLen(cstate->read_stream) >= kTLSHeaderlen)
             {

diff --git a/tunnels/server/protobuf/protobuf_server.c b/tunnels/server/protobuf/protobuf_server.c
@@ -46,8 +46,7 @@ static void upStream(tunnel_t *self, context_t *c)
     if (c->payload != NULL)
     {
         buffer_stream_t *bstream = cstate->stream_buf;
-        bufferStreamPush(bstream, c->payload);
-        c->payload = NULL;
+        bufferStreamPushContextPayload(bstream, c);
 
         while (true)
         {

diff --git a/tunnels/server/reality/reality_server.c b/tunnels/server/reality/reality_server.c
@@ -161,8 +161,7 @@ static void upStream(tunnel_t *self, context_t *c)
 
             break;
         case kConAuthorized: {
-            bufferStreamPush(cstate->read_stream, c->payload);
-            c->payload = NULL;
+            bufferStreamPushContextPayload(cstate->read_stream,c);
         authorized:;
             uint8_t tls_header[1 + 2 + 2];
             while (isAlive(c->line) && bufferStreamLen(cstate->read_stream) >= kTLSHeaderlen)

diff --git a/tunnels/server/reverse/reverse_server.c b/tunnels/server/reverse/reverse_server.c
@@ -49,14 +49,12 @@ static void upStream(tunnel_t *self, context_t *c)
         {
             if (dcstate->handshaked)
             {
-                bufferStreamPush(dcstate->wait_stream, c->payload);
-                c->payload = NULL;
+                bufferStreamPushContextPayload(dcstate->wait_stream, c);
                 destroyContext(c);
             }
             else
             {
-                bufferStreamPush(dcstate->wait_stream, c->payload);
-                c->payload = NULL;
+                bufferStreamPushContextPayload(dcstate->wait_stream, c);
 
                 if (bufferStreamLen(dcstate->wait_stream) >= 96)
                 {
@@ -196,8 +194,8 @@ static void downStream(tunnel_t *self, context_t *c)
                 }
                 if (bufferStreamLen(dcstate->wait_stream) > 0)
                 {
-                    bufferStreamPush(dcstate->wait_stream, c->payload);
-                    c->payload                  = NULL;
+                    bufferStreamPushContextPayload(dcstate->wait_stream,c);
+
                     context_t *data_waiting_ctx = newContext(c->line);
                     data_waiting_ctx->payload   = bufferStreamFullRead(dcstate->wait_stream);
                     self->up->upStream(self->up, data_waiting_ctx);

diff --git a/tunnels/server/trojan/socks/trojan_socks_server.c b/tunnels/server/trojan/socks/trojan_socks_server.c
@@ -444,8 +444,7 @@ static void upStream(tunnel_t *self, context_t *c)
                 }
                 if (dest_context->address_protocol == kSapUdp)
                 {
-                    bufferStreamPush(cstate->udp_stream, c->payload);
-                    c->payload = NULL;
+                    bufferStreamPushContextPayload(cstate->udp_stream, c);
 
                     if (! processUdp(self, cstate, c->line))
                     {
@@ -491,8 +490,7 @@ static void upStream(tunnel_t *self, context_t *c)
 
             if (c->line->dest_ctx.address_protocol == kSapUdp)
             {
-                bufferStreamPush(cstate->udp_stream, c->payload);
-                c->payload = NULL;
+                bufferStreamPushContextPayload(cstate->udp_stream, c);
 
                 if (! processUdp(self, cstate, c->line))
                 {

diff --git a/ww/buffer_stream.h b/ww/buffer_stream.h
@@ -50,7 +50,7 @@ static inline void bufferStreamPushContextPayload(buffer_stream_t *self,context_
 {
     assert(c->payload);
     bufferStreamPush(self,c->payload);
-    //todo (disabled optimize) this can work but currently disabled, also looc at tunnel.h
+    //todo (disabled optimize) this can work but currently disabled, also look at tunnel.h
 #if !defined(RELEASE) || 1
     c->payload = NULL;
 #endif