From: Oleksii Shumeiko -X (oshumeik - SOFTSERVE INC at Cisco) <oshumeik@cisco.com>
Date: Wed, 17 Sep 2025 08:19:26 +0000 (+0000)
Subject: Pull request #4906: Fix trace n-tuple for rebuilt packet.
X-Git-Tag: 3.9.6.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=943d986be9c40b53bafb54aabd1676fe625f7173;p=thirdparty%2Fsnort3.git

Pull request #4906: Fix trace n-tuple for rebuilt packet.

Merge in SNORT/snort3 from ~OSHUMEIK/snort3:trace_ntuple_pdu to master

Squashed commit of the following:

commit a9d670044b9f086ab2793e13ea1d19ddc48caae4
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Mon Sep 15 11:23:46 2025 +0300

    trace: print n-tuple for other packet types with IP layer set

    IP layer (and addresses) can be set not only for pure TCP and UDP.
---

diff --git a/src/trace/trace_loggers.cc b/src/trace/trace_loggers.cc
index b5a21e88b..bee95d3ab 100644
--- a/src/trace/trace_loggers.cc
+++ b/src/trace/trace_loggers.cc
@@ -38,7 +38,7 @@ using namespace snort;
 
 static std::string get_ntuple(bool ntuple, const Packet* p)
 {
-    if ( !ntuple or !p or !p->has_ip() )
+    if ( !ntuple or !p or !p->ptrs.ip_api.is_valid() )
         return "";
 
     SfIpString src_addr;