rename l2tpns.cfg as startup-config to match CONFIGFILE

[l2tpns.git] / cli.c

diff --git a/cli.c b/cli.c
index e2ef57a..0d096cb 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -1,12 +1,18 @@
 // L2TPNS Command Line Interface
 // L2TPNS Command Line Interface

-// $Id: cli.c,v 1.1 2003/12/16 07:07:39 fred_nerk Exp $

 // vim: sw=4 ts=8
 
 // vim: sw=4 ts=8
 

+char const *cvs_name = "$Name:  $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.6 2004/06/28 02:43:13 fred_nerk Exp $";
+

 #include <stdio.h>
 #include <stdio.h>

+#include <stdarg.h>

 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/stat.h>

+#include <syslog.h>

 #include <malloc.h>
 #include <malloc.h>

+#include <sched.h>

 #include <string.h>
 #include <string.h>

+#include <ctype.h>

 #include <stdlib.h>
 #include <time.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <time.h>
 #include <arpa/inet.h>


@@ -15,31 +21,34 @@
 #include <sys/types.h>
 #include <signal.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <signal.h>
 #include <unistd.h>

+#include <dlfcn.h>

 #include <libcli.h>
 #include "l2tpns.h"
 #include "util.h"
 #include <libcli.h>
 #include "l2tpns.h"
 #include "util.h"

-#include "config.h"
-
-#ifdef HAVE_LIBCLI
+#include "cluster.h"
+#include "tbf.h"
+#include "ll.h"
+#ifdef BGP
+#include "bgp.h"
+#endif

 
 extern tunnelt *tunnel;
 extern sessiont *session;
 extern radiust *radius;
 extern ippoolt *ip_address_pool;
 extern struct Tstats *_statistics;
 
 extern tunnelt *tunnel;
 extern sessiont *session;
 extern radiust *radius;
 extern ippoolt *ip_address_pool;
 extern struct Tstats *_statistics;

-extern int cli_pid;

 struct cli_def *cli = NULL;
 int cli_quit = 0;
 struct cli_def *cli = NULL;
 int cli_quit = 0;

-extern int clifd, udpfd, tapfd, snoopfd, radfd, ifrfd, cluster_sockfd;
+extern int clifd, udpfd, tapfd, snoopfd, ifrfd, cluster_sockfd;
+extern int *radfds;

 extern sessionidt *cli_session_kill;
 extern tunnelidt *cli_tunnel_kill;
 extern sessionidt *cli_session_kill;
 extern tunnelidt *cli_tunnel_kill;

-extern tbft *filter_buckets;
+extern struct configt *config;
+extern struct config_descriptt config_values[];

 #ifdef RINGBUFFER
 extern struct Tringbuffer *ringbuffer;
 #endif
 
 #ifdef RINGBUFFER
 extern struct Tringbuffer *ringbuffer;
 #endif
 

