API renaming/beautification.

diff --git a/src/flow-timeout.c b/src/flow-timeout.c
index 8d02cc9dba124566ed7c8fba0dc10334bfecf4c1..d7d4951e92fcfe987c20fc59ef9d548498baf72b 100644 (file)
--- a/src/flow-timeout.c
+++ b/src/flow-timeout.c
@@ -303,8 +303,8 @@ int FlowForceReassemblyNeedReassmbly(Flow *f, int *server, int *client) {
         return 0;
     }
 
-    *client = StreamHasUnprocessedSegments(ssn, 0);
-    *server = StreamHasUnprocessedSegments(ssn, 1);
+    *client = StreamNeedsReassembly(ssn, 0);
+    *server = StreamNeedsReassembly(ssn, 1);
 
     /* if state is not fully closed we assume that we haven't fully
      * inspected the app layer state yet */
@@ -526,7 +526,7 @@ static inline void FlowForceReassemblyForHash(void)
             }
 
             /* ah ah!  We have some unattended toserver segments */
-            if ((client_ok = StreamHasUnprocessedSegments(ssn, 0)) == 1) {
+            if ((client_ok = StreamNeedsReassembly(ssn, 0)) == 1) {
                 StreamTcpThread *stt = SC_ATOMIC_GET(stream_pseudo_pkt_stream_tm_slot->slot_data);
 
                 ssn->client.last_ack = (ssn->client.seg_list_tail->seq +
@@ -544,7 +544,7 @@ static inline void FlowForceReassemblyForHash(void)
                 }
             }
             /* oh oh!  We have some unattended toclient segments */
-            if ((server_ok = StreamHasUnprocessedSegments(ssn, 1)) == 1) {
+            if ((server_ok = StreamNeedsReassembly(ssn, 1)) == 1) {
                 StreamTcpThread *stt = SC_ATOMIC_GET(stream_pseudo_pkt_stream_tm_slot->slot_data);
 
                 ssn->server.last_ack = (ssn->server.seg_list_tail->seq +

diff --git a/src/stream-tcp.h b/src/stream-tcp.h
index c9f38fa6a1c7f950ad325e701f26f84b577d878a..cd0e57ebcf0b5846a7ccb5646f47b765722b17bd 100644 (file)
--- a/src/stream-tcp.h
+++ b/src/stream-tcp.h
@@ -176,7 +176,7 @@ enum {
     STREAM_HAS_UNPROCESSED_SEGMENTS_NEED_ONLY_DETECTION = 2,
 };
 
-static inline int StreamHasUnprocessedSegments(TcpSession *ssn, int direction)
+static inline int StreamNeedsReassembly(TcpSession *ssn, int direction)
 {
     /* server tcp state */
     if (direction) {