stream: make raw_progress relative to STREAM_BASE_OFFSET

diff --git a/src/stream-tcp-list.c b/src/stream-tcp-list.c
index 68dfab7af7806c06631a397a5f63ecbddcac21b1..a0f750c4dd55b57374e80c6d1b42ec4df8819306 100644 (file)
--- a/src/stream-tcp-list.c
+++ b/src/stream-tcp-list.c
@@ -635,17 +635,17 @@ static inline uint64_t GetLeftEdge(TcpSession *ssn, TcpStream *stream)
     }
 
     if (use_app && use_raw) {
-        left_edge = MIN(STREAM_APP_PROGRESS(stream), stream->raw_progress);
+        left_edge = MIN(STREAM_APP_PROGRESS(stream), STREAM_RAW_PROGRESS(stream));
         SCLogDebug("left_edge %"PRIu64", using both app:%"PRIu64", raw:%"PRIu64,
-                left_edge, STREAM_APP_PROGRESS(stream), stream->raw_progress);
+                left_edge, STREAM_APP_PROGRESS(stream), STREAM_RAW_PROGRESS(stream));
     } else if (use_app) {
         left_edge = STREAM_APP_PROGRESS(stream);
         SCLogDebug("left_edge %"PRIu64", using app:%"PRIu64,
                 left_edge, STREAM_APP_PROGRESS(stream));
     } else if (use_raw) {
-        left_edge = stream->raw_progress;
+        left_edge = STREAM_RAW_PROGRESS(stream);
         SCLogDebug("left_edge %"PRIu64", using raw:%"PRIu64,
-                left_edge, stream->raw_progress);
+                left_edge, STREAM_RAW_PROGRESS(stream));
     } else {
         SCLogDebug("left_edge 0, none");
     }
@@ -739,6 +739,12 @@ void StreamTcpPruneSession(Flow *f, uint8_t flags)
                 stream->app_progress_rel = 0;
             }
 
+            if (slide <= stream->raw_progress_rel) {
+                stream->raw_progress_rel -= slide;
+            } else {
+                stream->raw_progress_rel = 0;
+            }
+
             SCLogDebug("stream base_seq %u at stream offset %"PRIu64,
                     stream->base_seq, STREAM_BASE_OFFSET(stream));
         }

