From: Jason Ish <jason.ish@oisf.net>
Date: Tue, 2 Jun 2020 16:08:32 +0000 (-0600)
Subject: sip: enable by default
X-Git-Tag: suricata-6.0.0-beta1~364
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a7ba624939f284a708165d9115f0a8847c0d0fb;p=thirdparty%2Fsuricata.git

sip: enable by default

Redmine issue:
https://redmine.openinfosecfoundation.org/issues/3256
---

diff --git a/rust/src/sip/sip.rs b/rust/src/sip/sip.rs
index cda829a49f..f3d3657090 100755
--- a/rust/src/sip/sip.rs
+++ b/rust/src/sip/sip.rs
@@ -20,7 +20,6 @@
 extern crate nom;
 
 use crate::applayer::{self, *};
-use crate::conf;
 use crate::core;
 use crate::core::{sc_detect_engine_state_free, AppProto, Flow, ALPROTO_UNKNOWN};
 use crate::log::*;
@@ -417,12 +416,6 @@ pub unsafe extern "C" fn rs_sip_register_parser() {
         set_tx_detect_flags: None,
     };
 
-    /* For 5.0 we want this disabled by default, so check that it
-     * has been explicitly enabled. */
-    if !conf::conf_get_bool("app-layer.protocols.sip.enabled") {
-        return;
-    }
-
     let ip_proto_str = CString::new("udp").unwrap();
     if AppLayerProtoDetectConfProtoDetectionEnabled(ip_proto_str.as_ptr(), parser.name) != 0 {
         let alproto = AppLayerRegisterProtocolDetection(&parser, 1);
diff --git a/suricata.yaml.in b/suricata.yaml.in
index c4a6d1a956..16cfa150de 100644
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -265,7 +265,7 @@ outputs:
         - krb5
         - snmp
         - rfb
-        #- sip
+        - sip
         - dhcp:
             enabled: yes
             # When extended mode is on, all DHCP messages are logged
@@ -949,7 +949,6 @@ app-layer:
     dhcp:
       enabled: yes
 
-    # SIP, disabled by default.
     sip:
       #enabled: no