From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Thu, 8 Jul 2021 20:32:06 +0000 (+0000)
Subject: Merge pull request #2969 in SNORT/snort3 from ~MDAGON/snort3:unreachable to master
X-Git-Tag: 3.1.8.0~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bfc63307acfeb061a82145f3284a4d5ac019b00;p=thirdparty%2Fsnort3.git

Merge pull request #2969 in SNORT/snort3 from ~MDAGON/snort3:unreachable to master

Squashed commit of the following:

commit a9a7be092a4d4a97fd53dc562e7b27c48ba0d7c6
Author: Maya Dagon <mdagon@cisco.com>
Date:   Tue Jul 6 12:10:50 2021 -0400

    packet_io: unreachable packets shouldn't be sent for ICMP
---

diff --git a/src/packet_io/active.cc b/src/packet_io/active.cc
index a7528e700..53d33aee0 100644
--- a/src/packet_io/active.cc
+++ b/src/packet_io/active.cc
@@ -498,21 +498,9 @@ bool Active::is_reset_candidate(const Packet* p)
 
 bool Active::is_unreachable_candidate(const Packet* p)
 {
-    // FIXIT-L allow unr to tcp/udp/icmp4/icmp6 only or for all
-    switch ( p->type() )
-    {
-    case PktType::TCP:
-    case PktType::UDP:
-        return true;
-
-    case PktType::ICMP:
-        // FIXIT-L return false for icmp unreachables
+    if ( p->type() == PktType::TCP || p->type() == PktType::UDP)
         return true;
 
-    default:
-        break;
-    }
-
     return false;
 }