From: Russ Combs <rucombs@cisco.com>
Date: Fri, 16 Dec 2016 17:14:24 +0000 (-0500)
Subject: fix merge issues with build 222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f39d21ecc400c451045ffd106c283aa269e856f5;p=thirdparty%2Fsnort3.git

fix merge issues with build 222
---

diff --git a/src/detection/rtn_checks.cc b/src/detection/rtn_checks.cc
index 03c15f1ec..33f3b21c4 100644
--- a/src/detection/rtn_checks.cc
+++ b/src/detection/rtn_checks.cc
@@ -97,7 +97,7 @@ static int CheckAddrPort(
         }
     }
 
-    DebugFormat(DEBUG_DETECT, "addr %s, port %d ", sfip_to_str(pkt_addr), pkt_port);
+    DebugFormat(DEBUG_DETECT, "addr %s, port %d ", pkt_addr->ntoa(), pkt_port);
 
     if (!rule_addr)
         goto bail;
diff --git a/src/service_inspectors/http_inspect/http_flow_data.h b/src/service_inspectors/http_inspect/http_flow_data.h
index e74144c3b..cc9cd4bb3 100644
--- a/src/service_inspectors/http_inspect/http_flow_data.h
+++ b/src/service_inspectors/http_inspect/http_flow_data.h
@@ -117,6 +117,7 @@ private:
         HttpEnums::STAT_NOT_PRESENT };
     MimeSession* mime_state[2] = { nullptr, nullptr };
     UtfDecodeSession* utf_state = nullptr; // SRC_SERVER only
+    class HttpMsgSection* latest_section = nullptr;
     uint64_t expected_trans_num[2] = { 1, 1 };
     HttpMsgSection* latest_section = nullptr;