Pull request #4416: stream_tcp: make sure ports are correctly swapped when filling...

Merge in SNORT/snort3 from ~JALIIMRA/snort3:meta_ack_ports_master to master

Squashed commit of the following:

commit c707c9e73334859b9603e8d58611a087a7022a6e
Author: Juweria Ali Imran <jaliimra@cisco.com>
Date:   Tue Aug 6 11:13:41 2024 -0400

    stream_tcp: make sure ports are correctly swapped when filling a meta-ACK packet

diff --git a/src/stream/tcp/tcp_segment_descriptor.cc b/src/stream/tcp/tcp_segment_descriptor.cc
index 71d95ed21e19f14b59baecdf923030308b189e0a..09ed78728bc6d0dc3f10efff38a7492752039cc5 100644 (file)
--- a/src/stream/tcp/tcp_segment_descriptor.cc
+++ b/src/stream/tcp/tcp_segment_descriptor.cc
@@ -81,6 +81,8 @@ TcpSegmentDescriptor::TcpSegmentDescriptor
     pkt->pkth = p->pkth;
     pkt->ptrs = p->ptrs;
     pkt->ptrs.ip_api.set(*p->ptrs.ip_api.get_dst(), *p->ptrs.ip_api.get_src());
+    pkt->ptrs.dp = p->ptrs.sp;
+    pkt->ptrs.sp = p->ptrs.dp;
     pkt->active = p->active_inst;
     pkt->action = &p->action_inst;
     if( p->is_from_client() )
@@ -101,8 +103,8 @@ TcpSegmentDescriptor::TcpSegmentDescriptor
     wnd = tcph->win();
     end_seq = seq;
     timestamp_option = 0;
-    src_port = tcph->src_port();
-    dst_port = tcph->dst_port();
+    src_port = tcph->dst_port();
+    dst_port = tcph->src_port();
 
     packet_timestamp = p->pkth->ts.tv_sec;
     packet_from_client = !p->is_from_client();