Merge pull request #811 from alfred-bratterud/master

Alfreds Master into dev

Author: alfreb

api/net/inet4.hpp

@@ -157,16 +157,16 @@ namespace net {
     }
 
     /** Return the stack on the given Nic */
-    template <int N>
-    static auto& stack()
+    template <int N = 0>
+    static auto&& stack()
     {
       static Inet4 inet{hw::Devices::nic(N)};
       return inet;
     }
 
     /** Static IP config */
-    template <int N>
-    static auto& ifconfig(
+    template <int N = 0>
+    static auto&& ifconfig(
       IP4::addr addr,
       IP4::addr nmask,
       IP4::addr router,
@@ -177,7 +177,7 @@ namespace net {
     }
 
     /** DHCP config */
-    template <int N>
+    template <int N = 0>
     static auto& ifconfig(double timeout = 10.0, dhcp_timeout_func on_timeout = nullptr)
     {
       stack<N>().negotiate_dhcp(timeout, on_timeout);

api/net/ip4/addr.hpp

@@ -18,14 +18,17 @@
 #ifndef NET_IP4_ADDR_HPP
 #define NET_IP4_ADDR_HPP
 
-#include <gsl/gsl> // Expects/Ensures
 #include <regex>
 #include <string>
 #include <net/util.hpp> // byte order
 
 namespace net {
 namespace ip4 {
 
+  class Invalid_address : public std::runtime_error {
+    using runtime_error::runtime_error;
+  };
+
 /** IP4 address representation */
 struct Addr {
 
@@ -49,20 +52,20 @@ struct Addr {
   Addr(const std::string& ipv4_addr)
     : Addr{}
   {
-    Expects(ipv4_addr.size() >= 7 && ipv4_addr.size() <= 15); //< [7, 15] minimum and maximum address length
-
+    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
     {
-      "^(25[0–5]|2[0–4]\\d|[01]?\\d\\d?)\\."
-      "(25[0–5]|2[0–4]\\d|[01]?\\d\\d?)\\."
-      "(25[0–5]|2[0–4]\\d|[01]?\\d\\d?)\\."
-      "(25[0–5]|2[0–4]\\d|[01]?\\d\\d?)$"
+      "^\\s*(25[0–5]|2[0–4]\\d|[01]?\\d\\d?)\\."
+        "(25[0–5]|2[0–4]\\d|[01]?\\d\\d?)\\."
+        "(25[0–5]|2[0–4]\\d|[01]?\\d\\d?)\\."
+        "(25[0–5]|2[0–4]\\d|[01]?\\d\\d?)\\s*$"
     };
 
     std::smatch ipv4_parts;
 
     if (not std::regex_match(ipv4_addr, ipv4_parts, ipv4_address_pattern)) {
-      return;
+      throw Invalid_address(ipv4_addr + " is not a valid IP");
     }
 
     const auto p1 = static_cast<uint8_t>(std::stoi(ipv4_parts[1]));
@@ -106,6 +109,13 @@ struct Addr {
   Addr operator & (const Addr rhs)    const noexcept
   { return Addr(whole & rhs.whole); }
 
+  Addr operator | (const Addr rhs)    const noexcept
+  { return Addr(whole | rhs.whole); }
+
+  Addr operator ~ () const noexcept
+  { return Addr(~whole); }
+
+
   /** x.x.x.x string representation */
   std::string str() const {
     char ipv4_addr[16];

api/net/tcp/write_buffer.hpp

@@ -20,6 +20,7 @@
 #define NET_TCP_WRITE_BUFFER_HPP
 
 #include "common.hpp"
+#include <common>
 
 namespace net {
 namespace tcp {
@@ -47,7 +48,7 @@ struct WriteBuffer {
   uint8_t* end() const { return buffer.get() + length(); }
 
   bool advance(size_t length) {
-    assert(length <= remaining);
+    Expects(length <= remaining);
     offset += length;
     remaining -= length;
     return length > 0;
@@ -71,4 +72,3 @@ struct WriteBuffer {
 } // < namespace tcp
 
 #endif // < NET_TCP_WRITE_BUFFER_HPP
-

examples/demo_service/service.cpp

@@ -70,11 +70,11 @@ void Service::start(const std::string&)
   // DHCP on interface 0
   auto& inet = net::Inet4::ifconfig<0>(10.0);
   // static IP in case DHCP fails
-  net::Inet4::ifconfig<0>(
+  net::Inet4::ifconfig(
     { 10,0,0,42 },     // IP
     { 255,255,255,0 }, // Netmask
     { 10,0,0,1 },      // Gateway
-    { 10,0,0,1 });     // DNS  
+    { 10,0,0,1 });     // DNS
 
   // Print some useful netstats every 30 secs
   Timers::periodic(5s, 30s,

src/net/ip4/ip4.cpp

@@ -50,7 +50,7 @@ namespace net {
 
     // Drop if my ip address doesn't match destination ip address or broadcast
     if(UNLIKELY(hdr->daddr != local_ip() and
-                hdr->daddr != INADDR_BCAST)) {
+                (hdr->daddr | stack_.netmask()) != INADDR_BCAST)) {
       packets_dropped_++;
       return;
     }

src/platforms/unik.cpp

@@ -31,9 +31,11 @@ void unik::Client::register_instance(net::Inet4& inet, const net::UDP::port_t po
 
   INFO("Unik client", "Initializing Unik registration service");
   INFO("Unik client","Listening for UDP hearbeat on %s:%i", inet.ip_addr().str().c_str(), port);
+  INFO("Unik client","IP is attached to interface %s ", inet.link_addr().str().c_str());
 
   // Set up an UDP port for receiving UniK heartbeat
   auto& sock = inet.udp().bind(port);
+  CHECK(net::Inet4::stack<0>().udp().is_bound(port), "Unik UDP port is bound as expected");
   sock.on_read([&sock, &inet] (auto addr, auto port, const char* data, size_t len) {
 
       static bool registered_with_unik = false;
@@ -56,7 +58,7 @@ void unik::Client::register_instance(net::Inet4& inet, const net::UDP::port_t po
       std::string prefix = strdata.substr(0,dotloc);
       std::string ip_str = strdata.substr(dotloc + 1);
 
-      INFO("Unik client","Prefix: %s , IP: %s \n", prefix.c_str(), ip_str.c_str());
+      INFO("Unik client","Prefix: %s , IP: '%s' \n", prefix.c_str(), ip_str.c_str());
 
       net::IP4::addr ip{ip_str};
       net::tcp::Socket unik_instance_listener { ip , 3000};
@@ -104,7 +106,7 @@ void unik::Client::register_instance(net::Inet4& inet, const net::UDP::port_t po
 
 void unik::Client::register_instance_dhcp() {
   // Bring up a network device using DHCP
-  static auto& inet = net::Inet4::stack<0>();
+  static auto&& inet = net::Inet4::stack<0>();
 
   net::Inet4::ifconfig<0>(10.0, [](bool timeout) {
       if(timeout) {

test/fs/integration/fat16/test.py

@@ -24,4 +24,4 @@ def cleanup():
 vm.on_exit(cleanup)
 
 # Boot the VM
-vm.make().boot()
+vm.make().boot(30)

test/fs/integration/fat32/test.py

@@ -24,4 +24,4 @@ def cleanup():
 vm.on_exit(cleanup)
 
 # Boot the VM
-vm.make().boot()
+vm.make().boot(30)

test/fs/integration/memdisk/test.py

@@ -42,4 +42,4 @@ def cleanup():
 vm.on_exit(twosector)
 
 # Make default (nosector) and boot the VM
-vm.make().boot()
+vm.make().boot(60)

test/fs/integration/virtio_block/test.py

@@ -19,4 +19,4 @@ def failure():
 import vmrunner
 vmrunner.vms[0].on_success(success)
 vmrunner.vms[0].on_panic(failure)
-vmrunner.vms[0].make().boot()
+vmrunner.vms[0].make().boot(50)