fix merge issues with build 222

diff --git a/src/detection/rtn_checks.cc b/src/detection/rtn_checks.cc
index 03c15f1ecd905a47df40b850e85d426bbf57e078..33f3b21c4faf038e89464220e1999c630972e709 100644 (file)
--- 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 e74144c3b9fc01e8e959dadf8bac0e43627f01ac..cc9cd4bb32f20904bb3e3d7dbb10df4e0246cc92 100644 (file)
--- 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;