stream: remove unused TCP_LISTEN

Keep the values the same so we might be able to bring it back
w/o issues.

diff --git a/src/flow-util.c b/src/flow-util.c
index 5bb77525985ddfe02d41d53617473b100a8c08ab..ec449a96038e7f0e262920bc267d9a71b7f466dc 100644 (file)
--- a/src/flow-util.c
+++ b/src/flow-util.c
@@ -269,9 +269,6 @@ void FlowEndCountersRegister(ThreadVars *t, FlowEndCounters *fec)
             case TCP_NONE:
                 name = "flow.end.tcp_state.none";
                 break;
-            case TCP_LISTEN:
-                name = "flow.end.tcp_state.listen";
-                break;
             case TCP_SYN_SENT:
                 name = "flow.end.tcp_state.syn_sent";
                 break;

diff --git a/src/stream-tcp-private.h b/src/stream-tcp-private.h
index 8cc1cfca39522526baa0bad93890ba252df89eb9..b1f431667c80da32e9ababe58327bbf9e27d1d57 100644 (file)
--- a/src/stream-tcp-private.h
+++ b/src/stream-tcp-private.h
@@ -149,20 +149,19 @@ typedef struct TcpStream_ {
 #define STREAM_LOG_PROGRESS(stream) (STREAM_BASE_OFFSET((stream)) + (stream)->log_progress_rel)
 
 /* from /usr/include/netinet/tcp.h */
-enum TcpState
-{
-    TCP_NONE,
-    TCP_LISTEN,
-    TCP_SYN_SENT,
-    TCP_SYN_RECV,
-    TCP_ESTABLISHED,
-    TCP_FIN_WAIT1,
-    TCP_FIN_WAIT2,
-    TCP_TIME_WAIT,
-    TCP_LAST_ACK,
-    TCP_CLOSE_WAIT,
-    TCP_CLOSING,
-    TCP_CLOSED,
+enum TcpState {
+    TCP_NONE = 0,
+    // TCP_LISTEN = 1,
+    TCP_SYN_SENT = 2,
+    TCP_SYN_RECV = 3,
+    TCP_ESTABLISHED = 4,
+    TCP_FIN_WAIT1 = 5,
+    TCP_FIN_WAIT2 = 6,
+    TCP_TIME_WAIT = 7,
+    TCP_LAST_ACK = 8,
+    TCP_CLOSE_WAIT = 9,
+    TCP_CLOSING = 10,
+    TCP_CLOSED = 11,
 };
 
 /*

diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index 41e2473e2ad0bd95a51f518ace37b63f73330bfa..819f799fe367bcb15dfa0a53519559f9eca44c2f 100644 (file)
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -6551,9 +6551,6 @@ const char *StreamTcpStateAsString(const enum TcpState state)
         case TCP_NONE:
             tcp_state = "none";
             break;
-        case TCP_LISTEN:
-            tcp_state = "listen";
-            break;
         case TCP_SYN_SENT:
             tcp_state = "syn_sent";
             break;