From: Vitalii Tron -X (vtron - SOFTSERVE INC at Cisco) <vtron@cisco.com>
Date: Thu, 21 Mar 2024 14:33:44 +0000 (+0000)
Subject: Pull request #4237: trace: Replace colon delimiter for tenant with whitespace in... 
X-Git-Tag: 3.1.83.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f9a2f3ba29214191cd6b6775a3680b487b5cc68;p=thirdparty%2Fsnort3.git

Pull request #4237: trace: Replace colon delimiter for tenant with whitespace in the trace_logger output

Merge in SNORT/snort3 from ~VTRON/snort3:trace_tenant_format to master

Squashed commit of the following:

commit df874033ba82d3915710cb65bf020a09244d931f
Author: Vitalii Tron <vtron@cisco.com>
Date:   Thu Mar 7 02:45:44 2024 -0500

    trace: Replace colon delimiter for tenant with whitespace in the trace_logger output
---

diff --git a/src/trace/trace_loggers.cc b/src/trace/trace_loggers.cc
index fb4402218..cbc73f364 100644
--- a/src/trace/trace_loggers.cc
+++ b/src/trace/trace_loggers.cc
@@ -57,15 +57,14 @@ static std::string get_ntuple(bool ntuple, const Packet* p)
     }
 
     ss << src_addr << " " << src_port << " -> " << dst_addr << " " << dst_port << " ";
-    ss << unsigned(p->get_ip_proto_next()) << " ";
-    ss << "AS=" << p->pkth->address_space_id << ":";
+    ss << unsigned(p->get_ip_proto_next());
+    ss << " AS=" << p->pkth->address_space_id;
 
     if (p->pkth->tenant_id)
-        ss << "TN=" << p->pkth->tenant_id<< ":";
+        ss << " TN=" << p->pkth->tenant_id;
 
-    const auto vni = p->get_flow_geneve_vni();
-    if (vni)
-        ss << "VNI=" << vni<< ":";
+    // Delimits the header part and the trace message
+    ss << " ";
 
     return ss.str();
 }