server/peer: Use hash tables to find peer records.

[tripe] / server / admin.c

diff --git a/server/admin.c b/server/admin.c
index 73c710709f2bfbc52acf11b50ada6c3b088bcdab..288a64ff413f196ffef40fe0ac09302ddbd77006 100644 (file)
--- a/server/admin.c
+++ b/server/admin.c
@@ -499,12 +499,9 @@ void a_notify(const char *fmt, ...)
 
 void a_quit(void)
 {
-  peer *p;
-
   close(sock.fd);
   unlink(sockname);
-  while ((p = p_first()) != 0)
-    p_destroy(p);
+  FOREACH_PEER(p, { p_destroy(p); });
   exit(0);
 }
 
@@ -1177,7 +1174,9 @@ static void a_doadd(admin_resop *r, int rc)
   if (rc == ARES_OK) {
     add->peer.sasz = add->r.sasz;
     add->peer.sa = add->r.sa;
-    if (p_find(add->peer.name))
+    if (p_findbyaddr(&add->r.sa))
+      a_bgfail(&add->r.bg, "peer-addr-exists", "?ADDR", &add->r.sa, A_END);
+    else if (p_find(add->peer.name))
       a_bgfail(&add->r.bg, "peer-exists", "%s", add->peer.name, A_END);
     else if (!p_create(&add->peer))
       a_bgfail(&add->r.bg, "peer-create-fail", "%s", add->peer.name, A_END);
@@ -1648,10 +1647,7 @@ static void acmd_bgcancel(admin *a, unsigned ac, char *av[])
 
 static void acmd_list(admin *a, unsigned ac, char *av[])
 {
-  peer *p;
-
-  for (p = p_first(); p; p = p_next(p))
-    a_info(a, "%s", p_name(p), A_END);
+  FOREACH_PEER(p, {  a_info(a, "%s", p_name(p), A_END); });
   a_ok(a);
 }