From 18ad89136e3fe5867da9f79885db0d2eba9ac061 Mon Sep 17 00:00:00 2001 Message-Id: <18ad89136e3fe5867da9f79885db0d2eba9ac061.1715701876.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 1 Jan 2007 12:52:10 +0000 Subject: [PATCH] server/admin: Fix tokenization of statistics output. Organization: Straylight/Edgeware From: Mark Wooding --- server/admin.c | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/server/admin.c b/server/admin.c index 44c9b2b3..bd5cc029 100644 --- a/server/admin.c +++ b/server/admin.c @@ -1338,17 +1338,27 @@ static void acmd_stats(admin *a, unsigned ac, char *av[]) a_info(a, "start-time=%s", timestr(st->t_start), A_END); a_info(a, "last-packet-time=%s", timestr(st->t_last), A_END); a_info(a, "last-keyexch-time=%s", timestr(st->t_kx), A_END); - a_info(a, "packets-in=%lu bytes-in=%lu", st->n_in, st->sz_in, A_END); - a_info(a, "packets-out=%lu bytes-out=%lu", - st->n_out, st->sz_out, A_END); - a_info(a, "keyexch-packets-in=%lu keyexch-bytes-in=%lu", - st->n_kxin, st->sz_kxin, A_END); - a_info(a, "keyexch-packets-out=%lu keyexch-bytes-out=%lu", - st->n_kxout, st->sz_kxout, A_END); - a_info(a, "ip-packets-in=%lu ip-bytes-in=%lu", - st->n_ipin, st->sz_ipin, A_END); - a_info(a, "ip-packets-out=%lu ip-bytes-out=%lu", - st->n_ipout, st->sz_ipout, A_END); + a_info(a, "packets-in=%lu", st->n_in, "bytes-in=%lu", st->sz_in, A_END); + a_info(a, + "packets-out=%lu", st->n_out, + "bytes-out=%lu", st->sz_out, + A_END); + a_info(a, + "keyexch-packets-in=%lu", st->n_kxin, + "keyexch-bytes-in=%lu", st->sz_kxin, + A_END); + a_info(a, + "keyexch-packets-out=%lu", st->n_kxout, + "keyexch-bytes-out=%lu", st->sz_kxout, + A_END); + a_info(a, + "ip-packets-in=%lu", st->n_ipin, + "ip-bytes-in=%lu", st->sz_ipin, + A_END); + a_info(a, + "ip-packets-out=%lu", st->n_ipout, + "ip-bytes-out=%lu", st->sz_ipout, + A_END); a_info(a, "rejected-packets=%lu", st->n_reject, A_END); a_ok(a); } -- [mdw]