fixed use of bound ip and tcp policy if not set in hosts

diff --git a/ChangeLog b/ChangeLog
index 4b8677086486ae697a0b9ad215ce316ffbb69432..30b8a807843982d44d7ad4d757a29541ee1a268d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Pending - build 143
 
+-- fixed use of bound ip and tcp policy if not set in hosts
 -- eliminate dedicated nhttp chunk buffer
 -- minor nhttp cleanup in StreamSplitter
 

diff --git a/src/main/modules.cc b/src/main/modules.cc
index 1ff0e0c9f083e759b951b16709e01eaed087be1c..3e00d44cfdea6152d790c45bfaabc711203bc64c 100644 (file)
--- a/src/main/modules.cc
+++ b/src/main/modules.cc
@@ -1736,10 +1736,10 @@ static const Parameter hosts_params[] =
     { "ip", Parameter::PT_ADDR, nullptr, "0.0.0.0/32",
       "hosts address / cidr" },
 
-    { "frag_policy", Parameter::PT_ENUM, IP_POLICIES, IP_POLICY_DEFAULT,
+    { "frag_policy", Parameter::PT_ENUM, IP_POLICIES, nullptr,
       "defragmentation policy" },
 
-    { "tcp_policy", Parameter::PT_ENUM, TCP_POLICIES, TCP_POLICY_DEFAULT,
+    { "tcp_policy", Parameter::PT_ENUM, TCP_POLICIES, nullptr,
       "tcp reassembly policy" },
 
     { "services", Parameter::PT_LIST, service_params, nullptr,

diff --git a/src/stream/ip/ip_module.cc b/src/stream/ip/ip_module.cc
index 29376ab7a3e9879f22dbe3155a34c5ddba4a5d08..e9d941266784a6d0f3b62522b83be5ef3e903080 100644 (file)
--- a/src/stream/ip/ip_module.cc
+++ b/src/stream/ip/ip_module.cc
@@ -110,7 +110,7 @@ static const Parameter s_params[] =
     { "min_ttl", Parameter::PT_INT, "1:255", "1",
       "discard fragments with ttl below the minimum" },
 
-    { "policy", Parameter::PT_ENUM, IP_POLICIES, IP_POLICY_DEFAULT,
+    { "policy", Parameter::PT_ENUM, IP_POLICIES, "linux",
       "fragment reassembly policy" },
 
     { "session_timeout", Parameter::PT_INT, "1:86400", "30",

diff --git a/src/stream/stream_api.h b/src/stream/stream_api.h
index 1dd31d47c7ba81fb0b739a3e8a8316aabcda32a9..f0dfbd09efdccad18c52bceed7ca10ee56096911 100644 (file)
--- a/src/stream/stream_api.h
+++ b/src/stream/stream_api.h
@@ -60,9 +60,6 @@
     "first | last | linux | old_linux | bsd | macos | solaris | irix | " \
     "hpux11 | hpux10 | windows | win_2003 | vista | proxy"
 
-#define IP_POLICY_DEFAULT "linux"
-#define TCP_POLICY_DEFAULT "bsd"
-
 class Flow;
 
 typedef int (* LogFunction)(Flow*, uint8_t** buf, uint32_t* len, uint32_t* type);

diff --git a/src/stream/tcp/tcp_module.cc b/src/stream/tcp/tcp_module.cc
index a0d565ee7dd82c8a539a52eb16276eb0d6a1e280..df6cf151f51863442646a75e0bfce35bea48b796 100644 (file)
--- a/src/stream/tcp/tcp_module.cc
+++ b/src/stream/tcp/tcp_module.cc
@@ -114,7 +114,7 @@ static const Parameter s_params[] =
     { "max_pdu", Parameter::PT_INT, "1460:63780", "16384",
       "maximum reassembled PDU size" },
 
-    { "policy", Parameter::PT_ENUM, TCP_POLICIES, TCP_POLICY_DEFAULT,
+    { "policy", Parameter::PT_ENUM, TCP_POLICIES, "bsd",
       "determines operating system characteristics like reassembly" },
 
     { "reassemble_async", Parameter::PT_BOOL, nullptr, "true",