Tom's comments

Author: TommyPec

CHANGES.md

@@ -26,9 +26,8 @@ This file is a best-effort approach to solving this issue; we will do our best b
   to the new `Rx` trace signature or instead use the same trace sink function or method with the
   the `SinkApplication::RxWithoutAddress` trace.
 * Initializing a Ipv[4,6]Address from a string using the constructor or the `Set` function will result in a crash if the string can not be parsed as an IPv4 or IPv6 address.
-* The `Ipv[4,6]Address::IsInitialized()` function has been deprecated and returns always `true`.
-* A new static function `Ipv[4,6]Address::IsCompatible()` has been added to safely check if a string can be parsed as an IPv4 or IPv6 address.
-* The default value for `Ipv4Address` is now "0.0.0.0", which is consistent with RFC 1122.
+* The `Ipv[4,6]Address::IsInitialized()` function has been deprecated and returns always `true`. The default value of Ipv4Address created with the constructor that takes no arguments is 0.0.0.0 (previously, it was 102.102.102.102), and an Ipv4Address instance can be checked against that unspecified address value (or use std::optional to denote an address that has not been set yet).
+* A new static function `Ipv[4,6]Address::CheckCompatible()` has been added to safely check if a string can be parsed as an IPv4 or IPv6 address.
 
 ### Changes to build system
 

src/internet-apps/examples/ping-example.cc

@@ -115,13 +115,13 @@ main(int argc, char* argv[])
 
     if (!destinationStr.empty())
     {
-        if (Ipv4Address::IsCompatible(destinationStr))
+        if (Ipv4Address::CheckCompatible(destinationStr))
         {
             v4Dst = Ipv4Address(destinationStr.c_str());
             useIpv6 = false;
             destination = v4Dst.value();
         }
-        else if (Ipv6Address::IsCompatible(destinationStr))
+        else if (Ipv6Address::CheckCompatible(destinationStr))
         {
             v6Dst = Ipv6Address(destinationStr.c_str());
             useIpv6 = true;
@@ -135,13 +135,13 @@ main(int argc, char* argv[])
 
     if (!sourceStr.empty())
     {
-        if (Ipv4Address::IsCompatible(sourceStr))
+        if (Ipv4Address::CheckCompatible(sourceStr))
         {
             v4Src = Ipv4Address(sourceStr.c_str());
             useIpv6 = false;
             source = v4Src.value();
         }
-        else if (Ipv6Address::IsCompatible(sourceStr))
+        else if (Ipv6Address::CheckCompatible(sourceStr))
         {
             v6Src = Ipv6Address(sourceStr.c_str());
             useIpv6 = true;

src/internet/test/ipv4-address-helper-test-suite.cc

@@ -94,7 +94,6 @@ AddressAllocatorHelperTestCase::DoTeardown()
 void
 AddressAllocatorHelperTestCase::DoRun()
 {
-    Ipv4Address network;
     Ipv4Address address;
     Ipv4AddressHelper h;
 

src/network/utils/ipv4-address.cc

@@ -136,18 +136,6 @@ Ipv4Mask::GetPrefixLength() const
     return tmp;
 }
 
-/**
- * Value of a not-yet-initialized IPv4 address, corresponding to 0.0.0.0.
- * See also \RFC{1122}
- */
-static constexpr uint32_t UNINITIALIZED = 0x00000000U;
-
-Ipv4Address::Ipv4Address()
-    : m_address(UNINITIALIZED)
-{
-    NS_LOG_FUNCTION(this);
-}
-
 Ipv4Address::Ipv4Address(uint32_t address)
 {
     NS_LOG_FUNCTION(this << address);
@@ -167,15 +155,15 @@ Ipv4Address::Ipv4Address(const char* address)
 }
 
 bool
-Ipv4Address::IsCompatible(const std::string& addressStr)
+Ipv4Address::CheckCompatible(const std::string& addressStr)
 {
     NS_LOG_FUNCTION(addressStr);
 
     uint32_t buffer;
 
     if (inet_pton(AF_INET, addressStr.c_str(), &buffer) <= 0)
     {
-        NS_LOG_LOGIC("Error, can not build an IPv4 address from an invalid string: " << addressStr);
+        NS_LOG_WARN("Error, can not build an IPv4 address from an invalid string: " << addressStr);
         return false;
     }
     return true;

src/network/utils/ipv4-address.h

@@ -31,7 +31,7 @@ class Ipv4Mask;
 class Ipv4Address
 {
   public:
-    Ipv4Address();
+    Ipv4Address() = default;
     /**
      * input address is in host order.
      * @param address The host order 32-bit address
@@ -59,10 +59,13 @@ class Ipv4Address
      *
      * Note: the function uses ``inet_pton`` internally.
      *
+     * @see Address::CheckCompatible hich has a similar name but which 
+     * instead checks the underlying type and length embedded in the Address.
+     *
      * @param addressStr string containing the address as described above
      * @return true if the string can be parsed as an IPv4 address
      */
-    static bool IsCompatible(const std::string& addressStr);
+    static bool CheckCompatible(const std::string& addressStr);
     /**
      * Get the host-order 32-bit IP address
      * @return the host-order 32-bit IP address
@@ -226,7 +229,7 @@ class Ipv4Address
      * @returns the address type
      */
     static uint8_t GetType();
-    uint32_t m_address; //!< IPv4 address
+    uint32_t m_address{0}; //!< IPv4 address
 
     /**
      * @brief Equal to operator.

src/network/utils/ipv6-address.cc

@@ -174,15 +174,15 @@ Ipv6Address::Ipv6Address(const char* address)
 }
 
 bool
-Ipv6Address::IsCompatible(const std::string& addressStr)
+Ipv6Address::CheckCompatible(const std::string& addressStr)
 {
     NS_LOG_FUNCTION(addressStr);
 
     uint8_t buffer[16];
 
     if (inet_pton(AF_INET6, addressStr.c_str(), &buffer) <= 0)
     {
-        NS_LOG_LOGIC("Error, can not build an IPv6 address from an invalid string: " << addressStr);
+        NS_LOG_WARN("Error, can not build an IPv6 address from an invalid string: " << addressStr);
         return false;
     }
     return true;

src/network/utils/ipv6-address.h

@@ -57,10 +57,13 @@ class Ipv6Address
      *
      * Note: the function uses ``inet_pton`` internally.
      *
+     * @see Address::CheckCompatible hich has a similar name but which 
+     * instead checks the underlying type and length embedded in the Address.
+     *
      * @param addressStr string containing the address as described above
      * @return true if the string can be parsed as an IPv6 address
      */
-    static bool IsCompatible(const std::string& addressStr);
+    static bool CheckCompatible(const std::string& addressStr);
 
     /**
      * @brief Constructs an Ipv6Address by using the input 16 bytes.