patched around pkt type vs ipproto issue

diff --git a/ChangeLog b/ChangeLog
index 11ec5001151c804c3e174e9f14236d6cf61b10c3..999696cd12dfbfae5a5e11dee628b2a9e2cf4adb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@
 -- pulled in HI defaults patch from Bhagya
 -- refactored inspector groups
 -- moved normal_mask out of flow into inspector policy
+-- patched around flow key issue with icmp ipproto vs pkt type
 
 125
 -- discovered can't catch exceptions thrown from Lua to C++; need to

diff --git a/src/flow/flow_control.cc b/src/flow/flow_control.cc
index 5b1da20e0e53fc9f3defba98a5c23c0ec6c17208..6e03e8cdcb84e32ea758ce26c691ce8c01be1322 100644 (file)
--- a/src/flow/flow_control.cc
+++ b/src/flow/flow_control.cc
@@ -248,10 +248,11 @@ void FlowControl::set_key(FlowKey* key, Packet* p)
         key->init(ip_api.get_src(), ip_api.get_dst(), ip_api.id(),
             proto, vlanId, mplsId, addressSpaceId);
     }
-    else if (proto == IPPROTO_ICMP)
+    // FIXIT-H-J segfault because p->ptrs.icmph is null
+    // shold be checking pkt type instead of ipproto?
+    //else if (proto == IPPROTO_ICMP)
+    else if ( p->ptrs.icmph )
     {
-        // FIXIT-H-J segfault because p->ptrs.icmph is null
-        // shold be checking pkt type instead of ipproto?
         key->init(ip_api.get_src(), p->ptrs.icmph->type, ip_api.get_dst(), 0,
             proto, vlanId, mplsId, addressSpaceId);
     }