Changeset 0c2d9bb in mainline for uspace/srv/net/ethip/arp.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/srv/net/ethip/arp.c (modified) (3 diffs)

uspace/srv/net/ethip/arp.c

@@ -40 +40 @@
 #include <inet/addr.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
 #include "arp.h"
 #include "atrans.h"
@@ -73 +72 @@
         
         addr32_t laddr_v4;
-        uint16_t laddr_af = inet_addr_get(&laddr->addr, &laddr_v4, NULL);
-        if (laddr_af != AF_INET)
+        ip_ver_t laddr_ver = inet_addr_get(&laddr->addr, &laddr_v4, NULL);
+        if (laddr_ver != ip_v4)
                 return;
         
@@ -98 +97 @@
     addr48_t mac_addr)
 {
+        /* Broadcast address */
+        if (ip_addr == addr32_broadcast_all_hosts) {
+                addr48(addr48_broadcast, mac_addr);
+                return EOK;
+        }
+
         int rc = atrans_lookup(ip_addr, mac_addr);
         if (rc == EOK)