Merge pull request #681 in SNORT/snort3 from appid_alert_fix to master

Squashed commit of the following:

commit 5c4902226c4c49c2f0c3939dad2ef3c04d742e2b
Author: shaslad <shaslad@cisco.com>
Date:   Tue Oct 18 18:12:55 2016 -0400

    Fix related to appid name with space and SSL position

diff --git a/src/network_inspectors/appid/ips_appid_option.cc b/src/network_inspectors/appid/ips_appid_option.cc
index 6859748171b017968e189f07c98abb635e0a43be..f0a76e15a8ebf47a066c8db4a751e7313a9b0429 100644 (file)
--- a/src/network_inspectors/appid/ips_appid_option.cc
+++ b/src/network_inspectors/appid/ips_appid_option.cc
@@ -229,7 +229,7 @@ bool AppIdOptionModule::set(const char*, Value& v, SnortConfig*)
     v.set_first_token();
     std::string tok;
 
-    while ( v.get_next_token(tok) )
+    while ( v.get_next_csv_token(tok) )
     {
         AppIdInfo appid_info;
 

diff --git a/src/network_inspectors/appid/service_plugins/service_ssl.cc b/src/network_inspectors/appid/service_plugins/service_ssl.cc
index a178c4699f4ce6dff944f3fb484139cb6ef42d59..020e92e50b99684b555ad167f86b2081114881ef 100644 (file)
--- a/src/network_inspectors/appid/service_plugins/service_ssl.cc
+++ b/src/network_inspectors/appid/service_plugins/service_ssl.cc
@@ -334,13 +334,13 @@ static int ssl_init(const IniServiceAPI* const init_api)
     init_api->RegisterPattern(&ssl_validate, IpProtocol::TCP, SSL_PATTERN_PCT,
         sizeof(SSL_PATTERN_PCT), 2, "ssl");
     init_api->RegisterPattern(&ssl_validate, IpProtocol::TCP, SSL_PATTERN3_0,
-        sizeof(SSL_PATTERN3_0), 0, "ssl");
+        sizeof(SSL_PATTERN3_0), -1, "ssl");
     init_api->RegisterPattern(&ssl_validate, IpProtocol::TCP, SSL_PATTERN3_1,
-        sizeof(SSL_PATTERN3_1), 0, "ssl");
+        sizeof(SSL_PATTERN3_1), -1, "ssl");
     init_api->RegisterPattern(&ssl_validate, IpProtocol::TCP, SSL_PATTERN3_2,
-        sizeof(SSL_PATTERN3_2), 0, "ssl");
+        sizeof(SSL_PATTERN3_2), -1, "ssl");
     init_api->RegisterPattern(&ssl_validate, IpProtocol::TCP, SSL_PATTERN3_3,
-        sizeof(SSL_PATTERN3_3), 0, "ssl");
+        sizeof(SSL_PATTERN3_3), -1, "ssl");
     for (unsigned i=0; i < sizeof(appIdRegistry)/sizeof(*appIdRegistry); i++)
     {
         DebugFormat(DEBUG_LOG,"registering appId: %d\n",appIdRegistry[i].appId);