Changes in uspace/lib/c/generic/inet/addr.c [30c5d13:02a09ed] in mainline

File:

• uspace/lib/c/generic/inet/addr.c (modified) (4 diffs)

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

@@ -70 +70 @@
 {
         memcpy(dst, src, 16);
-}
-
-int addr128_compare(const addr128_t a, const addr128_t b)
-{
-        return memcmp(a, b, 16);
 }
 
@@ -217 +212 @@
 }
 
-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)
 {
@@ -247 +234 @@
                 return (a->addr == b->addr);
         case AF_INET6:
-                return addr128_compare(a->addr6, b->addr6);
+                return memcmp(&a->addr6, &b->addr6, 16);
         default:
                 return 0;
@@ -258 +245 @@
             (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;
-        }
 }