X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/a9279e37b649abd11bbc416398cfaf787cd8d865..add23883a6378567be6b7866bc2ff2c32400a346:/server/admin.c

diff --git a/server/admin.c b/server/admin.c
index 8eb5ec3c..25581f65 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -51,7 +51,9 @@ unsigned tr_flags = 0;
 #endif
 
 static const trace_opt w_opts[] = {
+#ifndef NTRACE
   { 't',	AF_TRACE,	"trace messages" },
+#endif
   { 'n',	AF_NOTE,	"asynchronous notifications" },
   { 'w',	AF_WARN,	"warnings" },
   { 'A',	AF_ALLMSGS,	"all of the above" },
@@ -313,6 +315,26 @@ void a_vformat(dstr *d, const char *fmt, va_list ap)
   dstr_destroy(&dd);
 }
 
+/* --- @a_format@ --- *
+ *
+ * Arguments:	@dstr *d@ = where to leave the formatted message
+ *		@const char *fmt@ = pointer to format string
+ *
+ * Returns:	---
+ *
+ * Use:		Writes a tokenized message into a string, for later
+ *		presentation.
+ */
+
+void a_format(dstr *d, const char *fmt, ...)
+{
+  va_list ap;
+
+  va_start(ap, fmt);
+  a_vformat(d, fmt, ap);
+  va_end(ap);
+}
+
 /* --- @a_write@, @a_vwrite@ --- *
  *
  * Arguments:	@admin *a@ = admin connection to write to
@@ -1230,9 +1252,10 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
   add = xmalloc(sizeof(*add));
   add->peer.name = 0;
   add->peer.tag = 0;
+  add->peer.privtag = 0;
   add->peer.t_ka = 0;
   add->peer.tops = tun_default;
-  add->peer.kxf = 0;
+  add->peer.f = 0;
 
   /* --- Parse options --- */
 
@@ -1252,12 +1275,18 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
       }
     })
     OPTTIME("-keepalive", t, { add->peer.t_ka = t; })
-    OPT("-cork", { add->peer.kxf |= KXF_CORK; })
+    OPT("-cork", { add->peer.f |= KXF_CORK; })
     OPTARG("-key", arg, {
       if (add->peer.tag)
 	xfree(add->peer.tag);
       add->peer.tag = xstrdup(arg);
     })
+    OPT("-mobile", { add->peer.f |= PSF_MOBILE; })
+    OPTARG("-priv", arg, {
+      if (add->peer.privtag)
+	xfree(add->peer.privtag);
+      add->peer.privtag = xstrdup(arg);
+    })
   });
 
   /* --- Make sure someone's not got there already --- */
@@ -1283,6 +1312,7 @@ bad_syntax:
 fail:
   if (add->peer.name) xfree(add->peer.name);
   if (add->peer.tag) xfree(add->peer.tag);
+  if (add->peer.privtag) xfree(add->peer.privtag);
   xfree(add);
   return;
 }
