Merge pull request #1440 from fwsGonzo/dev

net: Custom IP4 string constructor, some test fixes

Author: fwsGonzo

api/net/ip4/addr.hpp

@@ -19,11 +19,10 @@
 #ifndef NET_IP4_ADDR_HPP
 #define NET_IP4_ADDR_HPP
 
-#include <regex>
-#include <string>
-
 #include <common>
 #include <net/util.hpp>
+#include <cstdlib>
+#include <string>
 
 namespace net {
 namespace ip4 {
@@ -98,34 +97,38 @@ struct Addr {
    *  IIf the {std::string} object doesn't representing a valid IPv4
    *  address
    */
-  template<typename = void>
-  Addr(const std::string& ipv4_addr)
+  Addr(const std::string& str)
   {
-    if (not (ipv4_addr.size() >= 7 && ipv4_addr.size() <= 15)) { //< [7, 15] minimum and maximum address length
-      throw Invalid_address{ipv4_addr + " is not a valid IP"};
-    }
-
-    const static std::regex ipv4_address_pattern
+    int value[4] = {0};
+    int index = 0;
+    bool length_error = true;
+    const char* ptr  = str.c_str();
+    while (*ptr)
     {
-
-#define OCTET_PATTERN "(25[0-5]|2[0-4]\\d|[01]?\\d\\d?)"
-      "^\\s*" OCTET_PATTERN "\\." OCTET_PATTERN "\\." OCTET_PATTERN "\\." OCTET_PATTERN "\\s*$"
-#undef OCTET_PATTERN
-
-    };
-
-    std::smatch ipv4_parts;
-
-    if (not std::regex_match(ipv4_addr, ipv4_parts, ipv4_address_pattern)) {
-      throw Invalid_address{ipv4_addr + " is not a valid IP"};
+      if (std::isdigit((int) *ptr))
+      {
+        value[index] *= 10;
+        value[index] += *ptr - '0';
+        if (value[index] & 0xFFFFFF00) {
+          throw Invalid_address("Out-of-range byte values in " + str);
+        }
+        length_error = false;
+      } else {
+        if (*ptr == '.') {
+          if (++index > 3)
+              throw Invalid_address("Too many dots in " + str);
+          length_error = true;
+        }
+        else {
+          throw Invalid_address("Unexpected characters in " + str);
+        }
+      }
+      ptr++;
     }
-
-    const auto p1 = static_cast<uint8_t>(std::stoi(ipv4_parts[1]));
-    const auto p2 = static_cast<uint8_t>(std::stoi(ipv4_parts[2]));
-    const auto p3 = static_cast<uint8_t>(std::stoi(ipv4_parts[3]));
-    const auto p4 = static_cast<uint8_t>(std::stoi(ipv4_parts[4]));
-
-    whole = p1 | (p2 << 8) | (p3 << 16) | (p4 << 24);
+    if (length_error) {
+      throw Invalid_address("Missing byte value at end of " + str);
+    }
+    this->whole = value[0] | (value[1] << 8) | (value[2] << 16) | (value[3] << 24);
   }
 
   /**

api/net/tcp/packet.hpp

@@ -317,7 +317,7 @@ Socket source() const
     os << "[ S:" << source().to_string() << " D:" <<  destination().to_string()
        << " SEQ:" << seq() << " ACK:" << ack()
        << " HEAD-LEN:" << (int)tcp_header_length() << " OPT-LEN:" << (int)tcp_options_length() << " DATA-LEN:" << tcp_data_length()
-       << " WIN:" << win() << " FLAGS:" << std::bitset<8>{tcp_header().offset_flags.flags}  << " ]";
+       << " WIN:" << win() << " FLAGS:" << tcp_header().offset_flags.flags  << " ]";
     return os.str();
   }
 

src/posix/arpa/inet.cpp

@@ -18,6 +18,7 @@
 #include <arpa/inet.h>
 #include <net/ip4/addr.hpp>
 #include <common>
+#include <errno.h>
 
 /**
  * @note: shortcut, not sufficent.

test/net/unit/ip4_addr.cpp

@@ -49,8 +49,13 @@ CASE("Create IP4 addresses from strings")
   EXPECT( valid_addr.to_string() == valid_addr_str );
 
   std::string extra_whitespace_addr_str {"\r 10.0.0.42 \n\r"};
-  Addr ipv4_address {extra_whitespace_addr_str};
-  EXPECT(ipv4_address.str() == "10.0.0.42");
+  EXPECT_THROWS(Addr{extra_whitespace_addr_str});
+  EXPECT(Addr{"10"} == Addr(10,0,0,0));
+  EXPECT_THROWS(Addr{"10."});
+  EXPECT(Addr{"10.0"} == Addr(10,0,0,0));
+  EXPECT_THROWS(Addr{"10.0."});
+  EXPECT(Addr{"10.0.0"} == Addr(10,0,0,0));
+  EXPECT_THROWS(Addr{"10.0.0."});
 
   // Check some special cases / previously failed cases
   std::vector<std::string> ips {

test/posix/unit/inet_test.cpp

@@ -87,5 +87,5 @@ CASE("IPv4 address manipulation - pointer to addr")
 
   // Unsupported IP4 format
   res = inet_pton(AF_INET, "255.255.0", &addr);
-  EXPECT(res == 0);
+  EXPECT(res == 1);
 }