Changeset bdae198 in mainline for uspace/lib/c/generic/inet/addr.c

Timestamp:

2013-08-04T12:01:10Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea50906

Parents:

b08879c2 (diff), d856110 (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/lib/c/generic/inet/addr.c (modified) (5 diffs)

uspace/lib/c/generic/inet/addr.c

@@ -52 +52 @@
 };
 
+static const addr48_t inet_addr48_solicited_node = {
+        0x33, 0x33, 0xff, 0, 0, 0
+};
+
 static const inet_addr_t inet_addr_any_addr = {
         .family = AF_INET,
@@ -70 +74 @@
 {
         memcpy(dst, src, 16);
+}
+
+int addr48_compare(const addr48_t a, const addr48_t b)
+{
+        return memcmp(a, b, 6);
+}
+
+int addr128_compare(const addr128_t a, const addr128_t b)
+{
+        return memcmp(a, b, 16);
+}
+
+/** Compute solicited node MAC multicast address from target IPv6 address
+ *
+ * @param ip  Target IPv6 address
+ * @param mac Solicited MAC address to be assigned
+ *
+ */
+void addr48_solicited_node(const addr128_t ip, addr48_t mac)
+{
+        memcpy(mac, inet_addr48_solicited_node, 3);
+        memcpy(mac + 3, ip + 13, 3);
 }
 
@@ -212 +238 @@
 }
 
+void inet_addr_naddr(const inet_addr_t *addr, uint8_t prefix,
+    inet_naddr_t *naddr)
+{
+        naddr->family = addr->family;
+        memcpy(naddr->addr6, addr->addr6, 16);
+        naddr->prefix = prefix;
+}
+
 void inet_addr_any(inet_addr_t *addr)
 {
@@ -234 +268 @@
                 return (a->addr == b->addr);
         case AF_INET6:
-                return memcmp(&a->addr6, &b->addr6, 16);
+                return addr128_compare(a->addr6, b->addr6);
         default:
                 return 0;
@@ -245 +279 @@
             (inet_addr_compare(addr, &inet_addr_any_addr)) ||
             (inet_addr_compare(addr, &inet_addr_any_addr6)));
+}
+
+int inet_naddr_compare(const inet_naddr_t *naddr, const inet_addr_t *addr)
+{
+        if (naddr->family != addr->family)
+                return 0;
+        
+        switch (naddr->family) {
+        case AF_INET:
+                return (naddr->addr == addr->addr);
+        case AF_INET6:
+                return addr128_compare(naddr->addr6, addr->addr6);
+        default:
+                return 0;
+        }
 }