Pull request #3178: Value::get_long(), replacing with platform-independent type

Merge in SNORT/snort3 from ~OSHUMEIK/snort3:fix_32_64 to master

Squashed commit of the following:

commit 5faafb2d57279064269cb3a58d1b136fd3742d44
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Fri Nov 19 16:12:50 2021 +0200

    framework: replace Value::get_long() with a platform-independent type

diff --git a/src/dump_config/json_config_output.cc b/src/dump_config/json_config_output.cc
index 3469d105cdc14c16084f32dd4954062fb52340e8..e1da2db6439bcfb08f7a50ff71166a997d2aaf6f 100644 (file)
--- a/src/dump_config/json_config_output.cc
+++ b/src/dump_config/json_config_output.cc
@@ -41,7 +41,7 @@ static void dump_value(JsonStream& json, const char* node_name, const BaseConfig
             json.put_false(node_name);
         break;
     case Parameter::PT_INT:
-        json.put(node_name, value->get_long());
+        json.put(node_name, value->get_int64());
         break;
     case Parameter::PT_REAL:
     {

diff --git a/src/dump_config/text_config_output.cc b/src/dump_config/text_config_output.cc
index 6d728d32dab579246573d958611903157848f21b..c0090e2fb160e41e9097a55ee731c2de6a10611e 100644 (file)
--- a/src/dump_config/text_config_output.cc
+++ b/src/dump_config/text_config_output.cc
@@ -49,7 +49,7 @@ static void dump_value(const BaseConfigNode* node, const std::string& config_nam
         break;
     }
     case Parameter::PT_INT:
-        std::cout << config_name << "=" << value->get_long() << std::endl;
+        std::cout << config_name << "=" << value->get_int64() << std::endl;
         break;
     case Parameter::PT_REAL:
         std::cout << config_name << "=" << value->get_real() << std::endl;

diff --git a/src/framework/value.h b/src/framework/value.h
index 0837e6b530548cbc1f5174542099764a3b585f04..a19b6055dc8aa788ad8c0ce6c3bf778aef226376 100644 (file)
--- a/src/framework/value.h
+++ b/src/framework/value.h
@@ -121,9 +121,6 @@ public:
     bool get_bool() const
     { return num != 0; }
 
-    long get_long() const  // FIXIT-L to be removed
-    { return (long)num; }
-
     size_t get_size() const
     { return (size_t)num; }
 

diff --git a/src/helpers/json_stream.cc b/src/helpers/json_stream.cc
index 28021108de8a08e605a0821862dc46f5c0f2b309..39d34010e704f7cffc1960ea1f7115f4322ea650 100644 (file)
--- a/src/helpers/json_stream.cc
+++ b/src/helpers/json_stream.cc
@@ -88,7 +88,7 @@ void JsonStream::put(const char* key)
     out << "null";
 }
 
-void JsonStream::put(const char* key, long val)
+void JsonStream::put(const char* key, int64_t val)
 {
     split();
 

diff --git a/src/helpers/json_stream.h b/src/helpers/json_stream.h
index fa7ea26324d7559d7b6c7283aedeeec9771594c8..b6b85bd1c5033d0ce776a36e8b94b18c7e625376 100644 (file)
--- a/src/helpers/json_stream.h
+++ b/src/helpers/json_stream.h
@@ -40,7 +40,7 @@ public:
     void close_array();
 
     void put(const char* key);    // null
-    void put(const char* key, long val);
+    void put(const char* key, int64_t val);
     void put(const char* key, const char* val);
     void put(const char* key, const std::string& val);
     void put(const char* key, double val, int precision);

diff --git a/src/main/snort_module.cc b/src/main/snort_module.cc
index 9e0a35f1292e69d823c187e5244760abdfb4c389..360c9a47eb720cf84fed0fe45c4b33c2579af14d 100644 (file)
--- a/src/main/snort_module.cc
+++ b/src/main/snort_module.cc
@@ -845,7 +845,7 @@ bool SnortModule::set(const char*, Value& v, SnortConfig* sc)
         module_config = sc->daq_config->add_module_config(v.get_string());
 
     else if ( v.is("--daq-batch-size") )
-        sc->daq_config->set_batch_size(v.get_long());
+        sc->daq_config->set_batch_size(v.get_uint32());
 
     else if ( v.is("--daq-dir") )
     {
@@ -859,7 +859,7 @@ bool SnortModule::set(const char*, Value& v, SnortConfig* sc)
     {
         if (!module_config)
             return false;
-        switch ( v.get_long() )
+        switch ( v.get_uint8() )
         {
             case 0:
                 module_config->mode = SFDAQModuleConfig::SFDAQ_MODE_PASSIVE;

diff --git a/src/packet_io/sfdaq_module.cc b/src/packet_io/sfdaq_module.cc
index 87d760bd410b6cbdb5f7ef8565445078df384a8e..5e875c64250b3ea517949ded0043ea1d59689c40 100644 (file)
--- a/src/packet_io/sfdaq_module.cc
+++ b/src/packet_io/sfdaq_module.cc
@@ -120,7 +120,7 @@ bool SFDAQModule::set(const char* fqn, Value& v, SnortConfig*)
     }
     else if (!strcmp(fqn, "daq.batch_size"))
     {
-        config->set_batch_size(v.get_long());
+        config->set_batch_size(v.get_uint32());
     }
     else if (!strcmp(fqn, "daq.modules.name"))
     {
@@ -128,7 +128,7 @@ bool SFDAQModule::set(const char* fqn, Value& v, SnortConfig*)
     }
     else if (!strcmp(fqn, "daq.modules.mode"))
     {
-        module_config->mode = (SFDAQModuleConfig::SFDAQMode) (v.get_long() + 1);
+        module_config->mode = (SFDAQModuleConfig::SFDAQMode) (v.get_uint8() + 1);
     }
     else if (!strcmp(fqn, "daq.modules.variables"))
     {