server/admin.c: Remove spurious `ping' in usage message.

[tripe] / server / addrmap.c

diff --git a/server/addrmap.c b/server/addrmap.c
index e1a9b0f..76a358e 100644 (file)
--- a/server/addrmap.c
+++ b/server/addrmap.c
@@ -72,13 +72,23 @@ void am_destroy(addrmap *m)
  * Returns:    The hash of the address.
  */
 
-uint32 hash(const addr *a)
+static uint32 hash(const addr *a)
 {
+  size_t i;
+  uint32 h;
+
   switch (a->sa.sa_family) {
     case AF_INET:
-      return (U32((AF_INET * 0x4eaac1b7ul) +
-                 (a->sin.sin_addr.s_addr * 0xa5dbc837) +
-                 (a->sin.sin_port * 0x3b049e83)));
+      return (U32(0x4eaac1b7ul*AF_INET +
+                 0xa5dbc837ul*a->sin.sin_addr.s_addr +
+                 0x3b049e83ul*a->sin.sin_port));
+    case AF_INET6:
+      for (i = 0, h = 0; i < 16; i++)
+       h = 0x6bd26a67ul*h + a->sin6.sin6_addr.s6_addr[i];
+      return (U32(0x4eaac1b7ul*AF_INET6 +
+                 0xa5dbc837ul*h +
+                 0x1d94eab4ul*a->sin6.sin6_scope_id +
+                 0x3b049e83ul*a->sin6.sin6_port));
     default:
       abort();
   }
@@ -91,7 +101,7 @@ uint32 hash(const addr *a)
  * Returns:    Nonzero if the addresses are equal.
  */
 
-int addreq(const addr *a, const addr *b)
+static int addreq(const addr *a, const addr *b)
 {
   if (a->sa.sa_family != b->sa.sa_family)
     return (0);
@@ -99,6 +109,10 @@ int addreq(const addr *a, const addr *b)
     case AF_INET:
       return (a->sin.sin_addr.s_addr == b->sin.sin_addr.s_addr &&
              a->sin.sin_port == b->sin.sin_port);
+    case AF_INET6:
+      return (!memcmp(a->sin6.sin6_addr.s6_addr,
+                     b->sin6.sin6_addr.s6_addr, 16) &&
+             a->sin6.sin6_port == b->sin6.sin6_port);
     default:
       abort();
   }