Changeset f94b24c8 in mainline for uspace/srv/net/inetsrv/ndp.c

Timestamp:

2013-07-29T13:54:20Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

a1c95da

Parents:

09d6695 (diff), ccdc63e (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 with mainline branch.

File:

• uspace/srv/net/inetsrv/ndp.c (modified) (2 diffs)

uspace/srv/net/inetsrv/ndp.c

@@ -49 +49 @@
 #define NDP_REQUEST_TIMEOUT  (3 * 1000 * 1000)
 
-static addr48_t solicited_node_mac =
-    {0x33, 0x33, 0xff, 0, 0, 0};
-
 static addr128_t solicited_node_ip =
     {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0xff, 0, 0, 0};
-
-/** Compute solicited node MAC multicast address from target IPv6 address
- *
- * @param ip_addr  Target IPv6 address
- * @param mac_addr Solicited MAC address to be assigned
- *
- */
-static void ndp_solicited_node_mac(addr128_t ip_addr, addr48_t mac_addr)
-{
-        memcpy(mac_addr, solicited_node_mac, 3);
-        memcpy(mac_addr + 3, ip_addr + 13, 3);
-}
 
 /** Compute solicited node IPv6 multicast address from target IPv6 address
@@ -186 +171 @@
         addr128(src_addr, packet.sender_proto_addr);
         addr128(ip_addr, packet.solicited_ip);
-        ndp_solicited_node_mac(ip_addr, packet.target_hw_addr);
+        addr48_solicited_node(ip_addr, packet.target_hw_addr);
         ndp_solicited_node_ip(ip_addr, packet.target_proto_addr);