From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Thu, 1 Jul 2021 19:04:25 +0000 (+0000)
Subject: Merge pull request #2960 in SNORT/snort3 from ~MDAGON/snort3:reject to master
X-Git-Tag: 3.1.8.0~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f7503d60a1db4d34ba3a865d9a68a02f2b5fffd;p=thirdparty%2Fsnort3.git

Merge pull request #2960 in SNORT/snort3 from ~MDAGON/snort3:reject to master

Squashed commit of the following:

commit df880cdbcad839afa1d1daac99ea790bf75bed02
Author: Maya Dagon <mdagon@cisco.com>
Date:   Fri Jun 25 15:15:54 2021 -0400

    packet_io: check if unreachable_candidate before sending unreachable
---

diff --git a/src/packet_io/active.cc b/src/packet_io/active.cc
index b93d12116..a7528e700 100644
--- a/src/packet_io/active.cc
+++ b/src/packet_io/active.cc
@@ -166,10 +166,13 @@ void Active::kill_session(Packet* p, EncodeFlags flags)
         break;
 
     default:
-        if ( packet_force_dropped() )
-            send_unreach(p, UnreachResponse::FWD);
-        else
-            send_unreach(p, UnreachResponse::PORT);
+        if (is_unreachable_candidate(p))
+        {
+            if ( packet_force_dropped() )
+                send_unreach(p, UnreachResponse::FWD);
+            else
+                send_unreach(p, UnreachResponse::PORT);
+        }
         break;
     }
 }