Merge pull request #1222 from AnnikaH/dev

Statman and ICMP

Author: alfreb

api/net/dhcp/dhcpd.hpp

@@ -156,7 +156,7 @@ namespace dhcp {
     void clear_offered_ip(IP4::addr ip);
     void clear_offered_ips();
 
-    void print(const dhcp_packet_t* msg, const dhcp_option_t* opts) {
+    void print(const dhcp_packet_t* /* msg */, const dhcp_option_t* opts) {
       debug("Printing:\n");
 
       debug("OP: %u\n", msg->op);

api/net/ethernet/ethernet.hpp

@@ -90,13 +90,17 @@ namespace net {
     uint64_t get_packets_dropped()
     { return packets_dropped_; }
 
+    uint32_t get_trailer_packets_dropped()
+    { return trailer_packets_dropped_; }
+
   private:
     const addr& mac_;
 
     /** Stats */
     uint64_t& packets_rx_;
     uint64_t& packets_tx_;
     uint32_t& packets_dropped_;
+    uint32_t& trailer_packets_dropped_;
 
     /** Upstream OUTPUT connections */
     upstream ip4_upstream_ = nullptr;

api/net/ethernet/ethertype.hpp

@@ -25,13 +25,16 @@ namespace net {
   /** Little-endian ethertypes. More entries here:
       http://www.iana.org/assignments/ieee-802-numbers/ieee-802-numbers.xhtml */
   enum class Ethertype : uint16_t {
-    IP4   = 0x8,
-    ARP   = 0x608,
-    WOL   = 0x4208,
-    IP6   = 0xdd86,
-    FLOW  = 0x888,
-    JUMBO = 0x7088,
-    VLAN  = 0x81
+    IP4           = 0x8,
+    ARP           = 0x608,
+    WOL           = 0x4208,
+    IP6           = 0xdd86,
+    FLOW          = 0x888,
+    JUMBO         = 0x7088,
+    VLAN          = 0x81,
+    TRAILER_NEGO  = 0x0010,   // RFC 893 Trailer negotiation
+    TRAILER_FIRST = 0x0110,   // RFC 893, 1122 Trailer encapsulation
+    TRAILER_LAST  = 0x0f10
   };
 
 }

api/net/inet.hpp

@@ -26,40 +26,45 @@
 
 namespace net {
 
-
-  class TCP;
-  class UDP;
-  class DHClient;
+  class   TCP;
+  class   UDP;
+  class   DHClient;
+  struct  ICMPv4;
 
   /**
    * An abstract IP-stack interface.
    * Provides a common interface for IPv4 and (future) IPv6, simplified with
    *  no constructors etc.
    **/
-  template <typename IPV >
+  template <typename IPV>
   struct Inet {
     using Stack = Inet<IPV>;
     using Forward_delg = delegate<void(Stack& source, typename IPV::IP_packet_ptr)>;
     using Route_checker = delegate<bool(typename IPV::addr)>;
     using IP_packet_factory = delegate<typename IPV::IP_packet_ptr(Protocol)>;
 
+    using Error_type = icmp4::Type;
+    using Error_code = uint8_t;
+
     template <typename IPv>
     using resolve_func = delegate<void(typename IPv::addr)>;
 
-
     ///
     /// NETWORK CONFIGURATION
     ///
 
     /** Get IP address of this interface **/
-    virtual typename IPV::addr ip_addr() = 0;
+    virtual typename IPV::addr ip_addr()  = 0;
 
     /** Get netmask of this interface **/
-    virtual typename IPV::addr netmask() = 0;
+    virtual typename IPV::addr netmask()  = 0;
 
     /** Get default gateway for this interface **/
     virtual typename IPV::addr gateway()  = 0;
 
+    /** Get default dns for this interface **/
+    virtual typename IPV::addr dns()      = 0;
+
    /** Set default gateway for this interface */
     virtual void set_gateway(typename IPV::addr server) = 0;
 
@@ -94,6 +99,15 @@ namespace net {
     /** Get the UDP protocol object for this interface */
     virtual UDP&       udp()    = 0;
 
+    /** Get the ICMP protocol object for this interface */
+    virtual ICMPv4&     icmp()    = 0;
+
+    /**
+     *  Error report in accordance with RFC 1122
+     *  An ICMP error message has been received - forward to transport layer (UDP or TCP)
+    */
+    virtual void error_report(Error_type type, Error_code code, Packet_ptr orig_pckt) = 0;
+
 
     ///
     /// DNS

api/net/inet4.hpp

@@ -22,7 +22,7 @@
 #include "ip4/arp.hpp"
 #include "ip4/ip4.hpp"
 #include "ip4/udp.hpp"
-#include "ip4/icmpv4.hpp"
+#include "ip4/icmp4.hpp"
 #include "dns/client.hpp"
 #include "tcp/tcp.hpp"
 #include <vector>
@@ -53,6 +53,9 @@ namespace net {
     IP4::addr gateway() override
     { return gateway_; }
 
+    IP4::addr dns() override
+    { return dns_server; }
+
     IP4& ip_obj() override
     { return ip4_; }
 
@@ -71,9 +74,18 @@ namespace net {
     /** Get the UDP-object belonging to this stack */
     UDP& udp() override { return udp_; }
 
+    /** Get the ICMP-object belonging to this stack */
+    ICMPv4& icmp() override { return icmp_; }
+
     /** Get the DHCP client (if any) */
     auto dhclient() { return dhcp_;  }
 
+    /**
+     *  Error report in accordance with RFC 1122
+     *  An ICMP error message has been received - forward to transport layer (UDP or TCP)
+    */
+    void error_report(Error_type type, Error_code code, Packet_ptr orig_pckt) override;
+
     /**
      * Set the forwarding delegate used by this stack.
      * If set it will get all incoming packets not intended for this stack.
@@ -125,7 +137,7 @@ namespace net {
     void resolve(const std::string& hostname,
                  resolve_func<IP4>  func) override
     {
-      dns.resolve(this->dns_server, hostname, func);
+      dns_.resolve(this->dns_server, hostname, func);
     }
 
     void set_gateway(IP4::addr gateway) override
@@ -253,7 +265,7 @@ namespace net {
     TCP    tcp_;
 
     // we need this to store the cache per-stack
-    DNSClient dns;
+    DNSClient dns_;
 
     std::shared_ptr<net::DHClient> dhcp_{};
 

api/net/inet64.hpp

@@ -32,7 +32,7 @@
 #include <vector>
 
 #include <nic.hpp>
-#include "ip4/icmpv4.hpp"
+#include "ip4/icmp4.hpp"
 
 namespace net {
 
@@ -96,7 +96,7 @@ namespace net {
     static Inet& up()
     {
       if (_ip4_list.size() < 1)
-        printf("<Inet> Is bringing up an IP stack without any IP addresses");      
+        printf("<Inet> Is bringing up an IP stack without any IP addresses");
       static Inet instance;
       return instance;
     }

api/net/inet_common.hpp

@@ -24,6 +24,7 @@
 #include <net/packet.hpp>
 #include <hw/mac_addr.hpp>
 #include <net/ethernet/ethertype.hpp>
+#include <net/ip4/icmp4_common.hpp>
 
 namespace net {
   // Packet must be forward declared to avoid circular dependency
@@ -116,9 +117,9 @@ namespace net {
    * http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml
    */
   enum class Protocol : uint8_t {
-    HOPOPT = 0,
+    HOPOPT  =  0,
     ICMPv4  =  1,
-    IP4v4   =  4,  // IPv4 encapsulation
+    IPv4    =  4,  // IPv4 encapsulation
     TCP     =  6,
     UDP     = 17,
     IPv6    = 41,  // IPv6 encapsulation