From: Bhargava Jandhyala (bjandhya) <bjandhya@cisco.com>
Date: Tue, 1 Sep 2020 19:33:21 +0000 (+0000)
Subject: Merge pull request #2418 in SNORT/snort3 from ~KBHANDAN/snort3:set_ips_for_pseudo_pdu... 
X-Git-Tag: 3.0.2-6~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1b6f1334e994495f291eb54c7fdea6cf9f547de;p=thirdparty%2Fsnort3.git

Merge pull request #2418 in SNORT/snort3 from ~KBHANDAN/snort3:set_ips_for_pseudo_pdu to master

Squashed commit of the following:

commit 98bfc2729f03abfccfaad361591fdac5dcdb4705
Author: Kaushal Bhandankar <kbhandan@cisco.com>
Date:   Thu Aug 20 09:47:47 2020 -0400

    ips: use the policies in the flow when creating pseudo packet
---

diff --git a/src/protocols/packet_manager.cc b/src/protocols/packet_manager.cc
index 065de7a3e..ff9c6efa6 100644
--- a/src/protocols/packet_manager.cc
+++ b/src/protocols/packet_manager.cc
@@ -670,6 +670,7 @@ int PacketManager::format_tcp(
     c->user_inspection_policy_id = p->user_inspection_policy_id;
     c->user_ips_policy_id = p->user_ips_policy_id;
     c->user_network_policy_id = p->user_network_policy_id;
+    c->ip_proto_next = p->ip_proto_next;
 
     // setup pkt capture header
     c->pktlen = 0;
diff --git a/src/stream/tcp/tcp_reassembler.cc b/src/stream/tcp/tcp_reassembler.cc
index dab3f2d56..e85dace90 100644
--- a/src/stream/tcp/tcp_reassembler.cc
+++ b/src/stream/tcp/tcp_reassembler.cc
@@ -829,6 +829,14 @@ static Packet* set_packet(Flow* flow, uint32_t flags, bool c2s)
         p->ptrs.sp = flow->server_port;
         p->ptrs.dp = flow->client_port;
     }
+
+    p->ip_proto_next = (IpProtocol)flow->ip_proto;
+
+    const SnortConfig* sc = SnortConfig::get_conf();
+    set_inspection_policy(sc, flow->inspection_policy_id);
+    set_ips_policy(sc, flow->ips_policy_id);
+    set_network_policy(sc, flow->network_policy_id);
+
     return p;
 }