Merge branch 'dev' of github.com:hioa-cs/IncludeOS into dev

Author: AnnikaH

src/net/dhcp/dh4client.cpp

@@ -206,7 +206,7 @@ namespace net
     dhcp->hops  = 0;
     dhcp->xid   = htonl(this->xid);
     dhcp->secs  = 0;
-    dhcp->flags = htons(BOOTP_UNICAST);
+    dhcp->flags = htons(BOOTP_BROADCAST);
     dhcp->ciaddr = IP4::INADDR_ANY;
     dhcp->yiaddr = IP4::INADDR_ANY;
     dhcp->siaddr = IP4::INADDR_ANY;
@@ -374,7 +374,7 @@ namespace net
     resp->hops  = 0;
     resp->xid   = htonl(this->xid);
     resp->secs  = 0;
-    resp->flags = htons(BOOTP_UNICAST);
+    resp->flags = htons(BOOTP_BROADCAST);
 
     resp->ciaddr = IP4::INADDR_ANY;
     resp->yiaddr = IP4::INADDR_ANY;

src/net/ip4/ip4.cpp

@@ -48,8 +48,9 @@ namespace net {
     auto data = pckt->buffer();
     ip_header* hdr = &reinterpret_cast<full_header*>(data)->ip_hdr;
 
-    // Drop if my ip address doesn't match destination ip address
-    if(UNLIKELY(local_ip() != hdr->daddr)) {
+    // Drop if my ip address doesn't match destination ip address or broadcast
+    if(UNLIKELY(hdr->daddr != local_ip() and
+                hdr->daddr != INADDR_BCAST)) {
       packets_dropped_++;
       return;
     }