diff --git a/src/stream-tcp-private.h b/src/stream-tcp-private.h
index 7e360633211fb37748280985733041ff9debc723..87fff2c601e07fce757c48779afbec94a3b067f7 100644 (file)
--- a/src/stream-tcp-private.h
+++ b/src/stream-tcp-private.h
@@ -88,9 +88,9 @@ typedef struct TcpStream_ {
     uint32_t base_seq;              /**< seq where we are left with reassebly. Matches STREAM_BASE_OFFSET below. */
 
     uint32_t app_progress_rel;      /**< app-layer progress relative to STREAM_BASE_OFFSET */
+    uint32_t raw_progress_rel;      /**< raw reassembly progress relative to STREAM_BASE_OFFSET */
 
     StreamingBuffer *sb;
-    uint64_t raw_progress;
 
     TcpSegment *seg_list;           /**< list of TCP segments that are not yet (fully) used in reassembly */
     TcpSegment *seg_list_tail;      /**< Last segment in the reassembled stream seg list*/
@@ -101,6 +101,7 @@ typedef struct TcpStream_ {
 
 #define STREAM_BASE_OFFSET(stream)  ((stream)->sb ? (stream)->sb->stream_offset : 0)
 #define STREAM_APP_PROGRESS(stream) (STREAM_BASE_OFFSET((stream)) + (stream)->app_progress_rel)
+#define STREAM_RAW_PROGRESS(stream) (STREAM_BASE_OFFSET((stream)) + (stream)->raw_progress_rel)
 
 /* from /usr/include/netinet/tcp.h */
 enum

diff --git a/src/stream-tcp-reassemble.c b/src/stream-tcp-reassemble.c
index 2cf1e2be6fb4283aa50af9c2a4830fdfbe18ca2a..f39c1cd122c819d16e51828d8d51a28968c6f88c 100644 (file)
--- a/src/stream-tcp-reassemble.c
+++ b/src/stream-tcp-reassemble.c
@@ -914,7 +914,7 @@ static int StreamTcpReassembleRawCheckLimit(TcpSession *ssn, TcpStream *stream,
         /* get max absolute offset */
         uint64_t max_offset = STREAM_BASE_OFFSET(stream) + delta;
 
-        int64_t diff = max_offset - stream->raw_progress;
+        int64_t diff = max_offset - STREAM_RAW_PROGRESS(stream);
 
         if ((int64_t)StreamMsgQueueGetMinChunkLen(FLOW_PKT_TOSERVER) >
                 diff) {
@@ -933,7 +933,7 @@ static int StreamTcpReassembleRawCheckLimit(TcpSession *ssn, TcpStream *stream,
         /* get max absolute offset */
         uint64_t max_offset = STREAM_BASE_OFFSET(stream) + delta;
 
-        int64_t diff = max_offset - stream->raw_progress;
+        int64_t diff = max_offset - STREAM_RAW_PROGRESS(stream);
 
         if ((int64_t)StreamMsgQueueGetMinChunkLen(FLOW_PKT_TOCLIENT) >
                 diff) {
@@ -997,11 +997,11 @@ int StreamNeedsReassembly(TcpSession *ssn, int direction)
                 dirstr,
                 stream->seg_list,
                 STREAM_APP_PROGRESS(stream), use_app ? "yes" : "no",
-                stream->raw_progress, use_raw ? "yes" : "no",
+                STREAM_RAW_PROGRESS(stream), use_raw ? "yes" : "no",
                 right_edge);
 
         if (use_raw) {
-            if (right_edge > stream->raw_progress) {
+            if (right_edge > STREAM_RAW_PROGRESS(stream)) {
                 SCLogDebug("%s: STREAM_HAS_UNPROCESSED_SEGMENTS_NEED_REASSEMBLY", dirstr);
                 return STREAM_HAS_UNPROCESSED_SEGMENTS_NEED_REASSEMBLY;
             }
@@ -1349,7 +1349,7 @@ static int ReassembleRaw(TcpSession *ssn, TcpStream *stream, Packet *p)
     SCEnter();
 
     StreamingBufferBlock *iter = NULL;
-    uint64_t progress = stream->raw_progress;
+    uint64_t progress = STREAM_RAW_PROGRESS(stream);
     uint64_t last_ack_abs = 0; /* absolute right edge of ack'd data */
     uint64_t right_edge_abs = 0;
 
@@ -1477,7 +1477,7 @@ static int ReassembleRaw(TcpSession *ssn, TcpStream *stream, Packet *p)
 
         if (mydata_offset == progress) {
             SCLogDebug("raw progress %"PRIu64" increasing with data len %u to %"PRIu64,
-                    progress, mydata_len, stream->raw_progress + mydata_len);
+                    progress, mydata_len, STREAM_RAW_PROGRESS(stream) + mydata_len);
 
             //if (StreamTcpInlineMode() == TRUE) {
             //progress = right_edge_abs;
@@ -1502,8 +1502,12 @@ static int ReassembleRaw(TcpSession *ssn, TcpStream *stream, Packet *p)
             break;
     }
 end:
-    stream->raw_progress = progress;
-    SCLogDebug("stream raw progress now %"PRIu64, stream->raw_progress);
+    if (progress > STREAM_RAW_PROGRESS(stream)) {
+        uint32_t slide = progress - STREAM_RAW_PROGRESS(stream);
+        stream->raw_progress_rel += slide;
+    }
+
+    SCLogDebug("stream raw progress now %"PRIu64, STREAM_RAW_PROGRESS(stream));
     return 0;
 }
 
@@ -4337,7 +4341,7 @@ static int StreamTcpReassembleInlineTest08(void)
     StreamMsg *smsg = ssn.toserver_smsg_head;
     FAIL_IF(UtTestSmsg(smsg, stream_payload1, 15) == 0);
 
-    FAIL_IF(ssn.client.raw_progress != 15);
+    FAIL_IF(STREAM_RAW_PROGRESS(&ssn.client) != 15);
     FAIL_IF(StreamTcpUTAddSegmentWithByte(&tv, ra_ctx, &ssn.client, 17, 'D', 5) == -1);
     ssn.client.next_seq = 22;
     p->tcph->th_seq = htonl(17);
@@ -4350,7 +4354,7 @@ static int StreamTcpReassembleInlineTest08(void)
     smsg = ssn.toserver_smsg_head->next;
     FAIL_IF(UtTestSmsg(smsg, stream_payload2, 15) == 0);
 
-    FAIL_IF(ssn.client.raw_progress != 20);
+    FAIL_IF(STREAM_RAW_PROGRESS(&ssn.client) != 20);
 
     smsg = ssn.toserver_smsg_head;
     StreamMsgReturnToPool(smsg);
@@ -4439,10 +4443,7 @@ static int StreamTcpReassembleInlineTest09(void)
     if (UtTestSmsg(smsg, stream_payload2, 5) == 0)
         goto end;
 
-    if (ssn.client.raw_progress != 10) {
-        printf("raw_progress %"PRIu64", expected 10: ", ssn.client.raw_progress);
-        goto end;
-    }
+    FAIL_IF(STREAM_RAW_PROGRESS(&ssn.client) != 10);
 
     /* close the GAP and see if we properly reassemble and update base_seq */
     if (StreamTcpUTAddSegmentWithByte(&tv, ra_ctx, &ssn.client, 12, 'C', 5) == -1) {
@@ -4468,10 +4469,7 @@ static int StreamTcpReassembleInlineTest09(void)
     if (UtTestSmsg(smsg, stream_payload3, 20) == 0)
         goto end;
 
-    if (ssn.client.raw_progress != 20) {
-        printf("raw_progress %"PRIu64", expected 20: ", ssn.client.raw_progress);
-        goto end;
-    }
+    FAIL_IF(STREAM_RAW_PROGRESS(&ssn.client) != 20);
 
     if (ssn.client.seg_list->seq != 2) {
         printf("expected segment 1 (seq 2) to be first in the list, got seq %"PRIu32": ", ssn.client.seg_list->seq);
@@ -4615,7 +4613,7 @@ static int StreamTcpReassembleInsertTest01(void)
     FAIL_IF (UtSsnSmsgCnt(&ssn, STREAM_TOSERVER) != 1);
     StreamMsg *smsg = ssn.toserver_smsg_head;
     FAIL_IF(UtTestSmsg(smsg, stream_payload1, 20) == 0);
-    FAIL_IF(ssn.client.raw_progress != 20);
+    FAIL_IF(STREAM_RAW_PROGRESS(&ssn.client) != 20);
 
     FLOW_DESTROY(&f);
     UTHFreePacket(p);

diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 466c982ab40aaad43c347d570e320df89ac9d814..9329c4ff2aa5355d3c7770963053720b6a828d25 100644 (file)
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -9682,11 +9682,8 @@ static int StreamTcpTest37(void)
         goto end;
     }
 
-    if (((TcpSession *)p->flow->protoctx)->client.raw_progress != 3) {
-        printf("the ssn->client.raw_progress should be 3, but it is %"PRIu64"\n",
-                ((TcpSession *)p->flow->protoctx)->client.raw_progress);
-        goto end;
-    }
+    TcpStream *stream = &(((TcpSession *)p->flow->protoctx)->client);
+    FAIL_IF(STREAM_RAW_PROGRESS(stream) != 3);
 
     StreamTcpSessionClear(p->flow->protoctx);