fdsdump: wrap common components to fdsdump namespace

Author: Lukas955

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

@@ -3,6 +3,8 @@
 
 #include "common.hpp"
 
+namespace fdsdump {
+
 std::vector<std::string>
 string_split(const std::string &str, const std::string &delimiter)
 {
@@ -104,3 +106,5 @@ memcpy_bits(uint8_t *dst, uint8_t *src, unsigned int n_bits)
         dst[n_bytes - 1] &= (0xFF >> rem_bits) << rem_bits;
     }
 }
+
+} // fdsdump

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

@@ -13,6 +13,8 @@
 
 #include <libfds.h>
 
+namespace fdsdump {
+
 using unique_file = std::unique_ptr<fds_file_t, decltype(&fds_file_close)>;
 using unique_iemgr = std::unique_ptr<fds_iemgr_t, decltype(&fds_iemgr_destroy)>;
 using unique_filter = std::unique_ptr<fds_ipfix_filter, decltype(&fds_ipfix_filter_destroy)>;
@@ -64,3 +66,5 @@ string_trim_copy(std::string str);
  */
 void
 memcpy_bits(uint8_t *dst, uint8_t *src, unsigned int n_bits);
+
+} // fdsdump

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

@@ -4,6 +4,8 @@
 
 #include "field.hpp"
 
+namespace fdsdump {
+
 Field::Field(std::string name, const shared_iemgr &iemgr)
     : m_name(name), m_iemgr(iemgr)
 {
@@ -172,3 +174,5 @@ Field::for_each_element(
 
     return count;
 }
+
+} // fdsdump

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

@@ -8,6 +8,8 @@
 
 #include "common.hpp"
 
+namespace fdsdump {
+
 /**
  * @brief Data type of a record field.
  */
@@ -112,3 +114,5 @@ struct Field {
     FieldType get_type_of_element(const struct fds_iemgr_elem *elem) const;
     FieldType get_type_of_alias(const struct fds_iemgr_alias *alias) const;
 };
+
+} // fdsdump

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

@@ -4,6 +4,8 @@
 
 #include "fieldView.hpp"
 
+namespace fdsdump {
+
 uint64_t
 FieldView::as_uint() const
 {
@@ -112,3 +114,5 @@ FieldView::as_ipaddr() const
 
     throw std::invalid_argument("Conversion error (ipaddr)");
 }
+
+} // fdsdump

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

@@ -7,6 +7,8 @@
 
 #include "ipaddr.hpp"
 
+namespace fdsdump {
+
 class FieldView {
 public:
     FieldView(const struct fds_drec_field &field)
@@ -23,3 +25,5 @@ class FieldView {
 private:
     const struct fds_drec_field &m_field;
 };
+
+} // fdsdump

src/tools/fdsdump/src/common/filelist.cpp

@@ -44,6 +44,8 @@
 
 #include "filelist.hpp"
 
+namespace fdsdump {
+
 void
 FileList::add_files(const std::string &pattern)
 {
@@ -104,3 +106,5 @@ FileList::clear()
 
     m_files.clear();
 }
+
+} // fdsdump

src/tools/fdsdump/src/common/filelist.hpp

@@ -42,6 +42,8 @@
 #include <mutex>
 #include <vector>
 
+namespace fdsdump {
+
 /**
  * \brief  A file list that allows thread safe retrieval of items;
  */
@@ -97,3 +99,5 @@ class FileList {
     std::mutex m_mutex;
 	std::vector<std::string> m_files;
 };
+
+} // fdsdump

src/tools/fdsdump/src/common/flow.hpp

@@ -1,5 +1,7 @@
 #pragma once
 
+namespace fdsdump {
+
 /**
  * @brief Direction of flow record to be considered when processing.
  *
@@ -30,3 +32,5 @@ struct Flow {
     /** @brief Flow Data record                                    */
     struct fds_drec rec;
 };
+
+} // fdsdump

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

@@ -6,6 +6,8 @@
 #include "fieldView.hpp"
 #include "flowProvider.hpp"
 
+namespace fdsdump {
+
 FlowProvider::FlowProvider(const shared_iemgr &iemgr)
     : m_iemgr(iemgr)
 {
@@ -225,3 +227,5 @@ FlowProvider::next_record()
         return &m_flow;
     }
 }
+
+} // fdsdump