fdsdump: rework IPAddr constructors to be more explicit and get rid of default constructor

Author: sedmicha

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

@@ -106,12 +106,11 @@ 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)");

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

@@ -20,11 +20,18 @@ union IPAddr {
     uint64_t u64[2];
 
     /**
-     * @brief Default constructor (zeroes)
+     * @brief Default constructor (uninitialized)
      */
-    IPAddr()
+    IPAddr() = default;
+
+    /**
+     * @brief Zeroes constructor
+     */
+    static IPAddr zero()
     {
-        memset(this, 0, sizeof(*this));
+        IPAddr ip;
+        memset(&ip, 0, sizeof(ip));
+        return ip;
     }
 
     /**
@@ -37,20 +44,24 @@ union IPAddr {
     /**
      * @brief Create an IPv4 address (from 4 bytes array)
      */
-    explicit IPAddr(const uint32_t ip4)
+    static IPAddr ip4(const uint8_t ip4[4])
     {
-        u64[0] = 0;
-        u32[2] = htonl(0x0000FFFF);
-        u32[3] = ip4;
-    };
+        IPAddr ip;
+        ip.u64[0] = 0;
+        ip.u32[2] = htonl(0x0000FFFF);
+        std::memcpy(&ip.u8[12], &ip4[0], 4U);
+        return ip;
+    }
 
     /**
      * @brief Create an IPv6 address (from 16 bytes array)
      */
-    explicit IPAddr(const uint8_t ip6[16])
+    static IPAddr ip6(const uint8_t ip6[16])
     {
-        std::memcpy(&u8[0], &ip6[0], 16U);
-    };
+        IPAddr ip;
+        std::memcpy(&ip.u8[0], &ip6[0], 16U);
+        return ip;
+    }
 
     /**
      * @brief Check if the address is IPv4

src/tools/fdsdump/src/lister/storageSorter.cpp

@@ -346,7 +346,7 @@ get_ip_max(Field &field, const struct Flow &flow, IPAddr &result)
 {
     bool is_reverse {flow.dir == DIRECTION_REV};
     bool found {false};
-    IPAddr max {};
+    IPAddr max = IPAddr::zero();
 
     auto selector = [&](struct fds_drec_field &data) -> void {
         IPAddr value = FieldView(data).as_ipaddr();
@@ -377,7 +377,7 @@ get_ip_min(Field &field, const Flow &flow, IPAddr &result)
 {
     bool is_reverse {flow.dir == DIRECTION_REV};
     bool found {false};
-    IPAddr min {};
+    IPAddr min = IPAddr::zero();
 
     auto selector = [&](struct fds_drec_field &data) -> void {
         IPAddr value = FieldView(data).as_ipaddr();
@@ -409,8 +409,8 @@ StorageSorter::cmp_ip_desc(
     const Flow &lhs,
     const Flow &rhs)
 {
-    IPAddr lhs_max;
-    IPAddr rhs_max;
+    IPAddr lhs_max = IPAddr::zero();
+    IPAddr rhs_max = IPAddr::zero();
     bool lhs_is_defined = get_ip_max(field, lhs, lhs_max);
     bool rhs_is_defined = get_ip_max(field, rhs, rhs_max);
 
@@ -431,8 +431,8 @@ StorageSorter::cmp_ip_asc(
     const Flow &lhs,
     const Flow &rhs)
 {
-    IPAddr lhs_min;
-    IPAddr rhs_min;
+    IPAddr lhs_min = IPAddr::zero();
+    IPAddr rhs_min = IPAddr::zero();
     bool lhs_is_defined = get_ip_min(field, lhs, lhs_min);
     bool rhs_is_defined = get_ip_min(field, rhs, rhs_min);