]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
stream: remove unused function argument
authorVictor Julien <vjulien@oisf.net>
Thu, 5 Dec 2024 09:00:14 +0000 (10:00 +0100)
committerVictor Julien <vjulien@oisf.net>
Wed, 11 Dec 2024 08:34:29 +0000 (09:34 +0100)
Sequence number is taken from seg, not the func arg.

src/stream-tcp-list.c
src/stream-tcp-reassemble.c
src/stream-tcp-reassemble.h
src/stream-tcp-util.c

index 0e6499337a498f18481787bfe848640dd93f0553..2b477affd5008764c4b03566d2fe169050f12ac0 100644 (file)
@@ -633,7 +633,7 @@ static void StreamTcpSegmentAddPacketData(
  */
 int StreamTcpReassembleInsertSegment(ThreadVars *tv, TcpReassemblyThreadCtx *ra_ctx,
         TcpStream *stream, TcpSegment *seg, Packet *p,
-        uint32_t pkt_seq, uint8_t *pkt_data, uint16_t pkt_datalen)
+        uint8_t *pkt_data, uint16_t pkt_datalen)
 {
     SCEnter();
 
index 11baf692eca1cb91230450f0d3b0761a89b213b6..3f5b2892ed1280cd5e788e9fcb2fdd147018e9f4 100644 (file)
@@ -805,7 +805,7 @@ int StreamTcpReassembleHandleSegmentHandleData(ThreadVars *tv, TcpReassemblyThre
     }
 
     int r = StreamTcpReassembleInsertSegment(
-            tv, ra_ctx, stream, seg, p, TCP_GET_RAW_SEQ(tcph), p->payload, p->payload_len);
+            tv, ra_ctx, stream, seg, p, p->payload, p->payload_len);
     if (r < 0) {
         if (r == -SC_ENOMEM) {
             ssn->flags |= STREAMTCP_FLAG_LOSSY_BE_LIBERAL;
index d2482bf5eabaae73e29f425384c23526bf0fc5af..f5d30d9859cf5c3d0332240ff46ff68b7e84e95d 100644 (file)
@@ -110,7 +110,8 @@ void StreamTcpSetOSPolicy(TcpStream *, Packet *);
 
 int StreamTcpReassembleHandleSegmentHandleData(ThreadVars *tv, TcpReassemblyThreadCtx *ra_ctx,
         TcpSession *ssn, TcpStream *stream, Packet *p);
-int StreamTcpReassembleInsertSegment(ThreadVars *, TcpReassemblyThreadCtx *, TcpStream *, TcpSegment *, Packet *, uint32_t pkt_seq, uint8_t *pkt_data, uint16_t pkt_datalen);
+int StreamTcpReassembleInsertSegment(ThreadVars *, TcpReassemblyThreadCtx *, TcpStream *,
+        TcpSegment *, Packet *, uint8_t *pkt_data, uint16_t pkt_datalen);
 TcpSegment *StreamTcpGetSegment(ThreadVars *, TcpReassemblyThreadCtx *);
 
 void StreamTcpReturnStreamSegments(TcpStream *);
index ea63578544f7587112cd23d180c6c34402a8a55a..319b47f329fca4495ceb1e705af44de47bb0d56f 100644 (file)
@@ -126,8 +126,7 @@ int StreamTcpUTAddSegmentWithPayload(ThreadVars *tv, TcpReassemblyThreadCtx *ra_
     }
     p->l4.hdrs.tcph->th_seq = htonl(seq);
 
-    if (StreamTcpReassembleInsertSegment(tv, ra_ctx, stream, s, p, TCP_GET_RAW_SEQ(p->l4.hdrs.tcph),
-                p->payload, p->payload_len) < 0)
+    if (StreamTcpReassembleInsertSegment(tv, ra_ctx, stream, s, p, p->payload, p->payload_len) < 0)
         return -1;
 
     UTHFreePacket(p);
@@ -152,8 +151,7 @@ int StreamTcpUTAddSegmentWithByte(ThreadVars *tv, TcpReassemblyThreadCtx *ra_ctx
     }
     p->l4.hdrs.tcph->th_seq = htonl(seq);
 
-    if (StreamTcpReassembleInsertSegment(tv, ra_ctx, stream, s, p, TCP_GET_RAW_SEQ(p->l4.hdrs.tcph),
-                p->payload, p->payload_len) < 0)
+    if (StreamTcpReassembleInsertSegment(tv, ra_ctx, stream, s, p, p->payload, p->payload_len) < 0)
         return -1;
     UTHFreePacket(p);
     return 0;