@@ -1676,29 +1706,58 @@ static void acmd_bgcancel(admin *a, unsigned ac, char *av[])
 
 static void acmd_algs(admin *a, unsigned ac, char *av[])
 {
+  peer *p;
+  const kdata *kd;
+  const group *g;
+  const algswitch *algs;
+
+  if (!ac)
+    kd = master;
+  else {
+    if ((p = a_findpeer(a, av[0])) == 0) return;
+    kd = p->kx.kpriv;
+  }
+  g = kd->g;
+  algs = &kd->algs;
+
   a_info(a,
-	 "kx-group=%s", gg->ops->name,
-	 "kx-group-order-bits=%lu", (unsigned long)mp_bits(gg->r),
-	 "kx-group-elt-bits=%lu", (unsigned long)gg->nbits,
-	 A_END);
-  a_info(a,
-	 "hash=%s", algs.h->name,
-	 "mgf=%s", algs.mgf->name,
-	 "hash-sz=%lu", (unsigned long)algs.h->hashsz,
+	 "kx-group=%s", g->ops->name,
+	 "kx-group-order-bits=%lu", (unsigned long)mp_bits(g->r),
+	 "kx-group-elt-bits=%lu", (unsigned long)g->nbits,
 	 A_END);
   a_info(a,
-	 "cipher=%s", algs.c->name,
-	 "cipher-keysz=%lu", (unsigned long)algs.cksz,
-	 "cipher-blksz=%lu", (unsigned long)algs.c->blksz,
+	 "hash=%s", algs->h->name,
+	 "mgf=%s", algs->mgf->name,
+	 "hash-sz=%lu", (unsigned long)algs->h->hashsz,
 	 A_END);
   a_info(a,
-	 "cipher-data-limit=%lu", (unsigned long)algs.expsz,
+	 "bulk-transform=%s", algs->bulk->name,
+	 "bulk-overhead=%lu", (unsigned long)algs->bulk->overhead(algs),
 	 A_END);
+  if (algs->c) {
+    a_info(a,
+	   "cipher=%s", algs->c->name,
+	   "cipher-keysz=%lu", (unsigned long)algs->cksz,
+	   "cipher-blksz=%lu", (unsigned long)algs->c->blksz,
+	   A_END);
+  }
   a_info(a,
-	 "mac=%s", algs.m->name,
-	 "mac-keysz=%lu", (unsigned long)algs.mksz,
-	 "mac-tagsz=%lu", (unsigned long)algs.tagsz,
+	 "cipher-data-limit=%lu", (unsigned long)algs->expsz,
 	 A_END);
+  if (algs->m) {
+    a_info(a,
+	   "mac=%s", algs->m->name,
+	   "mac-keysz=%lu", (unsigned long)algs->mksz,
+	   "mac-tagsz=%lu", (unsigned long)algs->tagsz,
+	   A_END);
+  }
+  if (algs->b) {
+    a_info(a,
+	   "blkc=%.*s", strlen(algs->b->name) - 4, algs->b->name,
+	   "blkc-keysz=%lu", (unsigned long)algs->bksz,
+	   "blkc-blksz=%lu", (unsigned long)algs->b->blksz,
+	   A_END);
+  }
   a_ok(a);
 }
 
@@ -1789,11 +1848,16 @@ static void acmd_peerinfo(admin *a, unsigned ac, char *av[])
 {
   peer *p;
   const peerspec *ps;
+  const char *ptag;
 
   if ((p = a_findpeer(a, av[0])) != 0) {
     ps = p_spec(p);
     a_info(a, "tunnel=%s", ps->tops->name, A_END);
-    a_info(a, "key=%s", p_tag(p), A_END);
+    a_info(a, "key=%s", p_tag(p),
+	   "current-key=%s", p->kx.kpub->tag, A_END);
+    if ((ptag = p_privtag(p)) == 0) ptag = "(default)";
+    a_info(a, "private-key=%s", ptag,
+	   "current-private-key=%s", p->kx.kpriv->tag, A_END);
     a_info(a, "keepalive=%lu", ps->t_ka, A_END);
     a_ok(a);
   }
@@ -1903,7 +1967,7 @@ static void acmd_help(admin */*a*/, unsigned /*ac*/, char */*av*/[]);
 static const acmd acmdtab[] = {
   { "add",	"[OPTIONS] PEER ADDR ...", 2,	0xffff,	acmd_add },
   { "addr",	"PEER",			1,	1,	acmd_addr },
-  { "algs",	0,			0,	0,	acmd_algs },
+  { "algs",	"[PEER]",		0,	1,	acmd_algs },
   { "bgcancel",	"TAG",			1,	1,	acmd_bgcancel },
   { "checkchal", "CHAL",		1,	1,	acmd_checkchal },
   { "daemon",	0,			0,	0,	acmd_daemon },