Merge branch 'fdsdump-changes-2' into 'fdsdump-base'

Fdsdump changes 2

See merge request monitoring/ipfixcol2!6

Author: Lukas955

src/tools/fdsdump/src/aggregator/mode.cpp

@@ -2,6 +2,7 @@
 #include <vector>
 
 #include <common/flowProvider.hpp>
+#include <common/ieMgr.hpp>
 
 #include <aggregator/aggregator.hpp>
 #include <aggregator/mode.hpp>
@@ -13,19 +14,19 @@ namespace fdsdump {
 namespace aggregator {
 
 void
-mode_aggregate(const shared_iemgr &iemgr, const Options &opts)
+mode_aggregate(const Options &opts)
 {
     ViewDefinition view_def = make_view_def(
             opts.get_aggregation_keys(),
             opts.get_aggregation_values(),
-            iemgr.get());
+            IEMgr::instance().ptr());
     std::vector<SortField> sort_fields = make_sort_def(
             view_def,
             opts.get_order_by());
     std::unique_ptr<Printer> printer = printer_factory(
             view_def,
             opts.get_output_specifier());
-    FlowProvider flows {iemgr};
+    FlowProvider flows;
     Aggregator aggr(view_def);
 
     const size_t rec_limit = opts.get_output_limit();

src/tools/fdsdump/src/aggregator/mode.hpp

@@ -7,7 +7,7 @@ namespace fdsdump {
 namespace aggregator {
 
 void
-mode_aggregate(const shared_iemgr &iemgr, const Options &opts);
+mode_aggregate(const Options &opts);
 
 } // aggregator
 } // fdsdump

src/tools/fdsdump/src/common/CMakeLists.txt

@@ -6,6 +6,7 @@ set(COMMON_SRC
     filelist.cpp
     flowProvider.cpp
     ipaddr.cpp
+    ieMgr.cpp
 )
 
 add_library(common_obj OBJECT ${COMMON_SRC})

src/tools/fdsdump/src/common/field.cpp

@@ -3,22 +3,25 @@
 #include <stdexcept>
 
 #include <common/field.hpp>
+#include <common/ieMgr.hpp>
 
 namespace fdsdump {
 
-Field::Field(std::string name, const shared_iemgr &iemgr)
-    : m_name(name), m_iemgr(iemgr)
+Field::Field(std::string name)
+    : m_name(name)
 {
     string_trim(m_name);
 
-    m_alias = fds_iemgr_alias_find(m_iemgr.get(), m_name.c_str());
+    auto *iemgr = IEMgr::instance().ptr();
+
+    m_alias = fds_iemgr_alias_find(iemgr, m_name.c_str());
     if (m_alias) {
         // Success
         m_type = get_type_of_alias(m_alias);
         return;
     }
 
-    m_elem = fds_iemgr_elem_find_name(m_iemgr.get(), m_name.c_str());
+    m_elem = fds_iemgr_elem_find_name(iemgr, m_name.c_str());
     if (m_elem) {
         // Success
         m_type = get_type_of_element(m_elem);

src/tools/fdsdump/src/common/field.hpp

@@ -39,10 +39,9 @@ struct Field {
      * @brief Create a new getter for an alias or an IPFIX Field.
      *
      * @param name  Name of alias or an IPFIX Element to lookup
-     * @param iemgr IE manager where to look for the field
      * @throw std::invalid_argument If the alias or element cannot be found.
      */
-    Field(std::string name, const shared_iemgr &iemgr);
+    Field(std::string name);
     ~Field() = default;
 
     /**
@@ -93,8 +92,6 @@ struct Field {
 private:
     // Name of the field (trimmed)
     std::string m_name;
-    // Reference to the IE manager
-    shared_iemgr m_iemgr;
     // Data type of the the field
     FieldType m_type;
     // Alias definition (might be nullptr)

src/tools/fdsdump/src/common/fieldView.cpp

@@ -4,6 +4,8 @@
 
 #include <common/fieldView.hpp>
 
+#include <libfds/converters.h>
+
 namespace fdsdump {
 
 uint64_t
@@ -104,15 +106,45 @@ IPAddr
 FieldView::as_ipaddr() const
 {
     if (m_field.size == 4U) {
-        const uint32_t *value = reinterpret_cast<uint32_t *>(m_field.data);
-        return IPAddr(*value);
+        return IPAddr::ip4(m_field.data);
     }
 
     if (m_field.size == 16U) {
-        return IPAddr(m_field.data);
+        return IPAddr::ip6(m_field.data);
     }
 
     throw std::invalid_argument("Conversion error (ipaddr)");
 }
 
+std::string
+FieldView::as_string() const
+{
+    std::string value;
+
+    if (m_field.size > 0) {
+        // &value[0] doesn't work for zero-sized strings, so we have to handle this specially
+        value.resize(m_field.size);
+        int ret = fds_get_string(m_field.data, m_field.size, &value[0]);
+        if (ret != FDS_OK) {
+            throw std::invalid_argument("Conversion error (string)");
+        }
+    }
+
+    return value;
+}
+
+std::vector<uint8_t>
+FieldView::as_bytes() const
+{
+    std::vector<uint8_t> value;
+
+    value.resize(m_field.size);
+    int ret = fds_get_octet_array(m_field.data, m_field.size, value.data());
+    if (ret != FDS_OK) {
+        throw std::invalid_argument("Conversion error (bytes)");
+    }
+
+    return value;
+}
+
 } // fdsdump

src/tools/fdsdump/src/common/fieldView.hpp

@@ -1,7 +1,10 @@
 
 #pragma once
 
+#include <cstdint>
 #include <ctime>
+#include <string>
+#include <vector>
 
 #include <libfds.h>
 
@@ -21,6 +24,8 @@ class FieldView {
     struct timespec as_datetime() const;
     uint64_t as_datetime_ms() const;
     IPAddr as_ipaddr() const;
+    std::string as_string() const;
+    std::vector<uint8_t> as_bytes() const;
 
 private:
     const struct fds_drec_field &m_field;

src/tools/fdsdump/src/common/flowProvider.cpp

@@ -5,11 +5,11 @@
 
 #include <common/fieldView.hpp>
 #include <common/flowProvider.hpp>
+#include <common/ieMgr.hpp>
 
 namespace fdsdump {
 
-FlowProvider::FlowProvider(const shared_iemgr &iemgr)
-    : m_iemgr(iemgr)
+FlowProvider::FlowProvider()
 {
     int ret;
 
@@ -18,7 +18,7 @@ FlowProvider::FlowProvider(const shared_iemgr &iemgr)
         throw std::runtime_error("fds_file_init() has failed");
     }
 
-    ret = fds_file_set_iemgr(m_file.get(), m_iemgr.get());
+    ret = fds_file_set_iemgr(m_file.get(), IEMgr::instance().ptr());
     if (ret != FDS_OK) {
         throw std::runtime_error("fds_file_set_iemgr() has failed: " + std::to_string(ret));
     }
@@ -36,7 +36,7 @@ FlowProvider::set_filter(const std::string &expr)
     fds_ipfix_filter_t *filter;
     int ret;
 
-    ret = fds_ipfix_filter_create(&filter, m_iemgr.get(), expr.c_str());
+    ret = fds_ipfix_filter_create(&filter, IEMgr::instance().ptr(), expr.c_str());
     m_filter.reset(filter);
 
     if (ret != FDS_OK) {

src/tools/fdsdump/src/common/flowProvider.hpp

@@ -14,7 +14,7 @@ namespace fdsdump {
 
 class FlowProvider {
 public:
-    FlowProvider(const shared_iemgr &iemgr);
+    FlowProvider();
     ~FlowProvider() = default;
 
     FlowProvider(const FlowProvider &) = delete;
@@ -65,7 +65,6 @@ class FlowProvider {
 
     std::list<std::string> m_remains;
 
-    shared_iemgr m_iemgr;
     unique_filter m_filter {nullptr, &fds_ipfix_filter_destroy};
     unique_file m_file {nullptr, &fds_file_close};
     bool m_file_ready = false;

src/tools/fdsdump/src/common/ieMgr.cpp

@@ -0,0 +1,36 @@
+/**
+ * @file
+ * @author Michal Sedlak <[email protected]>
+ * @brief Information element manager singleton
+ */
+
+#include <common/ieMgr.hpp>
+
+#include <string>
+#include <stdexcept>
+
+namespace fdsdump {
+
+IEMgr &
+IEMgr::instance()
+{
+    static IEMgr iemgr;
+    return iemgr;
+}
+
+IEMgr::IEMgr() :
+    m_iemgr(fds_iemgr_create(), &fds_iemgr_destroy)
+{
+    if (!m_iemgr) {
+        throw std::runtime_error("fds_iemgr_create() has failed");
+    }
+
+    const std::string dir = fds_api_cfg_dir();
+    int ret = fds_iemgr_read_dir(m_iemgr.get(), dir.c_str());
+    if (ret != FDS_OK) {
+        const std::string err_msg = fds_iemgr_last_err(m_iemgr.get());
+        throw std::runtime_error("fds_iemgr_read_dir() failed: " + err_msg);
+    }
+}
+
+} // fdsdump