From: Tom Peters (thopeter) <thopeter@cisco.com>
Date: Tue, 13 Mar 2018 22:19:51 +0000 (-0400)
Subject: Merge pull request #1136 in SNORT/snort3 from union_break to master
X-Git-Tag: 3.0.0-244~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0fc082fec49dd7ff039fda33ccb85dcaace2ae6b;p=thirdparty%2Fsnort3.git

Merge pull request #1136 in SNORT/snort3 from union_break to master

Squashed commit of the following:

commit 672c117af90d935d65248f2b648b8d955afbc885
Author: Tom Peters <thopeter@cisco.com>
Date:   Tue Mar 13 17:49:01 2018 -0400

    libtcp: build error fix
---

diff --git a/src/stream/libtcp/tcp_stream_session.h b/src/stream/libtcp/tcp_stream_session.h
index 9b2bcda3a..8c171931f 100644
--- a/src/stream/libtcp/tcp_stream_session.h
+++ b/src/stream/libtcp/tcp_stream_session.h
@@ -145,8 +145,8 @@ public:
     TcpEventLogger tel;
 
 private:
-    snort::ip::snort_in6_addr real_src_ip = { 0 };
-    snort::ip::snort_in6_addr real_dst_ip = { 0 };
+    snort::ip::snort_in6_addr real_src_ip;
+    snort::ip::snort_in6_addr real_dst_ip;
     uint16_t real_src_port = 0;
     uint16_t real_dst_port = 0;