From: bodea Date: Wed, 12 Jan 2005 05:20:49 +0000 (+0000) Subject: fix clear counters; show counters alignment X-Git-Tag: release_2_0_15~6 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/d05fcc442532029fdee18f3da6982482e13de974 fix clear counters; show counters alignment --- diff --git a/cli.c b/cli.c index cde1649..10c2ed5 100644 --- a/cli.c +++ b/cli.c @@ -2,7 +2,7 @@ // vim: sw=8 ts=8 char const *cvs_name = "$Name: $"; -char const *cvs_id_cli = "$Id: cli.c,v 1.43.2.1 2005/01/10 07:08:12 bodea Exp $"; +char const *cvs_id_cli = "$Id: cli.c,v 1.43.2.2 2005/01/12 05:20:49 bodea Exp $"; #include #include @@ -645,24 +645,24 @@ static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, in if (CLI_HELP_REQUESTED) return CLI_HELP_NO_ARGS; - cli_print(cli, "%-10s %10s %8s %8s %8s", "Ethernet", "Bytes", "Packets", "Errors", "Dropped"); - cli_print(cli, "%-10s %10u %8u %8u %8u", "RX", + cli_print(cli, "%-10s %10s %10s %10s %10s", "Ethernet", "Bytes", "Packets", "Errors", "Dropped"); + cli_print(cli, "%-10s %10u %10u %10u %10u", "RX", GET_STAT(tun_rx_bytes), GET_STAT(tun_rx_packets), GET_STAT(tun_rx_errors), GET_STAT(tun_rx_dropped)); - cli_print(cli, "%-10s %10u %8u %8u", "TX", + cli_print(cli, "%-10s %10u %10u %10u", "TX", GET_STAT(tun_tx_bytes), GET_STAT(tun_tx_packets), GET_STAT(tun_tx_errors)); cli_print(cli, ""); - cli_print(cli, "%-10s %10s %8s %8s %8s", "Tunnel", "Bytes", "Packets", "Errors", "Retries"); - cli_print(cli, "%-10s %10u %8u %8u", "RX", + cli_print(cli, "%-10s %10s %10s %10s %10s", "Tunnel", "Bytes", "Packets", "Errors", "Retries"); + cli_print(cli, "%-10s %10u %10u %10u", "RX", GET_STAT(tunnel_rx_bytes), GET_STAT(tunnel_rx_packets), GET_STAT(tunnel_rx_errors)); - cli_print(cli, "%-10s %10u %8u %8u %8u", "TX", + cli_print(cli, "%-10s %10u %10u %10u %10u", "TX", GET_STAT(tunnel_tx_bytes), GET_STAT(tunnel_tx_packets), GET_STAT(tunnel_tx_errors), @@ -1113,8 +1113,10 @@ static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, i if (CLI_HELP_REQUESTED) return CLI_HELP_NO_ARGS; - cli_print(cli, "Counters cleared"); + memset(_statistics, 0, sizeof(struct Tstats)); SET_STAT(last_reset, time(NULL)); + + cli_print(cli, "Counters cleared"); return CLI_OK; }