Merge pull request #2515 in SNORT/snort3 from ~SMINUT/snort3:df to master

Squashed commit of the following:

commit 670911caddab0665fc9148a1e58897b12fd7d538
Author: Silviu Minut <sminut@cisco.com>
Date:   Tue Sep 29 16:49:22 2020 -0400

    framework: remove unused dont_fragment() from DecodeData

diff --git a/src/framework/decode_data.h b/src/framework/decode_data.h
index 8c10166fd47aec58cb63823a70eec4d227137d24..382a7bfdc9824f34d4f7c42a0cb7eb1544e1800d 100644 (file)
--- a/src/framework/decode_data.h
+++ b/src/framework/decode_data.h
@@ -142,9 +142,6 @@ struct DecodeData
 
     inline PktType get_pkt_type() const
     { return type; }
-
-    inline bool dont_fragment() const
-    { return ip_api.is_ip6() || decode_flags & DECODE_DF; }
 };
 
 #endif

diff --git a/src/network_inspectors/rna/rna_fingerprint_tcp.cc b/src/network_inspectors/rna/rna_fingerprint_tcp.cc
index f365f269a93d548ad366c13d7eaf076cd6529293..79b03ec59b5bc27d294f3cbd183fd739b3d5eeea 100644 (file)
--- a/src/network_inspectors/rna/rna_fingerprint_tcp.cc
+++ b/src/network_inspectors/rna/rna_fingerprint_tcp.cc
@@ -31,6 +31,7 @@
 #endif
 
 #include "log/messages.h"
+#include "protocols/ipv4.h"
 #include "protocols/packet.h"
 #include "protocols/tcp.h"
 #include "protocols/tcp_options.h"
@@ -382,16 +383,15 @@ static int get_tcp_option(const Packet* p, tcp::TcpOptCode opt_code, int& pos)
 
 const TcpFingerprint* TcpFpProcessor::get(const Packet* p, RNAFlow* flowp) const
 {
-    FpTcpKey fpk;
+    FpTcpKey fpk{};
     bool mssOptionPresent = false;
 
-    bzero(&fpk, sizeof(FpTcpKey));
-
+    /* build a key for the lookup */
     if (p->is_ip6())
         fpk.isIpv6 = 1;
+    else if (p->ptrs.ip_api.get_ip4h()->df())
+        fpk.df = true;
 
-    /* build a key for the lookup */
-    fpk.df = p->ptrs.dont_fragment();
     fpk.tcp_window = p->ptrs.tcph->win();
 
     fpk.mss = get_tcp_option(p, tcp::TcpOptCode::MAXSEG, fpk.mss_pos);

diff --git a/src/network_inspectors/rna/rna_fingerprint_tcp.h b/src/network_inspectors/rna/rna_fingerprint_tcp.h
index a6e8877c345a2d07d58c2ad8ca7091e1838ffc2f..c41d2d402904d0ed773bc4e838f31352bec01158 100644 (file)
--- a/src/network_inspectors/rna/rna_fingerprint_tcp.h
+++ b/src/network_inspectors/rna/rna_fingerprint_tcp.h
@@ -79,8 +79,8 @@ struct FpTcpKey
     int sackok_pos;
     int timestamp_pos;
 
-    char df;
-    uint8_t isIpv6;
+    bool df;
+    bool isIpv6;
 };
 
 class SO_PUBLIC TcpFpProcessor