Merge pull request #980 in SNORT/snort3 from icmp_flowkey_fix to master

Squashed commit of the following:

commit 4c5be44956af918f64b08681bce4ae5f68199205
Author: Steven Baigal <sbaigal@cisco.com>
Date:   Fri Jul 28 12:41:20 2017 -0400

    Fixed valgaind error on ICMP session flow key

diff --git a/src/stream/icmp/icmp_session.cc b/src/stream/icmp/icmp_session.cc
index ee3633b8d50b06865340986b6c36d17969d3740a..b9853696c28c495af91d39761444fbed9d1c9a17 100644 (file)
--- a/src/stream/icmp/icmp_session.cc
+++ b/src/stream/icmp/icmp_session.cc
@@ -80,6 +80,8 @@ static int ProcessIcmpUnreach(Packet* p)
 
     skey.pkt_type = p->type();
     skey.version = src->is_ip4() ? 4 : 6;
+    skey.ip_protocol = (uint8_t)p->get_ip_proto_next();
+    skey.padding = 0;
 
     if (p->proto_bits & PROTO_BIT__TCP_EMBED_ICMP)
     {