Merge pull request #1510 in SNORT/snort3 from ~BBANTWAL/snort3:sip_options_fix to...

Squashed commit of the following:

commit e64363d8a95e244218c87ae618ebf4632b44b8ad
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Mon Feb 11 09:33:29 2019 -0500

    sip: update sip options to use has_tcp_data instead of is_tcp

diff --git a/src/service_inspectors/sip/ips_sip.cc b/src/service_inspectors/sip/ips_sip.cc
index e9c801093b82ec09a3ec5e2235f471730e40085d..9e5580ff0a77d5e4aa6f884039727d34604b0682 100644 (file)
--- a/src/service_inspectors/sip/ips_sip.cc
+++ b/src/service_inspectors/sip/ips_sip.cc
@@ -102,7 +102,7 @@ IpsOption::EvalStatus SipIpsOption::eval(Cursor& c, Packet* p)
 {
     Profile profile(sip_ps[idx]);
 
-    if ((!p->is_tcp() && !p->is_udp()) || !p->flow || !p->dsize)
+    if ((!p->has_tcp_data() && !p->is_udp()) || !p->flow || !p->dsize)
         return NO_MATCH;
 
     // FIXIT-P cache id at parse time for runtime use

diff --git a/src/service_inspectors/sip/ips_sip_stat_code.cc b/src/service_inspectors/sip/ips_sip_stat_code.cc
index 2431bbd5be191eaa802ed30001f29033555d4ec1..430b364dc4fdcf3ec1c5f9ca7da894c58465cdfb 100644 (file)
--- a/src/service_inspectors/sip/ips_sip_stat_code.cc
+++ b/src/service_inspectors/sip/ips_sip_stat_code.cc
@@ -92,7 +92,7 @@ IpsOption::EvalStatus SipStatCodeOption::eval(Cursor&, Packet* p)
 {
     Profile profile(sipStatCodeRuleOptionPerfStats);
 
-    if ((!p->is_tcp() && !p->is_udp()) || !p->flow || !p->dsize)
+    if ((!p->has_tcp_data() && !p->is_udp()) || !p->flow || !p->dsize)
         return NO_MATCH;
 
     SIPData* sd = get_sip_session_data(p->flow);