]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Merge pull request #2005 in SNORT/snort3 from ~KAMURTHI/snort3:appid_array_init to...
authorMike Stepanek (mstepane) <mstepane@cisco.com>
Thu, 13 Feb 2020 21:35:38 +0000 (21:35 +0000)
committerMike Stepanek (mstepane) <mstepane@cisco.com>
Thu, 13 Feb 2020 21:35:38 +0000 (21:35 +0000)
Squashed commit of the following:

commit 0adb29e412cce1d019c6b9056f5a0247116c6a01
Author: Kanimozhi Murthi <kamurthi@cisco.com>
Date:   Thu Feb 13 14:20:29 2020 -0500

    appid: Fix array initialization on Appid

src/network_inspectors/appid/appid_config.h

index e15dce880b877eac17b618e201782a7995f2f028..d089a5df3a635a79f47efcdd22f81cd844d1a280 100644 (file)
@@ -172,9 +172,9 @@ private:
     SipPatternMatchers sip_matchers;
     SslPatternMatchers ssl_matchers;
 
-    std::array<AppId, APP_ID_PORT_ARRAY_SIZE> tcp_port_only = {APP_ID_NONE}; // port-only TCP services
-    std::array<AppId, APP_ID_PORT_ARRAY_SIZE> udp_port_only = {APP_ID_NONE}; // port-only UDP services
-    std::array<AppId, 256> ip_protocol = {APP_ID_NONE}; // non-TCP / UDP protocol services
+    std::array<AppId, APP_ID_PORT_ARRAY_SIZE> tcp_port_only = {}; // port-only TCP services
+    std::array<AppId, APP_ID_PORT_ARRAY_SIZE> udp_port_only = {}; // port-only UDP services
+    std::array<AppId, 256> ip_protocol = {}; // non-TCP / UDP protocol services
 };
 
 class AppIdContext