X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/bd322830c81423f475cfd70ebef88bfebb16cef0..5d06f63eaa34a4bf0e116f3e2a1e4ef4e6434224:/server/admin.c

diff --git a/server/admin.c b/server/admin.c
index 5e6c7d87..3b99848c 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -1110,7 +1110,6 @@ static void a_resolve(admin *a, admin_resop *r, const char *tag,
     goto fail;
   }
   r->sa.sin.sin_family = AF_INET;
-  r->sasz = sizeof(r->sa.sin);
   r->addr = xstrdup(av[i]);
   if (!av[i + 1])
     pt = TRIPE_PORT;
@@ -1223,7 +1222,6 @@ static void a_doadd(admin_resop *r, int rc)
   T( trace(T_ADMIN, "admin: done add op %s", BGTAG(add)); )
 
   if (rc == ARES_OK) {
-    add->peer.sasz = add->r.sasz;
     add->peer.sa = add->r.sa;
     if (p_findbyaddr(&add->r.sa))
       a_bgfail(&add->r.bg, "peer-addr-exists", "?ADDR", &add->r.sa, A_END);
@@ -1668,7 +1666,24 @@ static void acmd_warn(admin *a, unsigned ac, char *av[])
   { alertcmd(a, AF_WARN, AF_WARN, "WARN", av); }
 
 static void acmd_port(admin *a, unsigned ac, char *av[])
-  { a_info(a, "%u", p_port(), A_END); a_ok(a); }
+{
+  int i;
+
+  if (ac) {
+    for (i = 0; i < NADDRFAM; i++)
+      if (mystrieq(av[0], aftab[i].name)) goto found;
+    a_fail(a, "unknown-address-family", "%s", av[0], A_END);
+    return;
+  found:
+    assert(udpsock[i].fd >= 0);
+  } else {
+    for (i = 0; i < NADDRFAM; i++)
+      if (udpsock[i].fd >= 0) goto found;
+    abort();
+  }
+  a_info(a, "%u", p_port(i), A_END);
+  a_ok(a);
+}
 
 static void acmd_daemon(admin *a, unsigned ac, char *av[])
 {
@@ -1979,11 +1994,12 @@ static const acmd acmdtab[] = {
   { "notify",	"MESSAGE ...",		1,	0xffff,	acmd_notify },
   { "peerinfo",	"PEER",			1,	1,	acmd_peerinfo },
   { "ping",	"[OPTIONS] PEER",	1,	0xffff,	acmd_ping },
-  { "port",	0,			0,	0,	acmd_port },
+  { "port",	"[FAMILY]",		0,	1,	acmd_port },
   { "quit",	0,			0,	0,	acmd_quit },
   { "reload",	0,			0,	0,	acmd_reload },
   { "servinfo",	0,			0,	0,	acmd_servinfo },
   { "setifname", "PEER NEW-NAME",	2,	2,	acmd_setifname },
+  { "stats",	"PEER",			1,	1,	acmd_stats },
   { "svcclaim",	"SERVICE VERSION",	2,	2,	acmd_svcclaim },
   { "svcensure", "SERVICE [VERSION]",	1,	2,	acmd_svcensure },
   { "svcfail",	"JOBID TOKENS...",	1,	0xffff,	acmd_svcfail },
@@ -1994,7 +2010,6 @@ static const acmd acmdtab[] = {
   { "svcrelease", "SERVICE",		1,	1,	acmd_svcrelease },
   { "svcsubmit", "[OPTIONS] SERVICE TOKENS...",
 					2,	0xffff,	acmd_svcsubmit },
-  { "stats",	"PEER",			1,	1,	acmd_stats },
 #ifndef NTRACE
   { "trace",	"[OPTIONS]",		0,	1,	acmd_trace },
 #endif
@@ -2363,7 +2378,6 @@ again:
 
   sig_add(&s_term, SIGTERM, a_sigdie, 0);
   sig_add(&s_hup, SIGHUP, a_sighup, 0);
-  signal(SIGPIPE, SIG_IGN);
   sigaction(SIGINT, 0, &sa);
   if (sa.sa_handler != SIG_IGN)
     sig_add(&s_int, SIGINT, a_sigdie, 0);