-char *rcs_id = "$Id: cli.c,v 1.1 2003/12/16 07:07:39 fred_nerk Exp $";
-

 char *debug_levels[] = {
     "CRIT",
     "ERROR",
 char *debug_levels[] = {
     "CRIT",
     "ERROR",


@@ -62,71 +71,113 @@ struct
 int debug_session;
 int debug_tunnel;
 int debug_rb_tail;
 int debug_session;
 int debug_tunnel;
 int debug_rb_tail;

-
-int cmd_show_session(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_show_tunnels(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_show_users(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_show_counters(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_show_version(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_show_pool(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_show_banana(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_clear_counters(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_drop_user(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_drop_tunnel(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_drop_session(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_snoop(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_no_snoop(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_throttle(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_no_throttle(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_debug(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_no_debug(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_watch_session(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int cmd_watch_tunnel(struct cli_def *cli, FILE *w, char *command, char **argv, int argc);
-int regular_stuff(struct cli_def *cli, FILE *w);
+FILE *save_config_fh;
+
+int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_show_users(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_show_pool(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_show_run(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_show_banana(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_show_plugins(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_show_throttle(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_show_cluster(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_write_memory(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_no_snoop(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_throttle(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_debug(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_no_debug(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_set(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, int argc);
+int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc);
+int regular_stuff(struct cli_def *cli);

 
 void init_cli()
 {
     FILE *f;
     char buf[4096];
     struct cli_command *c;
 
 void init_cli()
 {
     FILE *f;
     char buf[4096];
     struct cli_command *c;

+    struct cli_command *c2;

     int on = 1;
     struct sockaddr_in addr;
 
     cli = cli_init();
     int on = 1;
     struct sockaddr_in addr;
 
     cli = cli_init();

-
-    c = cli_register_command(cli, NULL, "show", NULL, NULL);
-    cli_register_command(cli, c, "session", cmd_show_session, "Show a list of sessions");
-    cli_register_command(cli, c, "tunnels", cmd_show_tunnels, NULL);
-    cli_register_command(cli, c, "users", cmd_show_users, NULL);
-    cli_register_command(cli, c, "version", cmd_show_version, NULL);
-    cli_register_command(cli, c, "banana", cmd_show_banana, "Show a banana");
-    cli_register_command(cli, c, "pool", cmd_show_pool, NULL);
+    cli_set_hostname(cli, "l2tpns");
+
+    c = cli_register_command(cli, NULL, "show", NULL, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, NULL);
+    cli_register_command(cli, c, "banana", cmd_show_banana, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a banana");
+#ifdef BGP
+    cli_register_command(cli, c, "bgp", cmd_show_bgp, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show BGP status");
+#endif /* BGP */
+    cli_register_command(cli, c, "cluster", cmd_show_cluster, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show cluster information");
+    cli_register_command(cli, c, "ipcache", cmd_show_ipcache, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show contents of the IP cache");
+    cli_register_command(cli, c, "plugins", cmd_show_plugins, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all installed plugins");
+    cli_register_command(cli, c, "pool", cmd_show_pool, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show the IP address allocation pool");
+    cli_register_command(cli, c, "radius", cmd_show_radius, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show active radius queries");
+    cli_register_command(cli, c, "running-config", cmd_show_run, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show the currently running configuration");
+    cli_register_command(cli, c, "session", cmd_show_session, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of sessions or details for a single session");
+    cli_register_command(cli, c, "tbf", cmd_show_tbf, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all token bucket filters in use");
+    cli_register_command(cli, c, "throttle", cmd_show_throttle, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all throttled sessions and associated TBFs");
+    cli_register_command(cli, c, "tunnels", cmd_show_tunnels, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of tunnels or details for a single tunnel");
+    cli_register_command(cli, c, "users", cmd_show_users, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of all connected users or details of selected user");
+    cli_register_command(cli, c, "version", cmd_show_version, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show currently running software version");
+
+    c2 = cli_register_command(cli, c, "histogram", NULL, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, NULL);
+    cli_register_command(cli, c2, "idle", cmd_show_hist_idle, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show histogram of session idle times");
+    cli_register_command(cli, c2, "open", cmd_show_hist_open, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show histogram of session durations");

 
 #ifdef STATISTICS
 
 #ifdef STATISTICS

-    cli_register_command(cli, c, "counters", cmd_show_counters, NULL);
+    cli_register_command(cli, c, "counters", cmd_show_counters, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Display all the internal counters and running totals");

 
 

-    c = cli_register_command(cli, NULL, "clear", NULL, NULL);
-    cli_register_command(cli, c, "counters", cmd_clear_counters, NULL);
+    c = cli_register_command(cli, NULL, "clear", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+    cli_register_command(cli, c, "counters", cmd_clear_counters, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Clear internal counters");

 #endif
 
 #endif
 

-    cli_register_command(cli, NULL, "snoop", cmd_snoop, NULL);
-    cli_register_command(cli, NULL, "throttle", cmd_throttle, NULL);
+    cli_register_command(cli, NULL, "uptime", cmd_uptime, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show uptime and bandwidth utilisation");
+
+    c = cli_register_command(cli, NULL, "write", NULL, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, NULL);
+    cli_register_command(cli, c, "memory", cmd_write_memory, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Save the running config to flash");
+    cli_register_command(cli, c, "terminal", cmd_show_run, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show the running config");

 
 

-    c = cli_register_command(cli, NULL, "no", NULL, NULL);
-    cli_register_command(cli, c, "snoop", cmd_no_snoop, NULL);
-    cli_register_command(cli, c, "throttle", cmd_no_throttle, NULL);
-    cli_register_command(cli, c, "debug", cmd_no_debug, NULL);
+    cli_register_command(cli, NULL, "snoop", cmd_snoop, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Temporarily enable interception for a user");
+    cli_register_command(cli, NULL, "throttle", cmd_throttle, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Temporarily enable throttling for a user");
+    cli_register_command(cli, NULL, "debug", cmd_debug, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Set the level of logging that is shown on the console");

 
 

-    c = cli_register_command(cli, NULL, "drop", NULL, NULL);
-    cli_register_command(cli, c, "user", cmd_drop_user, NULL);
-    cli_register_command(cli, c, "tunnel", cmd_drop_tunnel, NULL);
-    cli_register_command(cli, c, "session", cmd_drop_session, NULL);
+    c = cli_register_command(cli, NULL, "suspend", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+    cli_register_command(cli, c, "bgp", cmd_suspend_bgp, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Withdraw routes from BGP peer");

 
 

-    cli_register_command(cli, NULL, "debug", cmd_debug, "Specify a debugging level");
+    c = cli_register_command(cli, NULL, "no", NULL, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, NULL);
+    cli_register_command(cli, c, "snoop", cmd_no_snoop, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Temporarily disable interception for a user");
+    cli_register_command(cli, c, "throttle", cmd_no_throttle, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Temporarily disable throttling for a user");
+    cli_register_command(cli, c, "debug", cmd_no_debug, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Turn off logging of a certain level of debugging");
+    c2 = cli_register_command(cli, c, "suspend", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+    cli_register_command(cli, c2, "bgp", cmd_no_suspend_bgp, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Advertise routes to BGP peer");

 
 

-    c = cli_register_command(cli, NULL, "watch", NULL, NULL);
-    cli_register_command(cli, c, "session", cmd_watch_session, "Dump logs for a tunnel");
-    cli_register_command(cli, c, "tunnel", cmd_watch_tunnel, "Dump logs for a tunnel");
+    c = cli_register_command(cli, NULL, "drop", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+    cli_register_command(cli, c, "user", cmd_drop_user, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Disconnect a user");
+    cli_register_command(cli, c, "tunnel", cmd_drop_tunnel, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Disconnect a tunnel and all sessions on that tunnel");
+    cli_register_command(cli, c, "session", cmd_drop_session, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Disconnect a session");
+
+    c = cli_register_command(cli, NULL, "restart", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+    cli_register_command(cli, c, "bgp", cmd_restart_bgp, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Restart BGP");
+
+    c = cli_register_command(cli, NULL, "load", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+    cli_register_command(cli, c, "plugin", cmd_load_plugin, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Load a plugin");
+
+    c = cli_register_command(cli, NULL, "remove", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+    cli_register_command(cli, c, "plugin", cmd_remove_plugin, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Remove a plugin");
+
+    cli_register_command(cli, NULL, "set", cmd_set, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Set a configuration variable");

 
     // Enable regular processing
     cli_regular(cli, regular_stuff);
 
     // Enable regular processing
     cli_regular(cli, regular_stuff);


@@ -146,9 +197,17 @@ void init_cli()
            if (!*buf) continue;
            if (!(p = strchr((char *)buf, ':'))) continue;
            *p++ = 0;
            if (!*buf) continue;
            if (!(p = strchr((char *)buf, ':'))) continue;
            *p++ = 0;

+           if (!strcmp(buf, "enable"))
+           {
+               cli_allow_enable(cli, p);
+               log(3, 0, 0, 0, "Setting enable password\n");
+           }
+           else
+           {

            cli_allow_user(cli, buf, p);
            log(3, 0, 0, 0, "Allowing user %s to connect to the CLI\n", buf);
        }
            cli_allow_user(cli, buf, p);
            log(3, 0, 0, 0, "Allowing user %s to connect to the CLI\n", buf);
        }

+       }

        fclose(f);
     }
 
        fclose(f);
     }
 


@@ -173,16 +232,24 @@ void init_cli()
 
 void cli_do(int sockfd)
 {
 
 void cli_do(int sockfd)
 {

-    if ((cli_pid = fork())) return;
+    int i;

 
 

-    // Close sockets
-    if (udpfd) close(udpfd); udpfd = 0;
-    if (tapfd) close(tapfd); tapfd = 0;
-    if (snoopfd) close(snoopfd); snoopfd = 0;
-    if (radfd) close(radfd); radfd = 0;
-    if (ifrfd) close(ifrfd); ifrfd = 0;
-    if (cluster_sockfd) close(cluster_sockfd); cluster_sockfd = 0;
-    if (clifd) close(clifd); clifd = 0;
+    if (fork()) return;
+    if (config->scheduler_fifo)
+    {
+       int ret;
+       struct sched_param params = {0};
+       params.sched_priority = 0;
+       if ((ret = sched_setscheduler(0, SCHED_OTHER, &params)) == 0)
+       {
+           log(3, 0, 0, 0, "Dropped FIFO scheduler\n");
+       }
+       else
+       {
+           log(0, 0, 0, 0, "Error setting scheduler to OTHER: %s\n", strerror(errno));
+           log(0, 0, 0, 0, "This is probably really really bad.\n");
+       }
+    }

 
     signal(SIGPIPE, SIG_DFL);
     signal(SIGCHLD, SIG_DFL);
 
     signal(SIGPIPE, SIG_DFL);
     signal(SIGCHLD, SIG_DFL);


@@ -191,8 +258,50 @@ void cli_do(int sockfd)
     signal(SIGQUIT, SIG_DFL);
     signal(SIGKILL, SIG_DFL);
     signal(SIGALRM, SIG_DFL);
     signal(SIGQUIT, SIG_DFL);
     signal(SIGKILL, SIG_DFL);
     signal(SIGALRM, SIG_DFL);

+    signal(SIGTERM, SIG_DFL);
+
+    // Close sockets
+    if (udpfd) close(udpfd); udpfd = 0;
+    if (tapfd) close(tapfd); tapfd = 0;
+    if (snoopfd) close(snoopfd); snoopfd = 0;
+    for (i = 0; i < config->num_radfds; i++)
+       if (radfds[i]) close(radfds[i]);
+    if (ifrfd) close(ifrfd); ifrfd = 0;
+    if (cluster_sockfd) close(cluster_sockfd); cluster_sockfd = 0;
+    if (clifd) close(clifd); clifd = 0;
+#ifdef BGP
+    for (i = 0; i < BGP_NUM_PEERS; i++)
+       if (bgp_peers[i].sock != -1)
+           close(bgp_peers[i].sock);
+#endif /* BGP */
+
+    {
+       int require_auth = 1;
+       struct sockaddr_in addr;
+       int l = sizeof(addr);
+       if (getpeername(sockfd, (struct sockaddr *)&addr, &l) == 0)
+       {
+           log(3, 0, 0, 0, "Accepted connection to CLI from %s\n", inet_toa(addr.sin_addr.s_addr));
+           require_auth = addr.sin_addr.s_addr != inet_addr("127.0.0.1");
+       }
+       else
+           log(0, 0, 0, 0, "getpeername() failed on cli socket. Requiring authentication: %s\n", strerror(errno));

 
 

-    log(3, 0, 0, 0, "Accepted connection to CLI\n");
+       if (require_auth)
+       {
+           log(3, 0, 0, 0, "CLI is remote, requiring authentication\n");
+           if (!cli->users) /* paranoia */
+           {
+               log(0, 0, 0, 0, "No users for remote authentication!  Exiting CLI\n");
+               exit(0);
+           }
+       }
+       else
+       {
+           /* no username/pass required */
+           cli->users = 0;
+       }
+    }

 
     debug_session = 0;
     debug_tunnel = 0;
 
     debug_session = 0;
     debug_tunnel = 0;


@@ -202,18 +311,76 @@ void cli_do(int sockfd)
     memset(&debug_flags, 0, sizeof(debug_flags));
     debug_flags.critical = 1;
 
     memset(&debug_flags, 0, sizeof(debug_flags));
     debug_flags.critical = 1;
 

-    cli_loop(cli, sockfd, "l2tpns> ");
+    {
+       char prompt[1005];
+       snprintf(prompt, 1005, "l2tpns> ");
+       cli_loop(cli, sockfd, prompt);
+    }

 
     close(sockfd);
     log(3, 0, 0, 0, "Closed CLI connection\n");
     exit(0);
 }
 
 
     close(sockfd);
     log(3, 0, 0, 0, "Closed CLI connection\n");
     exit(0);
 }
 

-int cmd_show_session(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+void cli_print_log(struct cli_def *cli, char *string)
+{
+    log(3, 0, 0, 0, "%s\n", string);
+}
+
+void cli_do_file(FILE *fh)
+{
+    log(3, 0, 0, 0, "Reading configuration file\n");
+    cli_print_callback(cli, cli_print_log);
+    cli_file(cli, fh, PRIVILEGE_PRIVILEGED);
+    cli_print_callback(cli, NULL);
+}
+
+int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...)
+{
+    va_list ap;
+    char *desc;
+    char buf[16];
+    char *p;
+
+    va_start(ap, entry);
+    while (entry)
+    {
+       /* allow one %d */
+       if ((p = strchr(entry, '%')) && !strchr(p+1, '%') && p[1] == 'd')
+       {
+           int v = va_arg(ap, int);
+           snprintf(buf, sizeof(buf), entry, v);
+           p = buf;
+       }
+       else
+           p = entry;
+
+       desc = va_arg(ap, char *);
+       if (desc && *desc)
+           cli_print(cli, "  %-20s %s", p, desc);
+       else
+           cli_print(cli, "  %s", p);
+
+       entry = desc ? va_arg(ap, char *) : 0;
+    }
+
+    va_end(ap);
+    if (cr_ok)
+       cli_print(cli, "  <cr>");
+
+    return CLI_OK;
+}
+
+int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc)

 {
     int i;
     time_t time_now;
 
 {
     int i;
     time_t time_now;
 

+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, 1,
+           "<1-%d>", MAXSESSION-1, "Show specific session by id",
+           NULL);
+

     time(&time_now);
     if (argc > 0)
     {
     time(&time_now);
     if (argc > 0)
     {


@@ -222,66 +389,71 @@ int cmd_show_session(struct cli_def *cli, FILE *w, char *command, char **argv, i
        {
            unsigned int s;
            s = atoi(argv[i]);
        {
            unsigned int s;
            s = atoi(argv[i]);

-           if (!s || s > MAXSESSION)
+           if (s <= 0 || s >= MAXSESSION)

            {
            {

-               fprintf(w, "Invalid session id \"%s\"\r\n", argv[i]);
+               cli_print(cli, "Invalid session id \"%s\"", argv[i]);

                continue;
            }
                continue;
            }

-           fprintf(w, "\r\nSession %d:\r\n", s);
-           fprintf(w, "        User:           %s\r\n", session[s].user[0] ? session[s].user : "none");
-           fprintf(w, "        Calling Num:    %s\r\n", session[s].calling);
-           fprintf(w, "        Called Num:     %s\r\n", session[s].called);
-           fprintf(w, "        Tunnel ID:      %d\r\n", session[s].tunnel);
-           fprintf(w, "        IP address:     %s\r\n", inet_toa(htonl(session[s].ip)));
-           fprintf(w, "        HSD sid:        %lu\r\n", session[s].sid);
-           fprintf(w, "        Idle time:      %u seconds\r\n", abs(time_now - session[s].last_packet));
-           fprintf(w, "        Next Recv:      %u\r\n", session[s].nr);
-           fprintf(w, "        Next Send:      %u\r\n", session[s].ns);
-           fprintf(w, "        Bytes In/Out:   %lu/%lu\r\n", (unsigned long)session[s].cin, (unsigned long)session[s].cout);
-           fprintf(w, "        Pkts In/Out:    %lu/%lu\r\n", (unsigned long)session[s].pin, (unsigned long)session[s].pout);
-           fprintf(w, "        Radius Session: %u\r\n", session[s].radius);
-           fprintf(w, "        Rx Speed:       %lu\r\n", session[s].rx_connect_speed);
-           fprintf(w, "        Tx Speed:       %lu\r\n", session[s].tx_connect_speed);
-           fprintf(w, "        Intercepted:    %s\r\n", session[s].snoop ? "YES" : "no");
-           fprintf(w, "        Throttled:      %s\r\n", session[s].throttle ? "YES" : "no");
-           fprintf(w, "        Walled Garden:  %s\r\n", session[s].walled_garden ? "YES" : "no");
-           fprintf(w, "        Filter Bucket:  %s\r\n", session[s].tbf ? filter_buckets[session[s].tbf].handle : "none");
+           cli_print(cli, "\r\nSession %d:", s);
+           cli_print(cli, "    User:           %s", session[s].user[0] ? session[s].user : "none");
+           cli_print(cli, "    Calling Num:    %s", session[s].calling);
+           cli_print(cli, "    Called Num:     %s", session[s].called);
+           cli_print(cli, "    Tunnel ID:      %d", session[s].tunnel);
+           cli_print(cli, "    IP address:     %s", inet_toa(htonl(session[s].ip)));
+           cli_print(cli, "    HSD sid:        %lu", session[s].sid);
+           cli_print(cli, "    Idle time:      %u seconds", abs(time_now - session[s].last_packet));
+           cli_print(cli, "    Next Recv:      %u", session[s].nr);
+           cli_print(cli, "    Next Send:      %u", session[s].ns);
+           cli_print(cli, "    Bytes In/Out:   %lu/%lu", (unsigned long)session[s].total_cout, (unsigned long)session[s].total_cin);
+           cli_print(cli, "    Pkts In/Out:    %lu/%lu", (unsigned long)session[s].pout, (unsigned long)session[s].pin);
+           cli_print(cli, "    MRU:            %d", session[s].mru);
+           cli_print(cli, "    Radius Session: %u", session[s].radius);
+           cli_print(cli, "    Rx Speed:       %lu", session[s].rx_connect_speed);
+           cli_print(cli, "    Tx Speed:       %lu", session[s].tx_connect_speed);
+           if (session[s].snoop_ip && session[s].snoop_port)
+               cli_print(cli, "        Intercepted:    %s:%d", inet_toa(session[s].snoop_ip), session[s] .snoop_port);
+           else
+               cli_print(cli, "        Intercepted:    no");
+           cli_print(cli, "    Throttled:      %s", session[s].throttle ? "YES" : "no");
+           cli_print(cli, "    Walled Garden:  %s", session[s].walled_garden ? "YES" : "no");
+           cli_print(cli, "    Filter BucketI: %d", session[s].tbf_in);
+           cli_print(cli, "    Filter BucketO: %d", session[s].tbf_out);

        }
        return CLI_OK;
     }
 
     // Show Summary
        }
        return CLI_OK;
     }
 
     // Show Summary

-    fprintf(w, "  %s %4s %-32s %-15s %s %s %s %10s %10s %10s %4s %-15s %s\r\n",
+    cli_print(cli, "  %s %4s %-32s %-15s %s %s %s %10s %10s %10s %4s %-15s %s",

            "SID",
            "TID",
            "Username",
            "IP",
            "I",
            "T",
            "SID",
            "TID",
            "Username",
            "IP",
            "I",
            "T",

-           "S",
+           "G",

            "opened",
            "downloaded",
            "uploaded",
            "idle",
            "LAC",
            "CLI");
            "opened",
            "downloaded",
            "uploaded",
            "idle",
            "LAC",
            "CLI");

-    for (i = 0; i < MAXSESSION; i++)
+    for (i = 1; i < MAXSESSION; i++)

     {
        char *userip, *tunnelip;
        if (!session[i].opened) continue;
        userip = strdup(inet_toa(htonl(session[i].ip)));
        tunnelip = strdup(inet_toa(htonl(tunnel[ session[i].tunnel ].ip)));
     {
        char *userip, *tunnelip;
        if (!session[i].opened) continue;
        userip = strdup(inet_toa(htonl(session[i].ip)));
        tunnelip = strdup(inet_toa(htonl(tunnel[ session[i].tunnel ].ip)));

-       fprintf(w, "%5d %4d %-32s %-15s %s %s %s %10lu %10lu %10lu %4u %-15s %s\r\n",
+       cli_print(cli, "%5d %4d %-32s %-15s %s %s %s %10u %10lu %10lu %4u %-15s %s",

                i,
                session[i].tunnel,
                session[i].user[0] ? session[i].user : "*",
                userip,
                i,
                session[i].tunnel,
                session[i].user[0] ? session[i].user : "*",
                userip,

-               (session[i].snoop) ? "Y" : "N",
+               (session[i].snoop_ip && session[i].snoop_port) ? "Y" : "N",

                (session[i].throttle) ? "Y" : "N",
                (session[i].walled_garden) ? "Y" : "N",
                (session[i].throttle) ? "Y" : "N",
                (session[i].walled_garden) ? "Y" : "N",

-               (unsigned long)session[i].opened,
-               (unsigned long)session[i].cout,
-               (unsigned long)session[i].cin,
+               abs(time_now - (unsigned long)session[i].opened),
+               (unsigned long)session[i].total_cout,
+               (unsigned long)session[i].total_cin,

                abs(time_now - (session[i].last_packet ? session[i].last_packet : time_now)),
                 tunnelip,
                session[i].calling[0] ? session[i].calling : "*");
                abs(time_now - (session[i].last_packet ? session[i].last_packet : time_now)),
                 tunnelip,
                session[i].calling[0] ? session[i].calling : "*");


@@ -291,244 +463,566 @@ int cmd_show_session(struct cli_def *cli, FILE *w, char *command, char **argv, i
     return CLI_OK;
 }
 
     return CLI_OK;
 }
 

-int cmd_show_tunnels(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int argc)

 {
 {

-    int i, x;
+    int i, x, show_all = 0;

     time_t time_now;
     time_t time_now;

+    char *states[] = {
+       "Free",
+       "Open",
+       "Closing",
+       "Opening",
+    };
+
+    if (CLI_HELP_REQUESTED)
+    {
+       if (argc > 1)
+           return cli_arg_help(cli, 1,
+               "<1-%d>", MAXTUNNEL-1, "Show specific tunnel by id",
+               NULL);
+
+       return cli_arg_help(cli, 1,
+           "all", "Show all tunnels, including unused",
+           "<1-%d>", MAXTUNNEL-1, "Show specific tunnel by id",
+           NULL);
+    }

 
     time(&time_now);
     if (argc > 0)
     {
 
     time(&time_now);
     if (argc > 0)
     {

-       // Show individual tunnel
-       for (i = 0; i < argc; i++)
+       if (strcmp(argv[0], "all") == 0)
+       {
+           show_all = 1;
+       }
+       else

        {
        {

-           char s[65535] = {0};
-           unsigned int t;
-           t = atoi(argv[i]);
-           if (!t || t > MAXTUNNEL)
+           // Show individual tunnel
+           for (i = 0; i < argc; i++)

            {
            {

-               fprintf(w, "Invalid tunnel id \"%s\"\r\n", argv[i]);
-               continue;
+               char s[65535] = {0};
+               unsigned int t;
+               t = atoi(argv[i]);
+               if (t <= 0 || t >= MAXTUNNEL)
+               {
+                   cli_print(cli, "Invalid tunnel id \"%s\"", argv[i]);
+                   continue;
+               }
+               cli_print(cli, "\r\nTunnel %d:", t);
+               cli_print(cli, "        State:          %s", states[tunnel[t].state]);
+               cli_print(cli, "        Hostname:       %s", tunnel[t].hostname[0] ? tunnel[t].hostname : "(none)");
+               cli_print(cli, "        Remote IP:      %s", inet_toa(htonl(tunnel[t].ip)));
+               cli_print(cli, "        Remote Port:    %d", tunnel[t].port);
+               cli_print(cli, "        Rx Window:      %u", tunnel[t].window);
+               cli_print(cli, "        Next Recv:      %u", tunnel[t].nr);
+               cli_print(cli, "        Next Send:      %u", tunnel[t].ns);
+               cli_print(cli, "        Queue Len:      %u", tunnel[t].controlc);
+               cli_print(cli, "        Last Packet Age:%u", (unsigned)(time_now - tunnel[t].last));
+
+               for (x = 0; x < MAXSESSION; x++)
+                       if (session[x].tunnel == t && session[x].opened && !session[x].die)
+                               sprintf(s, "%s%u ", s, x);
+               cli_print(cli, "        Sessions:       %s", s);

            }
            }

-           fprintf(w, "\r\nTunnel %d:\r\n", t);
-           fprintf(w, "        Hostname:       %s\r\n", tunnel[t].hostname[0] ? tunnel[t].hostname : "(none)");
-           fprintf(w, "        Remote IP:      %s\r\n", inet_toa(htonl(tunnel[t].ip)));
-           fprintf(w, "        Remote Port:    %d\r\n", tunnel[t].port);
-           fprintf(w, "        Rx Window:      %u\r\n", tunnel[t].window);
-           fprintf(w, "        Next Recv:      %u\r\n", tunnel[t].nr);
-           fprintf(w, "        Next Send:      %u\r\n", tunnel[t].ns);
-           fprintf(w, "        Queue Len:      %u\r\n", tunnel[t].controlc);
-           fprintf(w, "        Last Packet Age:%u\r\n", (unsigned)(time_now - tunnel[t].last));
-
-           for (x = 0; x < MAXSESSION; x++)
-                   if (session[x].tunnel == t && session[x].opened && !session[x].die)
-                           sprintf(s, "%s%u ", s, x);
-           fprintf(w, "        Sessions:       %s\r\n", s);
+           return CLI_OK;

        }
        }

-       return CLI_OK;

     }
 
     // Show tunnel summary
     }
 
     // Show tunnel summary

-    fprintf(w, "%s %s %s %s\r\n",
+    cli_print(cli, "%s %s %s %s %s",

            "TID",
            "Hostname",
            "IP",
            "TID",
            "Hostname",
            "IP",

+           "State",

            "Sessions");
            "Sessions");

-    for (i = 0; i < MAXTUNNEL; i++)
+    for (i = 1; i < MAXTUNNEL; i++)

     {
        int sessions = 0;
     {
        int sessions = 0;

-       if (!tunnel[i].ip || tunnel[i].die || !tunnel[i].hostname[0]) continue;
+       if (!show_all && (!tunnel[i].ip || tunnel[i].die || !tunnel[i].hostname[0])) continue;

 
        for (x = 0; x < MAXSESSION; x++) if (session[x].tunnel == i && session[x].opened && !session[x].die) sessions++;
 
        for (x = 0; x < MAXSESSION; x++) if (session[x].tunnel == i && session[x].opened && !session[x].die) sessions++;

-       fprintf(w, "%d %s %s %d\r\n",
+       cli_print(cli, "%d %s %s %s %d",

                i,
                i,

-               tunnel[i].hostname,
+               *tunnel[i].hostname ? tunnel[i].hostname : "(null)",

                inet_toa(htonl(tunnel[i].ip)),
                inet_toa(htonl(tunnel[i].ip)),

+               states[tunnel[i].state],

                sessions);
     }
     return CLI_OK;
 }
 
                sessions);
     }
     return CLI_OK;
 }
 

-int cmd_show_users(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_show_users(struct cli_def *cli, char *command, char **argv, int argc)

 {
 {

+    char sid[32][8];
+    char *sargv[32];
+    int sargc = 0;

     int i;
     int i;

+
+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, 1,
+           "USER", "Show details for specific username",
+           NULL);
+

     for (i = 0; i < MAXSESSION; i++)
     {
        if (!session[i].opened) continue;
        if (!session[i].user[0]) continue;
     for (i = 0; i < MAXSESSION; i++)
     {
        if (!session[i].opened) continue;
        if (!session[i].user[0]) continue;

-       fprintf(w, "%s\r\n",
-               session[i].user);
+       if (argc > 0)
+       {
+           int j;
+           for (j = 0; j < argc && sargc < 32; j++)
+           {
+               if (strcmp(argv[j], session[i].user) == 0)
+               {
+                   snprintf(sid[sargc], sizeof(sid[0]), "%d", i);
+                   sargv[sargc] = sid[sargc];
+                   sargc++;
+               }
+           }
+
+           continue;
+       }
+
+       cli_print(cli, "%s", session[i].user);

     }
     }

+
+    if (sargc > 0)
+       return cmd_show_session(cli, "users", sargv, sargc);
+

     return CLI_OK;
 }
 
     return CLI_OK;
 }
 

-int cmd_show_counters(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc)

 {
 {

-    fprintf(w, "%-10s %-8s %-10s %-8s\r\n", "Ethernet", "Bytes", "Packets", "Errors");
-    fprintf(w, "%-10s %8lu %8lu %8lu\r\n", "RX",
+    if (CLI_HELP_REQUESTED)
+       return CLI_HELP_NO_ARGS;
+
+    cli_print(cli, "%-10s %-8s %-10s %-8s", "Ethernet", "Bytes", "Packets", "Errors");
+    cli_print(cli, "%-10s %8lu %8lu %8lu", "RX",

            GET_STAT(tap_rx_bytes),
            GET_STAT(tap_rx_packets),
            GET_STAT(tap_rx_errors));
            GET_STAT(tap_rx_bytes),
            GET_STAT(tap_rx_packets),
            GET_STAT(tap_rx_errors));

-    fprintf(w, "%-10s %8lu %8lu %8lu\r\n", "TX",
+    cli_print(cli, "%-10s %8lu %8lu %8lu", "TX",

            GET_STAT(tap_tx_bytes),
            GET_STAT(tap_tx_packets),
            GET_STAT(tap_tx_errors));
            GET_STAT(tap_tx_bytes),
            GET_STAT(tap_tx_packets),
            GET_STAT(tap_tx_errors));

-    fprintf(w, "\r\n");
+    cli_print(cli, "");

 
 

-    fprintf(w, "%-10s %-8s %-10s %-8s %-8s\r\n", "Tunnel", "Bytes", "Packets", "Errors", "Retries");
-    fprintf(w, "%-10s %8lu %8lu %8lu %8lu\r\n", "RX",
+    cli_print(cli, "%-10s %-8s %-10s %-8s %-8s", "Tunnel", "Bytes", "Packets", "Errors", "Retries");
+    cli_print(cli, "%-10s %8lu %8lu %8lu %8lu", "RX",

            GET_STAT(tunnel_rx_bytes),
            GET_STAT(tunnel_rx_packets),
            GET_STAT(tunnel_rx_errors),
            0L);
            GET_STAT(tunnel_rx_bytes),
            GET_STAT(tunnel_rx_packets),
            GET_STAT(tunnel_rx_errors),
            0L);

-    fprintf(w, "%-10s %8lu %8lu %8lu %8lu\r\n", "TX",
+    cli_print(cli, "%-10s %8lu %8lu %8lu %8lu", "TX",

            GET_STAT(tunnel_tx_bytes),
            GET_STAT(tunnel_tx_packets),
            GET_STAT(tunnel_tx_bytes),
            GET_STAT(tunnel_tx_packets),

-           GET_STAT(tunnel_rx_errors),
+           GET_STAT(tunnel_tx_errors),

            GET_STAT(tunnel_retries));
            GET_STAT(tunnel_retries));

-    fprintf(w, "\r\n");
-
-    fprintf(w, "%-30s%-10s\r\n", "Counter", "Value");
-    fprintf(w, "-----------------------------------------\r\n");
-    fprintf(w, "%-30s%lu\r\n", "radius_retries",       GET_STAT(radius_retries));
-    fprintf(w, "%-30s%lu\r\n", "arp_errors",           GET_STAT(arp_errors));
-    fprintf(w, "%-30s%lu\r\n", "arp_replies",          GET_STAT(arp_replies));
-    fprintf(w, "%-30s%lu\r\n", "arp_discarded",                GET_STAT(arp_discarded));
-    fprintf(w, "%-30s%lu\r\n", "arp_sent",             GET_STAT(arp_sent));
-    fprintf(w, "%-30s%lu\r\n", "arp_recv",             GET_STAT(arp_recv));
-    fprintf(w, "%-30s%lu\r\n", "packets_snooped",      GET_STAT(packets_snooped));
-    fprintf(w, "%-30s%lu\r\n", "tunnel_created",       GET_STAT(tunnel_created));
-    fprintf(w, "%-30s%lu\r\n", "session_created",      GET_STAT(session_created));
-    fprintf(w, "%-30s%lu\r\n", "tunnel_timeout",       GET_STAT(tunnel_timeout));
-    fprintf(w, "%-30s%lu\r\n", "session_timeout",      GET_STAT(session_timeout));
-    fprintf(w, "%-30s%lu\r\n", "radius_timeout",       GET_STAT(radius_timeout));
-    fprintf(w, "%-30s%lu\r\n", "radius_overflow",      GET_STAT(radius_overflow));
-    fprintf(w, "%-30s%lu\r\n", "tunnel_overflow",      GET_STAT(tunnel_overflow));
-    fprintf(w, "%-30s%lu\r\n", "session_overflow",     GET_STAT(session_overflow));
-    fprintf(w, "%-30s%lu\r\n", "ip_allocated",         GET_STAT(ip_allocated));
-    fprintf(w, "%-30s%lu\r\n", "ip_freed",             GET_STAT(ip_freed));
-
-#ifdef STAT_CALLS
-    fprintf(w, "\n%-30s%-10s\r\n", "Counter", "Value");
-    fprintf(w, "-----------------------------------------\r\n");
-    fprintf(w, "%-30s%lu\r\n", "call_processtap",      GET_STAT(call_processtap));
-    fprintf(w, "%-30s%lu\r\n", "call_processarp",      GET_STAT(call_processarp));
-    fprintf(w, "%-30s%lu\r\n", "call_processipout",    GET_STAT(call_processipout));
-    fprintf(w, "%-30s%lu\r\n", "call_processudp",      GET_STAT(call_processudp));
-    fprintf(w, "%-30s%lu\r\n", "call_processpap",      GET_STAT(call_processpap));
-    fprintf(w, "%-30s%lu\r\n", "call_processchap",     GET_STAT(call_processchap));
-    fprintf(w, "%-30s%lu\r\n", "call_processlcp",      GET_STAT(call_processlcp));
-    fprintf(w, "%-30s%lu\r\n", "call_processipcp",     GET_STAT(call_processipcp));
-    fprintf(w, "%-30s%lu\r\n", "call_processipin",     GET_STAT(call_processipin));
-    fprintf(w, "%-30s%lu\r\n", "call_processccp",      GET_STAT(call_processccp));
-    fprintf(w, "%-30s%lu\r\n", "call_processrad",      GET_STAT(call_processrad));
-    fprintf(w, "%-30s%lu\r\n", "call_sendarp",         GET_STAT(call_sendarp));
-    fprintf(w, "%-30s%lu\r\n", "call_sendipcp",                GET_STAT(call_sendipcp));
-    fprintf(w, "%-30s%lu\r\n", "call_sendchap",                GET_STAT(call_sendchap));
-    fprintf(w, "%-30s%lu\r\n", "call_sessionbyip",     GET_STAT(call_sessionbyip));
-    fprintf(w, "%-30s%lu\r\n", "call_sessionbyuser",   GET_STAT(call_sessionbyuser));
-    fprintf(w, "%-30s%lu\r\n", "call_tunnelsend",      GET_STAT(call_tunnelsend));
-    fprintf(w, "%-30s%lu\r\n", "call_tunnelkill",      GET_STAT(call_tunnelkill));
-    fprintf(w, "%-30s%lu\r\n", "call_tunnelshutdown",  GET_STAT(call_tunnelshutdown));
-    fprintf(w, "%-30s%lu\r\n", "call_sessionkill",     GET_STAT(call_sessionkill));
-    fprintf(w, "%-30s%lu\r\n", "call_sessionshutdown", GET_STAT(call_sessionshutdown));
-    fprintf(w, "%-30s%lu\r\n", "call_sessionsetup",    GET_STAT(call_sessionsetup));
-    fprintf(w, "%-30s%lu\r\n", "call_assign_ip_address",GET_STAT(call_assign_ip_address));
-    fprintf(w, "%-30s%lu\r\n", "call_free_ip_address", GET_STAT(call_free_ip_address));
-    fprintf(w, "%-30s%lu\r\n", "call_dump_acct_info",  GET_STAT(call_dump_acct_info));
-    fprintf(w, "%-30s%lu\r\n", "call_radiussend",      GET_STAT(call_radiussend));
-    fprintf(w, "%-30s%lu\r\n", "call_radiusretry",     GET_STAT(call_radiusretry));
+    cli_print(cli, "");
+
+    cli_print(cli, "%-30s%-10s", "Counter", "Value");
+    cli_print(cli, "-----------------------------------------");
+    cli_print(cli, "%-30s%lu", "radius_retries",       GET_STAT(radius_retries));
+    cli_print(cli, "%-30s%lu", "arp_errors",           GET_STAT(arp_errors));
+    cli_print(cli, "%-30s%lu", "arp_replies",          GET_STAT(arp_replies));
+    cli_print(cli, "%-30s%lu", "arp_discarded",                GET_STAT(arp_discarded));
+    cli_print(cli, "%-30s%lu", "arp_sent",             GET_STAT(arp_sent));
+    cli_print(cli, "%-30s%lu", "arp_recv",             GET_STAT(arp_recv));
+    cli_print(cli, "%-30s%lu", "packets_snooped",      GET_STAT(packets_snooped));
+    cli_print(cli, "%-30s%lu", "tunnel_created",       GET_STAT(tunnel_created));
+    cli_print(cli, "%-30s%lu", "session_created",      GET_STAT(session_created));
+    cli_print(cli, "%-30s%lu", "tunnel_timeout",       GET_STAT(tunnel_timeout));
+    cli_print(cli, "%-30s%lu", "session_timeout",      GET_STAT(session_timeout));
+    cli_print(cli, "%-30s%lu", "radius_timeout",       GET_STAT(radius_timeout));
+    cli_print(cli, "%-30s%lu", "radius_overflow",      GET_STAT(radius_overflow));
+    cli_print(cli, "%-30s%lu", "tunnel_overflow",      GET_STAT(tunnel_overflow));
+    cli_print(cli, "%-30s%lu", "session_overflow",     GET_STAT(session_overflow));
+    cli_print(cli, "%-30s%lu", "ip_allocated",         GET_STAT(ip_allocated));
+    cli_print(cli, "%-30s%lu", "ip_freed",             GET_STAT(ip_freed));
+    cli_print(cli, "%-30s%lu", "cluster_forwarded",    GET_STAT(c_forwarded));
+    cli_print(cli, "%-30s%lu", "recv_forward",         GET_STAT(recv_forward));
+
+
+#ifdef STATISTICS
+    cli_print(cli, "\n%-30s%-10s", "Counter", "Value");
+    cli_print(cli, "-----------------------------------------");
+    cli_print(cli, "%-30s%lu", "call_processtap",      GET_STAT(call_processtap));
+    cli_print(cli, "%-30s%lu", "call_processarp",      GET_STAT(call_processarp));
+    cli_print(cli, "%-30s%lu", "call_processipout",    GET_STAT(call_processipout));
+    cli_print(cli, "%-30s%lu", "call_processudp",      GET_STAT(call_processudp));
+    cli_print(cli, "%-30s%lu", "call_processpap",      GET_STAT(call_processpap));
+    cli_print(cli, "%-30s%lu", "call_processchap",     GET_STAT(call_processchap));
+    cli_print(cli, "%-30s%lu", "call_processlcp",      GET_STAT(call_processlcp));
+    cli_print(cli, "%-30s%lu", "call_processipcp",     GET_STAT(call_processipcp));
+    cli_print(cli, "%-30s%lu", "call_processipin",     GET_STAT(call_processipin));
+    cli_print(cli, "%-30s%lu", "call_processccp",      GET_STAT(call_processccp));
+    cli_print(cli, "%-30s%lu", "call_processrad",      GET_STAT(call_processrad));
+    cli_print(cli, "%-30s%lu", "call_sendarp",         GET_STAT(call_sendarp));
+    cli_print(cli, "%-30s%lu", "call_sendipcp",                GET_STAT(call_sendipcp));
+    cli_print(cli, "%-30s%lu", "call_sendchap",                GET_STAT(call_sendchap));
+    cli_print(cli, "%-30s%lu", "call_sessionbyip",     GET_STAT(call_sessionbyip));
+    cli_print(cli, "%-30s%lu", "call_sessionbyuser",   GET_STAT(call_sessionbyuser));
+    cli_print(cli, "%-30s%lu", "call_tunnelsend",      GET_STAT(call_tunnelsend));
+    cli_print(cli, "%-30s%lu", "call_tunnelkill",      GET_STAT(call_tunnelkill));
+    cli_print(cli, "%-30s%lu", "call_tunnelshutdown",  GET_STAT(call_tunnelshutdown));
+    cli_print(cli, "%-30s%lu", "call_sessionkill",     GET_STAT(call_sessionkill));
+    cli_print(cli, "%-30s%lu", "call_sessionshutdown", GET_STAT(call_sessionshutdown));
+    cli_print(cli, "%-30s%lu", "call_sessionsetup",    GET_STAT(call_sessionsetup));
+    cli_print(cli, "%-30s%lu", "call_assign_ip_address",GET_STAT(call_assign_ip_address));
+    cli_print(cli, "%-30s%lu", "call_free_ip_address", GET_STAT(call_free_ip_address));
+    cli_print(cli, "%-30s%lu", "call_dump_acct_info",  GET_STAT(call_dump_acct_info));
+    cli_print(cli, "%-30s%lu", "call_radiussend",      GET_STAT(call_radiussend));
+    cli_print(cli, "%-30s%lu", "call_radiusretry",     GET_STAT(call_radiusretry));

 #endif
     return CLI_OK;
 }
 
 #endif
     return CLI_OK;
 }
 

-int cmd_show_version(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc)

 {
 {

-    fprintf(w, "L2TPNS %s\r\n", VERSION);
-    fprintf(w, "ID: %s\r\n", rcs_id);
+    int tag = 0;
+    int file = 0;
+    int i = 0;
+
+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, 1,
+           "tag", "Include CVS release tag",
+           "file", "Include file versions",
+           NULL);
+
+    for (i = 0; i < argc; i++)
+       if (!strcmp(argv[i], "tag"))
+           tag++;
+       else if (!strcmp(argv[i], "file"))
+           file++;
+
+    cli_print(cli, "L2TPNS %s", VERSION);
+    if (tag)
+    {
+       char const *p = strchr(cvs_name, ':');
+       char const *e;
+       if (p)
+       {
+           p++;
+           while (isspace(*p))
+               p++;
+       }
+
+       if (!p || *p == '$')
+           p = "HEAD";
+
+       e = strpbrk(p, " \t$");
+       cli_print(cli, "Tag: %.*s", e ? e - p + 1 : strlen(p), p);
+    }
+    
+    if (file)
+    {
+       extern linked_list *loaded_plugins;
+       void *p;
+
+       cli_print(cli, "Files:");
+       cli_print(cli, "  %s", cvs_id_arp);
+#ifdef BGP
+       cli_print(cli, "  %s", cvs_id_bgp);
+#endif /* BGP */
+       cli_print(cli, "  %s", cvs_id_cli);
+       cli_print(cli, "  %s", cvs_id_cluster);
+       cli_print(cli, "  %s", cvs_id_constants);
+       cli_print(cli, "  %s", cvs_id_control);
+       cli_print(cli, "  %s", cvs_id_icmp);
+       cli_print(cli, "  %s", cvs_id_l2tpns);
+       cli_print(cli, "  %s", cvs_id_ll);
+       cli_print(cli, "  %s", cvs_id_md5);
+       cli_print(cli, "  %s", cvs_id_ppp);
+       cli_print(cli, "  %s", cvs_id_radius);
+       cli_print(cli, "  %s", cvs_id_tbf);
+       cli_print(cli, "  %s", cvs_id_util);
+
+       ll_reset(loaded_plugins);
+       while ((p = ll_next(loaded_plugins)))
+       {
+           char const **id = dlsym(p, "cvs_id");
+           if (id)
+               cli_print(cli, "  %s", *id);
+       }
+    }
+

     return CLI_OK;
 }
     return CLI_OK;
 }

-int cmd_show_pool(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+
+int cmd_show_pool(struct cli_def *cli, char *command, char **argv, int argc)

 {
     int i;
 {
     int i;

-    int used = 0, free = 0;
+    int used = 0, free = 0, show_all = 0;
+    time_t time_now;

 
 

-    fprintf(w, "%-15s  %4s   %8s %s\r\n", "IP Address", "Used", "Session", "User");
-    for (i = 0; i < MAXIPPOOL; i++)
+    if (!config->cluster_iam_master)
+    {
+       cli_print(cli, "Can't do this on a slave.  Do it on %s", inet_toa(config->cluster_master_address));
+       return CLI_OK;
+    }
+
+    if (CLI_HELP_REQUESTED)

     {
     {

-       sessionidt s = 0;
+       if (argc > 1)
+           return cli_arg_help(cli, 1, NULL);

 
 

+       return cli_arg_help(cli, 1,
+           "all", "Show all pool addresses, including unused",
+           NULL);
+    }
+
+    if (argc > 0 && strcmp(argv[0], "all") == 0)
+       show_all = 1;
+
+    time(&time_now);
+    cli_print(cli, "%-15s %4s %8s %s", "IP Address", "Used", "Session", "User");
+    for (i = 0; i < MAXIPPOOL; i++)
+    {

        if (!ip_address_pool[i].address) continue;
        if (ip_address_pool[i].assigned)
        {
        if (!ip_address_pool[i].address) continue;
        if (ip_address_pool[i].assigned)
        {

+           cli_print(cli, "%-15s    Y %8d %s",
+               inet_toa(htonl(ip_address_pool[i].address)), ip_address_pool[i].session, session[ip_address_pool[i].session].user);
+

            used++;
            used++;

-           s = sessionbyip(ip_address_pool[i].address);

        }
        else
        {
        }
        else
        {

+           if (ip_address_pool[i].last)
+               cli_print(cli, "%-15s    N %8s [%s] %ds",
+                   inet_toa(htonl(ip_address_pool[i].address)), "",
+                   ip_address_pool[i].user, time_now - ip_address_pool[i].last);
+           else if (show_all)
+               cli_print(cli, "%-15s    N", inet_toa(htonl(ip_address_pool[i].address)));
+
+           free++;
+       }
+    }
+
+    if (!show_all)
+       cli_print(cli, "(Not displaying unused addresses)");
+
+    cli_print(cli, "\r\nFree: %d\r\nUsed: %d", free, used);
+    return CLI_OK;
+}
+
+void print_save_config(struct cli_def *cli, char *string)
+{
+    if (save_config_fh)
+       fprintf(save_config_fh, "%s\n", string);
+}
+
+int cmd_write_memory(struct cli_def *cli, char *command, char **argv, int argc)
+{
+    if (CLI_HELP_REQUESTED)
+       return CLI_HELP_NO_ARGS;
+
+    if ((save_config_fh = fopen(config->config_file, "w")))
+    {
+       cli_print(cli, "Writing configuration");
+       cli_print_callback(cli, print_save_config);
+       cmd_show_run(cli, command, argv, argc);
+       cli_print_callback(cli, NULL);
+       fclose(save_config_fh);
+    }
+    else
+    {
+       cli_print(cli, "Error writing configuration: %s", strerror(errno));
+    }
+    return CLI_OK;
+}
+
+int cmd_show_run(struct cli_def *cli, char *command, char **argv, int argc)
+{
+    int i;
+
+    if (CLI_HELP_REQUESTED)
+       return CLI_HELP_NO_ARGS;
+
+    cli_print(cli, "# Current configuration:");
+
+    for (i = 0; config_values[i].key; i++)
+    {
+       void *value = ((void *)config) + config_values[i].offset;
+       if (config_values[i].type == STRING)
+           cli_print(cli, "set %s \"%.*s\"", config_values[i].key, config_values[i].size, (char *)value);
+       else if (config_values[i].type == IP)
+           cli_print(cli, "set %s %s", config_values[i].key, inet_toa(*(unsigned *)value));
+       else if (config_values[i].type == SHORT)
+           cli_print(cli, "set %s %hu", config_values[i].key, *(short *)value);
+       else if (config_values[i].type == BOOL)
+           cli_print(cli, "set %s %s", config_values[i].key, (*(int *)value) ? "yes" : "no");
+       else if (config_values[i].type == INT)
+           cli_print(cli, "set %s %d", config_values[i].key, *(int *)value);
+       else if (config_values[i].type == UNSIGNED_LONG)
+           cli_print(cli, "set %s %lu", config_values[i].key, *(unsigned long *)value);
+    }
+
+    cli_print(cli, "# Plugins");
+    for (i = 0; i < MAXPLUGINS; i++)
+    {
+       if (*config->plugins[i])
+       {
+           cli_print(cli, "load plugin \"%s\"", config->plugins[i]);
+       }
+    }
+
+    cli_print(cli, "# end");
+    return CLI_OK;
+}
+
+int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int argc)
+{
+    char *states[] = {
+       "NULL",
+       "CHAP",
+       "AUTH",
+       "IPCP",
+       "START",
+       "STOP",
+       "WAIT",
+    };
+    int i, free = 0, used = 0, show_all = 0;
+    time_t time_now;
+
+    if (CLI_HELP_REQUESTED)
+    {
+       if (argc > 1)
+           return cli_arg_help(cli, 1, NULL);
+
+       return cli_arg_help(cli, 1,
+           "all", "Show all RADIUS sessions, including unused",
+           NULL);
+    }
+
+    cli_print(cli, "%6s%5s%6s%9s%9s%4s", "Radius", "Sock", "State", "Session", "Retry", "Try");
+
+    time(&time_now);
+
+    if (argc > 0 && strcmp(argv[0], "all") == 0)
+       show_all = 1;
+
+    for (i = 1; i < MAXRADIUS; i++)
+    {
+       if (radius[i].state == RADIUSNULL)

            free++;
            free++;

+       else
+           used++;
+
+       if (!show_all && radius[i].state == RADIUSNULL) continue;
+
+       cli_print(cli, "%6d%5d%6s%9d%9u%4d",
+               i >> RADIUS_SHIFT,
+               i & RADIUS_MASK,
+               states[radius[i].state],
+               radius[i].session,
+               radius[i].retry,
+               radius[i].try);
+    }
+
+    cli_print(cli, "\r\nFree: %d\r\nUsed: %d", free, used);
+
+    return CLI_OK;
+}
+
+int cmd_show_plugins(struct cli_def *cli, char *command, char **argv, int argc)
+{
+    int i;
+
+    if (CLI_HELP_REQUESTED)
+       return CLI_HELP_NO_ARGS;
+
+    cli_print(cli, "Plugins currently loaded:");
+    for (i = 0; i < MAXPLUGINS; i++)
+    {
+       if (*config->plugins[i])
+       {
+           cli_print(cli, "  %s", config->plugins[i]);

        }
        }

+    }
+    return CLI_OK;
+}

 
 

-       fprintf(w, "%-15s %4s %8d %s\r\n",
-               inet_toa(ip_address_pool[i].address),
-               (s) ? "Y" : "N",
-               s,
-               session[s].user);
+int cmd_show_throttle(struct cli_def *cli, char *command, char **argv, int argc)
+{
+    int i;
+
+    if (CLI_HELP_REQUESTED)
+       return CLI_HELP_NO_ARGS;
+
+    cli_print(cli, "Token bucket filters:");
+    cli_print(cli, "%-6s %8s %-4s", "ID", "Handle", "Used");
+    for (i = 0; i < MAXSESSION; i++)
+    {
+       if (!session[i].throttle)
+           continue;
+
+       cli_print(cli, "%-6d %8d %8d",
+           i,
+           session[i].tbf_in,
+           session[i].tbf_out);

     }
     }

-    fprintf(w, "\r\nFree: %d\r\nUsed: %d\r\n", free, used);

     return CLI_OK;
 }
     return CLI_OK;
 }

-int cmd_show_banana(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
-{
-    fputs(" _\r\n"
-          "//\\\r\n"
-          "V  \\\r\n"
-          " \\  \\_\r\n"
-          "  \\,'.`-.\r\n"
-          "   |\\ `. `.\r\n"
-          "   ( \\  `. `-.                        _,.-:\\\r\n"
-          "    \\ \\   `.  `-._             __..--' ,-';/\r\n"
-          "     \\ `.   `-.   `-..___..---'   _.--' ,'/\r\n"
-          "      `. `.    `-._        __..--'    ,' /\r\n"
-          "        `. `-_     ``--..''       _.-' ,'\r\n"
-          "          `-_ `-.___        __,--'   ,'\r\n"
-          "             `-.__  `----\"\"\"    __.-'\r\n"
-          "hh                `--..____..--'\r\n", w);
+
+int cmd_show_banana(struct cli_def *cli, char *command, char **argv, int argc)
+{
+    if (CLI_HELP_REQUESTED)
+       return CLI_HELP_NO_ARGS;
+
+    cli_print(cli, " _\n"
+                     "//\\\n"
+                     "V  \\\n"
+                     " \\  \\_\n"
+                     "  \\,'.`-.\n"
+                     "   |\\ `. `.\n"
+                     "   ( \\  `. `-.                        _,.-:\\\n"
+                     "    \\ \\   `.  `-._             __..--' ,-';/\n"
+                     "     \\ `.   `-.   `-..___..---'   _.--' ,'/\n"
+                     "      `. `.    `-._        __..--'    ,' /\n"
+                     "        `. `-_     ``--..''       _.-' ,'\n"
+                     "          `-_ `-.___        __,--'   ,'\n"
+                     "             `-.__  `----\"\"\"    __.-'\n"
+                     "hh                `--..____..--'");

 
     return CLI_OK;
 }
 
 
     return CLI_OK;
 }
 

-int cmd_clear_counters(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, int argc)

 {
 {

-    fprintf(w, "Counters cleared\r\n");
+    if (CLI_HELP_REQUESTED)
+       return CLI_HELP_NO_ARGS;
+
+    cli_print(cli, "Counters cleared");

     SET_STAT(last_reset, time(NULL));
     return CLI_OK;
 }
 
     SET_STAT(last_reset, time(NULL));
     return CLI_OK;
 }
 

-int cmd_drop_user(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int argc)

 {
     int i;
     sessionidt s;
 
 {
     int i;
     sessionidt s;
 

-    if (!argc)
+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, argc > 1,
+           "USER", "Username of session to drop", NULL);
+
+    if (!config->cluster_iam_master)

     {
     {

-       fprintf(w, "Specify a user to drop\r\n");
+       cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));

        return CLI_OK;
     }
        return CLI_OK;
     }

-    for (i = 0; i < argc; i++)
+    if (!argc)

     {
     {

-       if (strchr(argv[i], '?'))
-       {
-           fprintf(w, "username ...");
-           return CLI_OK;
-       }
+       cli_print(cli, "Specify a user to drop");
+       return CLI_OK;

     }
 
     for (i = 0; i < argc; i++)
     {
        if (!(s = sessionbyuser(argv[i])))
        {
     }
 
     for (i = 0; i < argc; i++)
     {
        if (!(s = sessionbyuser(argv[i])))
        {

-           fprintf(w, "User %s is not connected\r\n", argv[i]);
+           cli_print(cli, "User %s is not connected", argv[i]);

            continue;
        }
 
            continue;
        }
 


@@ -536,7 +1030,7 @@ int cmd_drop_user(struct cli_def *cli, FILE *w, char *command, char **argv, int
        {
            int x;
 
        {
            int x;
 

-           fprintf(w, "Dropping user %s\r\n", session[s].user);
+           cli_print(cli, "Dropping user %s", session[s].user);

            for (x = 0; x < MAXSESSION; x++)
            {
                if (!cli_session_kill[x])
            for (x = 0; x < MAXSESSION; x++)
            {
                if (!cli_session_kill[x])


@@ -551,44 +1045,45 @@ int cmd_drop_user(struct cli_def *cli, FILE *w, char *command, char **argv, int
     return CLI_OK;
 }
 
     return CLI_OK;
 }
 

-int cmd_drop_tunnel(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int argc)

 {
     int i;
     tunnelidt tid;
 
 {
     int i;
     tunnelidt tid;
 

-    if (!argc)
+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, argc > 1,
+           "<1-%d>", MAXTUNNEL-1, "Tunnel id to drop", NULL);
+
+    if (!config->cluster_iam_master)

     {
     {

-       fprintf(w, "Specify a tunnel to drop\r\n");
+       cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));

        return CLI_OK;
     }
        return CLI_OK;
     }

-    for (i = 0; i < argc; i++)
+    if (!argc)

     {
     {

-       if (strchr(argv[i], '?'))
-       {
-           fprintf(w, "tunnel_id ...");
-           return CLI_OK;
-       }
+       cli_print(cli, "Specify a tunnel to drop");
+       return CLI_OK;

     }
 
     for (i = 0; i < argc; i++)
     {
        int x;
 
     }
 
     for (i = 0; i < argc; i++)
     {
        int x;
 

-       if ((tid = atol(argv[i])) <= 0 || (tid > MAXTUNNEL))
+       if ((tid = atol(argv[i])) <= 0 || (tid >= MAXTUNNEL))

        {
        {

-           fprintf(w, "Invalid tunnel ID (%d - %d)\r\n", 0, MAXTUNNEL);
+           cli_print(cli, "Invalid tunnel ID (1-%d)", MAXTUNNEL-1);

            continue;
        }
 
        if (!tunnel[tid].ip)
        {
            continue;
        }
 
        if (!tunnel[tid].ip)
        {

-           fprintf(w, "Tunnel %d is not connected\r\n", tid);
+           cli_print(cli, "Tunnel %d is not connected", tid);

            continue;
        }
 
        if (tunnel[tid].die)
        {
            continue;
        }
 
        if (tunnel[tid].die)
        {

-           fprintf(w, "Tunnel %d is already being shut down\r\n", tid);
+           cli_print(cli, "Tunnel %d is already being shut down", tid);

            continue;
        }
 
            continue;
        }
 


@@ -597,7 +1092,7 @@ int cmd_drop_tunnel(struct cli_def *cli, FILE *w, char *command, char **argv, in
            if (!cli_tunnel_kill[x])
            {
                cli_tunnel_kill[x] = tid;
            if (!cli_tunnel_kill[x])
            {
                cli_tunnel_kill[x] = tid;

-               fprintf(w, "Tunnel %d shut down (%s)\r\n", tid, tunnel[tid].hostname);
+               cli_print(cli, "Tunnel %d shut down (%s)", tid, tunnel[tid].hostname);

                break;
            }
        }
                break;
            }
        }


@@ -606,34 +1101,35 @@ int cmd_drop_tunnel(struct cli_def *cli, FILE *w, char *command, char **argv, in
     return CLI_OK;
 }
 
     return CLI_OK;
 }
 

-int cmd_drop_session(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int argc)

 {
     int i;
     sessionidt s;
 
 {
     int i;
     sessionidt s;
 

-    if (!argc)
+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, argc > 1,
+           "<1-%d>", MAXSESSION-1, "Session id to drop", NULL);
+
+    if (!config->cluster_iam_master)

     {
     {

-       fprintf(w, "Specify a session id to drop\r\n");
+       cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));

        return CLI_OK;
     }
        return CLI_OK;
     }

-    for (i = 0; i < argc; i++)
+    if (!argc)

     {
     {

-       if (strchr(argv[i], '?'))
-       {
-           fprintf(w, "session_id ...");
-           return CLI_OK;
-       }
+       cli_print(cli, "Specify a session id to drop");
+       return CLI_OK;

     }
 
     for (i = 0; i < argc; i++)
     {
        if ((s = atol(argv[i])) <= 0 || (s > MAXSESSION))
        {
     }
 
     for (i = 0; i < argc; i++)
     {
        if ((s = atol(argv[i])) <= 0 || (s > MAXSESSION))
        {

-           fprintf(w, "Invalid session ID (%d - %d)\r\n", 0, MAXSESSION);
+           cli_print(cli, "Invalid session ID (1-%d)", MAXSESSION-1);

            continue;
        }
 
            continue;
        }
 

-       if (session[s].ip && session[s].opened && !session[s].die)
+       if (session[s].opened && !session[s].die)

        {
            int x;
            for (x = 0; x < MAXSESSION; x++)
        {
            int x;
            for (x = 0; x < MAXSESSION; x++)


@@ -644,260 +1140,520 @@ int cmd_drop_session(struct cli_def *cli, FILE *w, char *command, char **argv, i
                    break;
                }
            }
                    break;
                }
            }

-           fprintf(w, "Dropping session %d\r\n", s);
+           cli_print(cli, "Dropping session %d", s);

        }
        else
        {
        }
        else
        {

-           fprintf(w, "Session %d is not active.\r\n", s);
+           cli_print(cli, "Session %d is not active.", s);

        }
     }
 
     return CLI_OK;
 }
 
        }
     }
 
     return CLI_OK;
 }
 

-int cmd_snoop(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc)

 {
 {

-    int i;
+    ipt ip;
+    u16 port;

     sessionidt s;
 
     sessionidt s;
 

-    if (!argc)
-    {
-       fprintf(w, "Specify a user\r\n");
-       return CLI_OK;
-    }
-    for (i = 0; i < argc; i++)
+    if (CLI_HELP_REQUESTED)

     {
     {

-       if (strchr(argv[i], '?'))
+       switch (argc)

        {
        {

-           fprintf(w, "username ...");
+       case 1:
+           return cli_arg_help(cli, 0,
+               "USER", "Username of session to snoop", NULL);
+
+       case 2:
+           return cli_arg_help(cli, 0,
+               "A.B.C.D", "IP address of snoop destination", NULL);
+
+       case 3:
+           return cli_arg_help(cli, 0,
+               "N", "Port of snoop destination", NULL);
+
+       case 4:
+           if (!argv[3][1])
+               return cli_arg_help(cli, 1, NULL);
+
+       default:

            return CLI_OK;
        }
     }
 
            return CLI_OK;
        }
     }
 

-    for (i = 0; i < argc; i++)
+    if (!config->cluster_iam_master)

     {
     {

-       if (!(s = sessionbyuser(argv[i])))
-       {
-           fprintf(w, "User %s is not connected\r\n", argv[i]);
-           continue;
-       }
-       session[s].snoop = 1;
+       cli_print(cli, "Can't do this on a slave.  Do it on %s", inet_toa(config->cluster_master_address));
+       return CLI_OK;
+    }
+
+    if (argc < 3)
+    {
+       cli_print(cli, "Specify username ip port");
+       return CLI_OK;
+    }
+
+    if (!(s = sessionbyuser(argv[0])))
+    {
+       cli_print(cli, "User %s is not connected", argv[0]);
+       return CLI_OK;
+    }
+
+    ip = inet_addr(argv[1]);
+    if (!ip || ip == INADDR_NONE)
+    {
+       cli_print(cli, "Cannot parse IP \"%s\"", argv[1]);
+       return CLI_OK;
+    }

 
 

-       fprintf(w, "Snooping user %s\r\n", argv[i]);
+    port = atoi(argv[2]);
+    if (!port)
+    {
+       cli_print(cli, "Invalid port %s", argv[2]);
+       return CLI_OK;

     }
     }

+
+    session[s].snoop_ip = ip;
+    session[s].snoop_port = port;
+
+    cli_print(cli, "Snooping user %s to %s:%d", argv[0], inet_toa(session[s].snoop_ip), session[s].snoop_port);

     return CLI_OK;
 }
 
     return CLI_OK;
 }
 

-int cmd_no_snoop(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_no_snoop(struct cli_def *cli, char *command, char **argv, int argc)

 {
     int i;
     sessionidt s;
 
 {
     int i;
     sessionidt s;
 

-    if (!argc)
+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, argc > 1,
+           "USER", "Username of session to un-snoop", NULL);
+
+    if (!config->cluster_iam_master)

     {
     {

-       fprintf(w, "Specify a user\r\n");
+       cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));

        return CLI_OK;
     }
        return CLI_OK;
     }

-    for (i = 0; i < argc; i++)
+
+    if (!argc)

     {
     {

-       if (strchr(argv[i], '?'))
-       {
-           fprintf(w, "username ...");
-           return CLI_OK;
-       }
+       cli_print(cli, "Specify a user");
+       return CLI_OK;

     }
 
     for (i = 0; i < argc; i++)
     {
        if (!(s = sessionbyuser(argv[i])))
        {
     }
 
     for (i = 0; i < argc; i++)
     {
        if (!(s = sessionbyuser(argv[i])))
        {

-           fprintf(w, "User %s is not connected\r\n", argv[i]);
+           cli_print(cli, "User %s is not connected", argv[i]);

            continue;
        }
            continue;
        }

-       session[s].snoop = 0;
+       session[s].snoop_ip = 0;
+       session[s].snoop_port = 0;

 
 

-       fprintf(w, "Not snooping user %s\r\n", argv[i]);
+       cli_print(cli, "Not snooping user %s", argv[i]);

     }
     return CLI_OK;
 }
 
     }
     return CLI_OK;
 }
 

-int cmd_throttle(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_throttle(struct cli_def *cli, char *command, char **argv, int argc)

 {
     int i;
     sessionidt s;
 
 {
     int i;
     sessionidt s;
 

-    if (!argc)
+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, argc > 1,
+           "USER", "Username of session to throttle", NULL);
+
+    if (!config->cluster_iam_master)

     {
     {

-       fprintf(w, "Specify a user\r\n");
+       cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));

        return CLI_OK;
     }
        return CLI_OK;
     }

-    for (i = 0; i < argc; i++)
+    if (!argc)

     {
     {

-       if (strchr(argv[i], '?'))
-       {
-           fprintf(w, "username ...");
-           return CLI_OK;
-       }
+       cli_print(cli, "Specify a user");
+       return CLI_OK;

     }
 
     for (i = 0; i < argc; i++)
     {
        if (!(s = sessionbyuser(argv[i])))
        {
     }
 
     for (i = 0; i < argc; i++)
     {
        if (!(s = sessionbyuser(argv[i])))
        {

-           fprintf(w, "User %s is not connected\r\n", argv[i]);
+           cli_print(cli, "User %s is not connected", argv[i]);

            continue;
        }
            continue;
        }

-       throttle_session(s, 1);
-
-       fprintf(w, "throttling user %s\r\n", argv[i]);
+       if (!throttle_session(s, config->rl_rate))
+           cli_print(cli, "Error throttling %s", argv[i]);
+       else
+           cli_print(cli, "Throttling user %s", argv[i]);

     }
     return CLI_OK;
 }
 
     }
     return CLI_OK;
 }
 

-int cmd_no_throttle(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int argc)

 {
     int i;
     sessionidt s;
 
 {
     int i;
     sessionidt s;
 

-    if (!argc)
+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, argc > 1,
+           "USER", "Username of session to un-throttle", NULL);
+
+    if (!config->cluster_iam_master)

     {
     {

-       fprintf(w, "Specify a user\r\n");
+       cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));

        return CLI_OK;
     }
        return CLI_OK;
     }

-    for (i = 0; i < argc; i++)
+    if (!argc)

     {
     {

-       if (strchr(argv[i], '?'))
-       {
-           fprintf(w, "username ...");
-           return CLI_OK;
-       }
+       cli_print(cli, "Specify a user");
+       return CLI_OK;

     }
 
     for (i = 0; i < argc; i++)
     }
 
     for (i = 0; i < argc; i++)

-       {
+    {

        if (!(s = sessionbyuser(argv[i])))
        {
        if (!(s = sessionbyuser(argv[i])))
        {

-           fprintf(w, "User %s is not connected\r\n", argv[i]);
+           cli_print(cli, "User %s is not connected", argv[i]);

            continue;
        }
        throttle_session(s, 0);
 
            continue;
        }
        throttle_session(s, 0);
 

-       fprintf(w, "unthrottling user %s\r\n", argv[i]);
+       cli_print(cli, "Unthrottling user %s", argv[i]);

     }
     }

+

     return CLI_OK;
 }
 
     return CLI_OK;
 }
 

-int cmd_debug(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_debug(struct cli_def *cli, char *command, char **argv, int argc)

 {
     int i;
 
 {
     int i;
 

+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, 1,
+           "all",      "Enable debugging for all except \"data\"",
+           "critical", "", // FIXME: add descriptions
+           "error",    "",
+           "warning",  "",
+           "info",     "",
+           "calls",    "",
+           "data",     "",
+           NULL);
+

     if (!argc)
     {
     if (!argc)
     {

-       fprintf(w, "Currently debugging: ");
-       if (debug_flags.critical) fprintf(w, "critical ");
-       if (debug_flags.error) fprintf(w, "error ");
-       if (debug_flags.warning) fprintf(w, "warning ");
-       if (debug_flags.info) fprintf(w, "info ");
-       if (debug_flags.calls) fprintf(w, "calls ");
-       if (debug_flags.data) fprintf(w, "data ");
-       fprintf(w, "\r\n");
-       return CLI_OK;
-    }
-
-    for (i = 0; i < argc; i++)
+       char *p = (char *) &debug_flags;
+       for (i = 0; i < sizeof(debug_flags); i++)

     {
     {

-       if (*argv[i] == '?')
+           if (p[i])

        {
        {

-           fprintf(w, "Possible debugging states are:\r\n");
-           fprintf(w, "        critical\r\n");
-           fprintf(w, "        error\r\n");
-           fprintf(w, "        warning\r\n");
-           fprintf(w, "        info\r\n");
-           fprintf(w, "        calls\r\n");
-           fprintf(w, "        data\r\n");
+               cli_print(cli, "Currently debugging:%s%s%s%s%s%s",
+                   (debug_flags.critical) ? " critical" : "",
+                   (debug_flags.error)    ? " error"    : "",
+                   (debug_flags.warning)  ? " warning"  : "",
+                   (debug_flags.info)     ? " info"     : "",
+                   (debug_flags.calls)    ? " calls"    : "",
+                   (debug_flags.data)     ? " data"     : "");
+

            return CLI_OK;
        }
     }
 
            return CLI_OK;
        }
     }
 

+       cli_print(cli, "Debugging off");
+       return CLI_OK;
+    }
+

     for (i = 0; i < argc; i++)
     {
     for (i = 0; i < argc; i++)
     {

-       if (strcasecmp(argv[i], "critical") == 0) debug_flags.critical = 1;
-       if (strcasecmp(argv[i], "error") == 0) debug_flags.error = 1;
-       if (strcasecmp(argv[i], "warning") == 0) debug_flags.warning = 1;
-       if (strcasecmp(argv[i], "info") == 0) debug_flags.info = 1;
-       if (strcasecmp(argv[i], "calls") == 0) debug_flags.calls = 1;
-       if (strcasecmp(argv[i], "data") == 0) debug_flags.data = 1;
-       if (strcasecmp(argv[i], "all") == 0)
+       int len = strlen(argv[i]);
+
+       if (argv[i][0] == 'c' && len < 2)
+           len = 2; /* distinguish [cr]itical from [ca]lls */
+
+       if (!strncasecmp(argv[i], "critical", len)) { debug_flags.critical = 1; continue; }
+       if (!strncasecmp(argv[i], "error",    len)) { debug_flags.error = 1;    continue; }
+       if (!strncasecmp(argv[i], "warning",  len)) { debug_flags.warning = 1;  continue; }
+       if (!strncasecmp(argv[i], "info",     len)) { debug_flags.info = 1;     continue; }
+       if (!strncasecmp(argv[i], "calls",    len)) { debug_flags.calls = 1;    continue; }
+       if (!strncasecmp(argv[i], "data",     len)) { debug_flags.data = 1;     continue; }
+       if (!strncasecmp(argv[i], "all",      len))

        {
            memset(&debug_flags, 1, sizeof(debug_flags));
            debug_flags.data = 0;
        {
            memset(&debug_flags, 1, sizeof(debug_flags));
            debug_flags.data = 0;

+           continue;

        }
        }

+
+       cli_print(cli, "Invalid debugging flag \"%s\"", argv[i]);

     }
 
     return CLI_OK;
 }
 
     }
 
     return CLI_OK;
 }
 

-int cmd_no_debug(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_no_debug(struct cli_def *cli, char *command, char **argv, int argc)

 {
     int i;
 
 {
     int i;
 

+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, 1,
+           "all",      "Disable all debugging",
+           "critical", "", // FIXME: add descriptions
+           "error",    "",
+           "warning",  "",
+           "info",     "",
+           "calls",    "",
+           "data",     "",
+           NULL);
+
+    if (!argc)
+    {
+       memset(&debug_flags, 0, sizeof(debug_flags));
+       return CLI_OK;
+    }
+

     for (i = 0; i < argc; i++)
     {
     for (i = 0; i < argc; i++)
     {

-       if (strcasecmp(argv[i], "critical") == 0) debug_flags.critical = 0;
-       if (strcasecmp(argv[i], "error") == 0) debug_flags.error = 0;
-       if (strcasecmp(argv[i], "warning") == 0) debug_flags.warning = 0;
-       if (strcasecmp(argv[i], "info") == 0) debug_flags.info = 0;
-       if (strcasecmp(argv[i], "calls") == 0) debug_flags.calls = 0;
-       if (strcasecmp(argv[i], "data") == 0) debug_flags.data = 0;
-       if (strcasecmp(argv[i], "all") == 0) memset(&debug_flags, 0, sizeof(debug_flags));
+       int len = strlen(argv[i]);
+
+       if (argv[i][0] == 'c' && len < 2)
+           len = 2; /* distinguish [cr]itical from [ca]lls */
+
+       if (!strncasecmp(argv[i], "critical", len)) { debug_flags.critical = 0; continue; }
+       if (!strncasecmp(argv[i], "error",    len)) { debug_flags.error = 0;    continue; }
+       if (!strncasecmp(argv[i], "warning",  len)) { debug_flags.warning = 0;  continue; }
+       if (!strncasecmp(argv[i], "info",     len)) { debug_flags.info = 0;     continue; }
+       if (!strncasecmp(argv[i], "calls",    len)) { debug_flags.calls = 0;    continue; }
+       if (!strncasecmp(argv[i], "data",     len)) { debug_flags.data = 0;     continue; }
+       if (!strncasecmp(argv[i], "all",      len))
+       {
+           memset(&debug_flags, 0, sizeof(debug_flags));
+           continue;
+       }
+
+       cli_print(cli, "Invalid debugging flag \"%s\"", argv[i]);

     }
 
     return CLI_OK;
 }
 
     }
 
     return CLI_OK;
 }
 

-int cmd_watch_session(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int argc)

 {
 {

-    sessionidt s;
+    int i, firstfree = 0;
+
+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, argc > 1,
+           "PLUGIN", "Name of plugin to load", NULL);

 
     if (argc != 1)
     {
 
     if (argc != 1)
     {

-       fprintf(w, "Specify a single session to debug (0 to disable)\r\n");
+       cli_print(cli, "Specify a plugin to load");

        return CLI_OK;
     }
        return CLI_OK;
     }

-    s = atoi(argv[0]);

 
 

-    if (debug_session)
-       fprintf(w, "No longer debugging session %d\r\n", debug_session);
+    for (i = 0; i < MAXPLUGINS; i++)
+    {
+       if (!*config->plugins[i] && !firstfree)
+           firstfree = i;
+       if (strcmp(config->plugins[i], argv[0]) == 0)
+       {
+           cli_print(cli, "Plugin is already loaded");
+           return CLI_OK;
+       }
+    }

 
 

-    if (s) fprintf(w, "Debugging session %d.\r\n", s);
-    debug_session = s;
+    if (firstfree)
+    {
+       strncpy(config->plugins[firstfree], argv[0], sizeof(config->plugins[firstfree]) - 1);
+       config->reload_config = 1;
+       cli_print(cli, "Loading plugin %s", argv[0]);
+    }

 
     return CLI_OK;
 }
 
 
     return CLI_OK;
 }
 

-int cmd_watch_tunnel(struct cli_def *cli, FILE *w, char *command, char **argv, int argc)
+int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, int argc)

 {
 {

-    tunnelidt s;
+    int i;
+
+    if (CLI_HELP_REQUESTED)
+       return cli_arg_help(cli, argc > 1,
+           "PLUGIN", "Name of plugin to unload", NULL);

 
     if (argc != 1)
     {
 
     if (argc != 1)
     {

-       fprintf(w, "Specify a single tunnel to debug (0 to disable)\r\n");
+       cli_print(cli, "Specify a plugin to remove");

        return CLI_OK;
     }
        return CLI_OK;
     }

-    s = atoi(argv[0]);

 
 

-    if (debug_tunnel)
-       fprintf(w, "No longer debugging tunnel %d\r\n", debug_tunnel);
+    for (i = 0; i < MAXPLUGINS; i++)
+    {
+       if (strcmp(config->plugins[i], argv[0]) == 0)
+       {
+           config->reload_config = 1;
+           memset(config->plugins[i], 0, sizeof(config->plugins[i]));
+           return CLI_OK;
+       }
+    }
+
+    cli_print(cli, "Plugin is not loaded");
+    return CLI_OK;
+}
+
+char *duration(time_t secs)
+{
+    static char *buf = NULL;
+    int p = 0;
+
+    if (!buf) buf = calloc(64, 1);
+
+    if (secs >= 86400)
+    {
+       int days = secs / 86400;
+       p = sprintf(buf, "%d day%s, ", days, days > 1 ? "s" : "");
+       secs %= 86400;
+    }
+
+    if (secs >= 3600)
+    {
+       int mins = secs / 60;
+       int hrs = mins / 60;
+
+       mins %= 60;
+       sprintf(buf + p, "%d:%02d", hrs, mins);
+    }
+    else if (secs >= 60)
+    {
+       int mins = secs / 60;
+       sprintf(buf + p, "%d min%s", mins, mins > 1 ? "s" : "");
+    }
+    else
+       sprintf(buf, "%ld sec%s", secs, secs > 1 ? "s" : "");
+
+    return buf;
+}
+
+int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc)
+{
+    FILE *fh;
+    char buf[100], *p = buf, *loads[3];
+    int i, num_sessions = 0;
+    time_t time_now;
+
+    if (CLI_HELP_REQUESTED)
+       return CLI_HELP_NO_ARGS;
+
+    fh = fopen("/proc/loadavg", "r");
+    fgets(buf, 100, fh);
+    fclose(fh);
+
+    for (i = 0; i < 3; i++)
+       loads[i] = strdup(strsep(&p, " "));
+
+    time(&time_now);
+    strftime(buf, 99, "%H:%M:%S", localtime(&time_now));
+
+    for (i = 1; i < MAXSESSION; i++)
+       if (session[i].opened) num_sessions++;
+
+    cli_print(cli, "%s up %s, %d users, load average: %s, %s, %s",
+           buf,
+           duration(time_now - config->start_time),
+           num_sessions,
+           loads[0], loads[1], loads[2]
+    );
+    for (i = 0; i < 3; i++)
+       if (loads[i]) free(loads[i]);
+
+    cli_print(cli, "Bandwidth: %s", config->bandwidth);
+
+    return CLI_OK;
+}
+
+int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
+{
+    int i;
+
+    if (CLI_HELP_REQUESTED)
+    {
+       switch (argc)
+       {
+       case 1:
+           {
+               int len = strlen(argv[0])-1;
+               for (i = 0; config_values[i].key; i++)
+                   if (!len || !strncmp(argv[0], config_values[i].key, len))
+                       cli_print(cli, "  %s", config_values[i].key);
+           }
+
+           return CLI_OK;
+
+       case 2:
+           return cli_arg_help(cli, 0,
+               "VALUE", "Value for variable", NULL);
+
+       case 3:
+           if (!argv[2][1])
+               return cli_arg_help(cli, 1, NULL);
+
+       default:
+           return CLI_OK;
+       }
+    }
+
+    if (argc != 2)
+    {
+       cli_print(cli, "Specify variable and value");
+       return CLI_OK;
+    }

 
 

-    if (s) fprintf(w, "Debugging tunnel %d.\r\n", s);
-    debug_tunnel = s;
+    for (i = 0; config_values[i].key; i++)
+    {
+       void *value = ((void *)config) + config_values[i].offset;
+       if (strcmp(config_values[i].key, argv[0]) == 0)
+       {
+           // Found a value to set
+           cli_print(cli, "Setting \"%s\" to \"%s\"", argv[0], argv[1]);
+           switch (config_values[i].type)
+           {
+               case STRING:
+                   strncpy((char *)value, argv[1], config_values[i].size - 1);
+                   break;
+               case INT:
+                   *(int *)value = atoi(argv[1]);
+                   break;
+               case UNSIGNED_LONG:
+                   *(unsigned long *)value = atol(argv[1]);
+                   break;
+               case SHORT:
+                   *(short *)value = atoi(argv[1]);
+                   break;
+               case IP:
+                   *(unsigned *)value = inet_addr(argv[1]);
+                   break;
+               case BOOL:
+                   if (strcasecmp(argv[1], "yes") == 0 || strcasecmp(argv[1], "true") == 0 || strcasecmp(argv[1], "1") == 0)
+                       *(int *)value = 1;
+                   else
+                       *(int *)value = 0;
+                   break;
+               default:
+                   cli_print(cli, "Unknown variable type");
+                   break;
+           }
+           config->reload_config = 1;
+           return CLI_OK;
+       }
+    }

 
 

+    cli_print(cli, "Unknown variable \"%s\"", argv[0]);

     return CLI_OK;
 }
 
     return CLI_OK;
 }
 

-int regular_stuff(struct cli_def *cli, FILE *w)
+int regular_stuff(struct cli_def *cli)

 {
     int i = debug_rb_tail;
 {
     int i = debug_rb_tail;

+    int reprompt = 0;

 
 #ifdef RINGBUFFER
     while (i != ringbuffer->tail)
 
 #ifdef RINGBUFFER
     while (i != ringbuffer->tail)


@@ -917,19 +1673,21 @@ int regular_stuff(struct cli_def *cli, FILE *w)
 
        if (show_message)
        {
 
        if (show_message)
        {

-           ipt address = ntohl(ringbuffer->buffer[i].address);
+           ipt address = htonl(ringbuffer->buffer[i].address);

            char *ipaddr;
            struct in_addr addr;
 
            memcpy(&addr, &address, sizeof(ringbuffer->buffer[i].address));
            ipaddr = inet_ntoa(addr);
 
            char *ipaddr;
            struct in_addr addr;
 
            memcpy(&addr, &address, sizeof(ringbuffer->buffer[i].address));
            ipaddr = inet_ntoa(addr);
 

-           fprintf(w, "%s-%s-%u-%u %s\r",
+           cli_print(cli, "\r%s-%s-%u-%u %s",

                    debug_levels[(int)ringbuffer->buffer[i].level],
                    ipaddr,
                    ringbuffer->buffer[i].tunnel,
                    ringbuffer->buffer[i].session,
                    ringbuffer->buffer[i].message);
                    debug_levels[(int)ringbuffer->buffer[i].level],
                    ipaddr,
                    ringbuffer->buffer[i].tunnel,
                    ringbuffer->buffer[i].session,
                    ringbuffer->buffer[i].message);

+
+           reprompt = 1;

        }
 
        if (++i == ringbuffer->tail) break;
        }
 
        if (++i == ringbuffer->tail) break;


@@ -937,8 +1695,8 @@ int regular_stuff(struct cli_def *cli, FILE *w)
     }
 
     debug_rb_tail = ringbuffer->tail;
     }
 
     debug_rb_tail = ringbuffer->tail;

+    if (reprompt)
+       cli_reprompt(cli);

 #endif
     return CLI_OK;
 }
 #endif
     return CLI_OK;
 }

-
-#endif