{
ports = "1",
enable = true,
- min_age = 0.0,
- min_sync = 0.0
+ min_age = 0,
+ min_sync = 0
}
The 'ports' item maps to the SideChannel port to use for the HA messaging.
The 'enabled' item controls the overall HA operation.
The items min_age and min_sync are used in the stream HA logic. min_age is
-the number of seconds that a flow must exist in the flow cache before sending
+the number of milliseconds that a flow must exist in the flow cache before sending
HA messages to the partner. min_sync is the minimum time between HA status
updates. HA messages for a particular flow will not be sent faster than
-min_sync. Both are expressed as a floating point number of seconds.
+min_sync. Both are expressed as a number of milliseconds.
HA messages are composed of the base 'stream' information plus any content
from additional modules. Modules subscribe HA in order to add message
{ "ports", Parameter::PT_BIT_LIST, "65535", nullptr,
"side channel message port list" },
- { "min_age", Parameter::PT_REAL, "0.0:100.0", "1.0",
- "minimum session life in seconds before HA updates" },
+ { "min_age", Parameter::PT_INT, "0:max32", "0",
+ "minimum session life in milliseconds before HA updates" },
- { "min_sync", Parameter::PT_REAL, "0.0:100.0", "0.1",
- "minimum interval in seconds between HA updates" },
+ { "min_sync", Parameter::PT_INT, "0:max32", "0",
+ "minimum interval in milliseconds between HA updates" },
{ nullptr, Parameter::PT_MAX, nullptr, nullptr, nullptr }
};
//-------------------------------------------------------------------------
-static void convert_real_seconds_to_timeval(double seconds, struct timeval* tv)
+static void convert_milliseconds_to_timeval(uint32_t milliseconds, struct timeval* tv)
{
- double whole = trunc(seconds);
- double fraction = (seconds - whole);
- tv->tv_sec = (time_t)whole;
- tv->tv_usec = (long int)(fraction * 1.0E6);
+ tv->tv_sec = (milliseconds / 1000);
+ tv->tv_usec = (milliseconds % 1000) * 1000;
}
HighAvailabilityModule::HighAvailabilityModule() :
}
else if ( v.is("min_age") )
{
- convert_real_seconds_to_timeval(v.get_real(), &config->min_session_lifetime);
+ convert_milliseconds_to_timeval(v.get_uint32(), &config->min_session_lifetime);
}
else if ( v.is("min_sync") )
{
- convert_real_seconds_to_timeval(v.get_real(), &config->min_sync_interval);
+ convert_milliseconds_to_timeval(v.get_uint32(), &config->min_sync_interval);
}
else
return false;
--- /dev/null
+//--------------------------------------------------------------------------
+// Copyright (C) 2019-2019 Cisco and/or its affiliates. All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License Version 2 as published
+// by the Free Software Foundation. You may not use, modify or distribute
+// this program under any other version of the GNU General Public License.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+//--------------------------------------------------------------------------
+// pps_stream5_ha.cc author Pooja Awasthi <poawasth@cisco.com>
+
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include "conversion_state.h"
+#include "helpers/s2l_util.h"
+#include "helpers/util_binder.h"
+
+namespace preprocessors
+{
+namespace
+{
+class StreamHa : public ConversionState
+{
+public:
+ StreamHa(Converter& c) : ConversionState(c) { }
+ bool convert(std::istringstream& data_stream) override;
+};
+} // namespace
+
+bool StreamHa::convert(std::istringstream& data_stream)
+{
+ std::string keyword;
+ bool retval = true;
+
+ table_api.open_table("high_availability");
+ table_api.add_diff_option_comment("stream5_ha", "high_availability");
+
+ while (util::get_string(data_stream, keyword, ","))
+ {
+ bool tmpval = true;
+ std::istringstream arg_stream(keyword);
+
+ if (!(arg_stream >> keyword))
+ tmpval = false;
+
+ if (keyword == "min_session_lifetime")
+ {
+ table_api.add_diff_option_comment("min_session_lifetime", "min_age");
+ tmpval = parse_int_option("min_age", arg_stream , false);
+ }
+ else if (keyword == "min_sync_interval")
+ {
+ table_api.add_diff_option_comment("min_sync_interval", "min_sync");
+ tmpval = parse_int_option("min_sync", arg_stream,false);
+ }
+ else if (keyword == "use_daq")
+ {
+ table_api.add_diff_option_comment("use_daq", "daq_channel");
+ tmpval = table_api.add_option("daq_channel", true);
+ }
+ else if (keyword == "startup_input_file")
+ tmpval = parse_deleted_option("startup_input_file", arg_stream);
+ else if (keyword == "runtime_output_file")
+ tmpval = parse_deleted_option("runtime_output_file", arg_stream);
+ else if (keyword == "shutdown_output_file")
+ tmpval = parse_deleted_option("shutdown_output_file", arg_stream);
+ else if (keyword == "use_side_channel")
+ table_api.add_unsupported_comment("use_side_channel");
+ else
+ tmpval = false;
+
+ if (!tmpval)
+ {
+ data_api.failed_conversion(data_stream, arg_stream.str());
+ retval = false;;
+ }
+ }
+ table_api.close_table(); // ha stream
+ return retval;
+}
+/**************************
+ ******* A P I ***********
+ **************************/
+
+static ConversionState* ctor(Converter& c)
+{
+ return new StreamHa(c);
+}
+
+static const ConvertMap preprocessor_stream_ha =
+{
+ "stream5_ha",
+ ctor,
+};
+
+const ConvertMap* stream_ha_map = &preprocessor_stream_ha;
+} // namespace preprocessors
projects / thirdparty / snort3.git / commitdiff
