From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Thu, 2 Jul 2020 14:35:53 +0000 (+0000)
Subject: Merge pull request #2310 in SNORT/snort3 from ~MIALTIZE/snort3:service_state_ut to... 
X-Git-Tag: 3.0.2-1~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2baf8f4f33b8dc61472c26739a8f58c10b0c13a6;p=thirdparty%2Fsnort3.git

Merge pull request #2310 in SNORT/snort3 from ~MIALTIZE/snort3:service_state_ut to master

Squashed commit of the following:

commit 476c846954b981c4d700f658f358e67f2e662c70
Author: Michael Altizer <mialtize@cisco.com>
Date:   Thu Jul 2 10:33:42 2020 -0400

    appid: Fix the format of the IPv6 strings in the Service State unit tests
---

diff --git a/src/network_inspectors/appid/test/service_state_test.cc b/src/network_inspectors/appid/test/service_state_test.cc
index 158b00320..d0848d87e 100644
--- a/src/network_inspectors/appid/test/service_state_test.cc
+++ b/src/network_inspectors/appid/test/service_state_test.cc
@@ -187,7 +187,7 @@ TEST(service_state_tests, appid_service_state_key_comparison_test)
 {
     SfIp ip4, ip6;
     ip4.set("1.2.3.4");
-    ip6.set("1111.2222.3333.4444.5555.6666.7777.8888");
+    ip6.set("1111:2222:3333:4444:5555:6666:7777:8888");
     IpProtocol proto = IpProtocol::TCP;
     uint16_t port=3000;
 
@@ -209,7 +209,7 @@ TEST(service_state_tests, service_cache)
     uint16_t port = 3000;
     SfIp ip4, ip6;
     ip4.set("1.2.3.4");
-    ip6.set("1111.2222.3333.4444.5555.6666.7777.8888");
+    ip6.set("1111:2222:3333:4444:5555:6666:7777:8888");
 
     ServiceDiscoveryState* ss = nullptr;
     std::vector<ServiceDiscoveryState*> ssvec;