From: rcombs <rcombs@sq18.sfeng.sourcefire.com>
Date: Wed, 29 Oct 2014 19:20:55 +0000 (-0400)
Subject: fixed tcp options log format
X-Git-Tag: 3.0.0-233~1305^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a10bcae30adc2f823229ac53cdd7119d36512bb3;p=thirdparty%2Fsnort3.git

fixed tcp options log format
---

diff --git a/ChangeLog b/ChangeLog
index dfe738210..3eed8d569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,7 @@
 -- matched up stream_tcp.policy enum with defines
 -- tweaked S5_TRACE output
 -- fixed alert_fast to default to not print payload
+-- fixed tcp options log format
 
 125
 -- discovered can't catch exceptions thrown from Lua to C++; need to
diff --git a/src/log/log_text.cc b/src/log/log_text.cc
index 86a7cb8e6..f97b650ad 100644
--- a/src/log/log_text.cc
+++ b/src/log/log_text.cc
@@ -738,9 +738,15 @@ inline uint32_t extract_32_bits(const uint8_t* const buf)
 void LogTcpOptions(TextLog*  log, const Packet* const p)
 {
     tcp::TcpOptIterator opt_iter(p->ptrs.tcph, p);
+    unsigned c = 0;
 
+    for (const tcp::TcpOption& opt : opt_iter)
+    {
+        UNUSED(opt);
+        c++;
+    }
 
-    TextLog_Print(log, "TCP Options =>");
+    TextLog_Print(log, "TCP Options (%u) =>", c);
 
     for (const tcp::TcpOption& opt : opt_iter)
     {
@@ -756,19 +762,19 @@ void LogTcpOptions(TextLog*  log, const Packet* const p)
         switch(opt.code)
         {
         case tcp::TcpOptCode::MAXSEG:
-            TextLog_Print(log, "  MSS: %u", extract_16_bits(opt.data));
+            TextLog_Print(log, " MSS: %u", extract_16_bits(opt.data));
             break;
 
         case tcp::TcpOptCode::EOL:
-            TextLog_Puts(log, "  EOL");
+            TextLog_Puts(log, " EOL");
             break;
 
         case tcp::TcpOptCode::NOP:
-            TextLog_Puts(log, "  NOP");
+            TextLog_Puts(log, " NOP");
             break;
 
         case tcp::TcpOptCode::WSCALE:
-            TextLog_Print(log, "  WS: %u", opt.data[0]);
+            TextLog_Print(log, " WS: %u", opt.data[0]);
             break;
 
         case tcp::TcpOptCode::SACK:
@@ -792,35 +798,35 @@ void LogTcpOptions(TextLog*  log, const Packet* const p)
                 val2 = 0;
             }
 
-            TextLog_Print(log, "  Sack: %u@%u", val1, val2);
+            TextLog_Print(log, " Sack: %u@%u", val1, val2);
             break;
         }
         case tcp::TcpOptCode::SACKOK:
-            TextLog_Puts(log, "SackOK ");
+            TextLog_Puts(log, " SackOK ");
             break;
 
         case tcp::TcpOptCode::ECHO:
-            TextLog_Print(log, "Echo: %u", extract_32_bits(opt.data));
+            TextLog_Print(log, " Echo: %u", extract_32_bits(opt.data));
             break;
 
         case tcp::TcpOptCode::ECHOREPLY:
-            TextLog_Print(log, "Echo Rep: %u", extract_32_bits(opt.data));
+            TextLog_Print(log, " Echo Rep: %u", extract_32_bits(opt.data));
             break;
 
         case tcp::TcpOptCode::TIMESTAMP:
-            TextLog_Print(log, "TS: %u %u", extract_32_bits(opt.data), opt.data + 4);
+            TextLog_Print(log, " TS: %u %u", extract_32_bits(opt.data), opt.data + 4);
             break;
 
         case tcp::TcpOptCode::CC:
-            TextLog_Print(log, "CC %u", extract_32_bits(opt.data));
+            TextLog_Print(log, " CC %u", extract_32_bits(opt.data));
             break;
 
         case tcp::TcpOptCode::CC_NEW:
-            TextLog_Print(log, "CCNEW: %u", extract_32_bits(opt.data));
+            TextLog_Print(log, " CCNEW: %u", extract_32_bits(opt.data));
             break;
 
         case tcp::TcpOptCode::CC_ECHO:
-            TextLog_Print(log, "CCECHO: %u", extract_32_bits(opt.data));
+            TextLog_Print(log, " CCECHO: %u", extract_32_bits(opt.data));
             break;
 
         default: