add install to .PHONY

[l2tpns.git] / cli.c

diff --git a/cli.c b/cli.c
index c223b91..b61571c 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -2,7 +2,7 @@
 // vim: sw=8 ts=8
 
 char const *cvs_name = "$Name:  $";
 // vim: sw=8 ts=8
 
 char const *cvs_name = "$Name:  $";

-char const *cvs_id_cli = "$Id: cli.c,v 1.19 2004-10-30 07:35:31 bodea Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.24 2004-11-05 04:55:26 bodea Exp $";

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


@@ -10,7 +10,6 @@ char const *cvs_id_cli = "$Id: cli.c,v 1.19 2004-10-30 07:35:31 bodea Exp $";
 #include <sys/stat.h>
 #include <syslog.h>
 #include <malloc.h>
 #include <sys/stat.h>
 #include <syslog.h>
 #include <malloc.h>

-#include <sched.h>

 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <stdlib.h>


@@ -39,8 +38,6 @@ extern ippoolt *ip_address_pool;
 extern struct Tstats *_statistics;
 struct cli_def *cli = NULL;
 int cli_quit = 0;
 extern struct Tstats *_statistics;
 struct cli_def *cli = NULL;
 int cli_quit = 0;

-extern int clifd, udpfd, tunfd, snoopfd, ifrfd, cluster_sockfd;
-extern int *radfds;

 extern struct configt *config;
 extern struct config_descriptt config_values[];
 #ifdef RINGBUFFER
 extern struct configt *config;
 extern struct config_descriptt config_values[];
 #ifdef RINGBUFFER


@@ -189,7 +186,7 @@ void init_cli(char *hostname)
 
        if (!(f = fopen(CLIUSERS, "r")))
        {
 
        if (!(f = fopen(CLIUSERS, "r")))
        {

-               log(0, 0, 0, 0, "WARNING! No users specified. Command-line access is open to all\n");
+               LOG(0, 0, 0, 0, "WARNING! No users specified. Command-line access is open to all\n");

        }
        else
        {
        }
        else
        {


@@ -205,12 +202,12 @@ void init_cli(char *hostname)
                        if (!strcmp(buf, "enable"))
                        {
                                cli_allow_enable(cli, p);
                        if (!strcmp(buf, "enable"))
                        {
                                cli_allow_enable(cli, p);

-                               log(3, 0, 0, 0, "Setting enable password\n");
+                               LOG(3, 0, 0, 0, "Setting enable password\n");

                        }
                        else
                        {
                                cli_allow_user(cli, buf, p);
                        }
                        else
                        {
                                cli_allow_user(cli, buf, p);

-                               log(3, 0, 0, 0, "Allowing user %s to connect to the CLI\n", buf);
+                               LOG(3, 0, 0, 0, "Allowing user %s to connect to the CLI\n", buf);

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


@@ -229,7 +226,7 @@ void init_cli(char *hostname)
        addr.sin_port = htons(23);
        if (bind(clifd, (void *) &addr, sizeof(addr)) < 0)
        {
        addr.sin_port = htons(23);
        if (bind(clifd, (void *) &addr, sizeof(addr)) < 0)
        {

-               log(0, 0, 0, 0, "Error listening on cli port 23: %s\n", strerror(errno));
+               LOG(0, 0, 0, 0, "Error listening on cli port 23: %s\n", strerror(errno));

                return;
        }
        listen(clifd, 10);
                return;
        }
        listen(clifd, 10);


@@ -237,66 +234,25 @@ void init_cli(char *hostname)
 
 void cli_do(int sockfd)
 {
 
 void cli_do(int sockfd)
 {

-       int i;

        int require_auth = 1;
        struct sockaddr_in addr;
        int l = sizeof(addr);
 
        int require_auth = 1;
        struct sockaddr_in addr;
        int l = sizeof(addr);
 

-       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(SIGHUP, SIG_DFL);
-       signal(SIGUSR1, 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 (tunfd) close(tunfd); tunfd = 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 */
-
+       if (fork_and_close()) return;

        if (getpeername(sockfd, (struct sockaddr *)&addr, &l) == 0)
        {
        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));
+               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
                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(0, 0, 0, 0, "getpeername() failed on cli socket. Requiring authentication: %s\n", strerror(errno));

 
        if (require_auth)
        {
 
        if (require_auth)
        {

-               log(3, 0, 0, 0, "CLI is remote, requiring authentication\n");
+               LOG(3, 0, 0, 0, "CLI is remote, requiring authentication\n");

                if (!cli->users) /* paranoia */
                {
                if (!cli->users) /* paranoia */
                {

-                       log(0, 0, 0, 0, "No users for remote authentication!  Exiting CLI\n");
+                       LOG(0, 0, 0, 0, "No users for remote authentication!  Exiting CLI\n");

                        exit(0);
                }
        }
                        exit(0);
                }
        }


@@ -317,18 +273,18 @@ void cli_do(int sockfd)
        cli_loop(cli, sockfd);
 
        close(sockfd);
        cli_loop(cli, sockfd);
 
        close(sockfd);

-       log(3, 0, 0, 0, "Closed CLI connection from %s\n", inet_toa(addr.sin_addr.s_addr));
+       LOG(3, 0, 0, 0, "Closed CLI connection from %s\n", inet_toa(addr.sin_addr.s_addr));

        exit(0);
 }
 
 void cli_print_log(struct cli_def *cli, char *string)
 {
        exit(0);
 }
 
 void cli_print_log(struct cli_def *cli, char *string)
 {

-       log(3, 0, 0, 0, "%s\n", string);
+       LOG(3, 0, 0, 0, "%s\n", string);

 }
 
 void cli_do_file(FILE *fh)
 {
 }
 
 void cli_do_file(FILE *fh)
 {

-       log(3, 0, 0, 0, "Reading configuration file\n");
+       LOG(3, 0, 0, 0, "Reading configuration file\n");

        cli_print_callback(cli, cli_print_log);
        cli_file(cli, fh, PRIVILEGE_PRIVILEGED, MODE_CONFIG);
        cli_print_callback(cli, NULL);
        cli_print_callback(cli, cli_print_log);
        cli_file(cli, fh, PRIVILEGE_PRIVILEGED, MODE_CONFIG);
        cli_print_callback(cli, NULL);


@@ -393,38 +349,49 @@ int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc)
                                continue;
                        }
                        cli_print(cli, "\r\nSession %d:", s);
                                continue;
                        }
                        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, "        Unique SID:     %lu", session[s].unique_id);
-                       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);
+                       cli_print(cli, "\tUser:\t\t%s", session[s].user[0] ? session[s].user : "none");
+                       cli_print(cli, "\tCalling Num:\t%s", session[s].calling);
+                       cli_print(cli, "\tCalled Num:\t%s", session[s].called);
+                       cli_print(cli, "\tTunnel ID:\t%d", session[s].tunnel);
+                       cli_print(cli, "\tIP address:\t%s", inet_toa(htonl(session[s].ip)));
+                       cli_print(cli, "\tUnique SID:\t%lu", session[s].unique_id);
+                       cli_print(cli, "\tIdle time:\t%u seconds", abs(time_now - session[s].last_packet));
+                       cli_print(cli, "\tNext Recv:\t%u", session[s].nr);
+                       cli_print(cli, "\tNext Send:\t%u", session[s].ns);
+                       cli_print(cli, "\tBytes In/Out:\t%lu/%lu", (unsigned long)session[s].total_cout, (unsigned long)session[s].total_cin);
+                       cli_print(cli, "\tPkts In/Out:\t%lu/%lu", (unsigned long)session[s].pout, (unsigned long)session[s].pin);
+                       cli_print(cli, "\tMRU:\t\t%d", session[s].mru);
+                       cli_print(cli, "\tRadius Session:\t%u", session[s].radius);
+                       cli_print(cli, "\tRx Speed:\t%lu", session[s].rx_connect_speed);
+                       cli_print(cli, "\tTx Speed:\t%lu", session[s].tx_connect_speed);

                        if (session[s].snoop_ip && session[s].snoop_port)
                        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);
+                               cli_print(cli, "\tIntercepted:\t%s:%d", inet_toa(session[s].snoop_ip), session[s] .snoop_port);

                        else
                        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, "\tIntercepted:\tno");
+
+                       cli_print(cli, "\tWalled Garden:\t%s", session[s].walled_garden ? "YES" : "no");
+                       {
+                               int t = (session[s].throttle_in || session[s].throttle_out);
+                               cli_print(cli, "\tThrottled:\t%s%s%.0d%s%s%.0d%s%s",
+                                       t ? "YES" : "no", t ? " (" : "",
+                                       session[s].throttle_in, session[s].throttle_in ? "kbps" : t ? "-" : "",
+                                       t ? "/" : "",
+                                       session[s].throttle_out, session[s].throttle_out ? "kbps" : t ? "-" : "",
+                                       t ? ")" : "");
+                       }
+

                        b_in = session[s].tbf_in;
                        b_out = session[s].tbf_out;
                        if (b_in || b_out)
                        b_in = session[s].tbf_in;
                        b_out = session[s].tbf_out;
                        if (b_in || b_out)

-                               cli_print(cli, "                %5s %6s %6s | %7s %7s %8s %8s %8s %8s",
+                               cli_print(cli, "\t\t\t%5s %6s %6s | %7s %7s %8s %8s %8s %8s",

                                        "Rate", "Credit", "Queued", "ByteIn", "PackIn",
                                        "ByteSent", "PackSent", "PackDrop", "PackDelay");
 
                        if (b_in)
                                        "Rate", "Credit", "Queued", "ByteIn", "PackIn",
                                        "ByteSent", "PackSent", "PackDrop", "PackDelay");
 
                        if (b_in)

-                               cli_print(cli, "        TBFI#%d%1s      %5d %6d %6d | %7d %7d %8d %8d %8d %8d",
+                               cli_print(cli, "\tTBFI#%d%1s%s\t%5d %6d %6d | %7d %7d %8d %8d %8d %8d",

                                        b_in,
                                        (filter_list[b_in].next ? "*" : " "),
                                        b_in,
                                        (filter_list[b_in].next ? "*" : " "),

+                                       (b_in < 100 ? "\t" : ""),

                                        filter_list[b_in].rate * 8,
                                        filter_list[b_in].credit,
                                        filter_list[b_in].queued,
                                        filter_list[b_in].rate * 8,
                                        filter_list[b_in].credit,
                                        filter_list[b_in].queued,


@@ -436,9 +403,10 @@ int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc)
                                        filter_list[b_in].p_delayed);
 
                        if (b_out)
                                        filter_list[b_in].p_delayed);
 
                        if (b_out)

-                               cli_print(cli, "        TBFO#%d%1s      %5d %6d %6d | %7d %7d %8d %8d %8d %8d",
+                               cli_print(cli, "\tTBFO#%d%1s%s\t%5d %6d %6d | %7d %7d %8d %8d %8d %8d",

                                        b_out,
                                        (filter_list[b_out].next ? "*" : " "),
                                        b_out,
                                        (filter_list[b_out].next ? "*" : " "),

+                                       (b_out < 100 ? "\t" : ""),

                                        filter_list[b_out].rate * 8,
                                        filter_list[b_out].credit,
                                        filter_list[b_out].queued,
                                        filter_list[b_out].rate * 8,
                                        filter_list[b_out].credit,
                                        filter_list[b_out].queued,


@@ -454,7 +422,7 @@ int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc)
        }
 
        // Show Summary
        }
 
        // Show Summary

-       cli_print(cli, "  %s %4s %-32s %-15s %s %s %s %10s %10s %10s %4s %-15s %s",
+       cli_print(cli, "%5s %4s %-32s %-15s %s %s %s %10s %10s %10s %4s %-15s %s",

                        "SID",
                        "TID",
                        "Username",
                        "SID",
                        "TID",
                        "Username",


@@ -481,7 +449,7 @@ int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc)
                                session[i].user[0] ? session[i].user : "*",
                                userip,
                                (session[i].snoop_ip && session[i].snoop_port) ? "Y" : "N",
                                session[i].user[0] ? session[i].user : "*",
                                userip,
                                (session[i].snoop_ip && session[i].snoop_port) ? "Y" : "N",

-                               (session[i].throttle) ? "Y" : "N",
+                               (session[i].throttle_in || session[i].throttle_out) ? "Y" : "N",

                                (session[i].walled_garden) ? "Y" : "N",
                                abs(time_now - (unsigned long)session[i].opened),
                                (unsigned long)session[i].total_cout,
                                (session[i].walled_garden) ? "Y" : "N",
                                abs(time_now - (unsigned long)session[i].opened),
                                (unsigned long)session[i].total_cout,


@@ -539,21 +507,21 @@ int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int argc)
                                        continue;
                                }
                                cli_print(cli, "\r\nTunnel %d:", t);
                                        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));
+                               cli_print(cli, "\tState:\t\t%s", states[tunnel[t].state]);
+                               cli_print(cli, "\tHostname:\t%s", tunnel[t].hostname[0] ? tunnel[t].hostname : "(none)");
+                               cli_print(cli, "\tRemote IP:\t%s", inet_toa(htonl(tunnel[t].ip)));
+                               cli_print(cli, "\tRemote Port:\t%d", tunnel[t].port);
+                               cli_print(cli, "\tRx Window:\t%u", tunnel[t].window);
+                               cli_print(cli, "\tNext Recv:\t%u", tunnel[t].nr);
+                               cli_print(cli, "\tNext Send:\t%u", tunnel[t].ns);
+                               cli_print(cli, "\tQueue Len:\t%u", tunnel[t].controlc);
+                               cli_print(cli, "\tLast 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);
 
 
                                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);
+                               cli_print(cli, "\tSessions:\t%s", s);

                        }
                        return CLI_OK;
                }
                        }
                        return CLI_OK;
                }


@@ -570,7 +538,7 @@ int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int argc)
        for (i = 1; i < MAXTUNNEL; i++)
        {
                int sessions = 0;
        for (i = 1; i < MAXTUNNEL; i++)
        {
                int sessions = 0;

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

 
                for (x = 0; x < MAXSESSION; x++) if (session[x].tunnel == i && session[x].opened && !session[x].die) sessions++;
                cli_print(cli, "%4d %20s %20s %6s %6d",
 
                for (x = 0; x < MAXSESSION; x++) if (session[x].tunnel == i && session[x].opened && !session[x].die) sessions++;
                cli_print(cli, "%4d %20s %20s %6s %6d",


@@ -657,7 +625,7 @@ int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc)
        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%-10s", "Counter", "Value");
        cli_print(cli, "-----------------------------------------");
        cli_print(cli, "%-30s%lu", "radius_retries",            GET_STAT(radius_retries));

-       cli_print(cli, "%-30s%lu", "arp_sent",                          GET_STAT(arp_sent));
+       cli_print(cli, "%-30s%lu", "arp_sent",                  GET_STAT(arp_sent));

        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", "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));


@@ -667,10 +635,10 @@ int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc)
        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", "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", "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", "cluster_forwarded",         GET_STAT(c_forwarded));

-       cli_print(cli, "%-30s%lu", "recv_forward",                              GET_STAT(recv_forward));
+       cli_print(cli, "%-30s%lu", "recv_forward",              GET_STAT(recv_forward));

 
 
 #ifdef STATISTICS
 
 
 #ifdef STATISTICS


@@ -686,20 +654,20 @@ int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc)
        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_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_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_sessionbyip",          GET_STAT(call_sessionbyip));

-       cli_print(cli, "%-30s%lu", "call_sessionbyuser",                GET_STAT(call_sessionbyuser));
+       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_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_tunnelshutdown",       GET_STAT(call_tunnelshutdown));

        cli_print(cli, "%-30s%lu", "call_sessionkill",          GET_STAT(call_sessionkill));
        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_sessionshutdown",      GET_STAT(call_sessionshutdown));

        cli_print(cli, "%-30s%lu", "call_sessionsetup",         GET_STAT(call_sessionsetup));
        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_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
        cli_print(cli, "%-30s%lu", "call_radiussend",           GET_STAT(call_radiussend));
        cli_print(cli, "%-30s%lu", "call_radiusretry",          GET_STAT(call_radiusretry));
 #endif


@@ -809,7 +777,7 @@ int cmd_show_pool(struct cli_def *cli, char *command, char **argv, int argc)
                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",
+                       cli_print(cli, "%-15s\tY %8d %s",

                                inet_toa(htonl(ip_address_pool[i].address)), ip_address_pool[i].session, session[ip_address_pool[i].session].user);
 
                        used++;
                                inet_toa(htonl(ip_address_pool[i].address)), ip_address_pool[i].session, session[ip_address_pool[i].session].user);
 
                        used++;


@@ -817,11 +785,11 @@ int cmd_show_pool(struct cli_def *cli, char *command, char **argv, int argc)
                else
                {
                        if (ip_address_pool[i].last)
                else
                {
                        if (ip_address_pool[i].last)

-                               cli_print(cli, "%-15s   N %8s [%s] %ds",
+                               cli_print(cli, "%-15s\tN %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)
                                        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)));
+                               cli_print(cli, "%-15s\tN", inet_toa(htonl(ip_address_pool[i].address)));

 
                        free++;
                }
 
                        free++;
                }


@@ -983,17 +951,26 @@ int cmd_show_throttle(struct cli_def *cli, char *command, char **argv, int argc)
        if (CLI_HELP_REQUESTED)
                return CLI_HELP_NO_ARGS;
 
        if (CLI_HELP_REQUESTED)
                return CLI_HELP_NO_ARGS;
 

-       cli_print(cli, "Token bucket filters:");
-       cli_print(cli, "%-6s %8s %-4s", "ID", "Handle", "Used");
+       cli_print(cli, "%5s %4s %-32s %7s %6s %6s %6s",
+                       "SID",
+                       "TID",
+                       "Username",
+                       "Rate In",
+                       "Out",
+                       "TBFI",
+                       "TBFO");
+

        for (i = 0; i < MAXSESSION; i++)
        {
        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);
+               if (session[i].throttle_in || session[i].throttle_out)
+                       cli_print(cli, "%5d %4d %-32s  %6d %6d %6d %6d",
+                               i,
+                               session[i].tunnel,
+                               session[i].user,
+                               session[i].throttle_in,
+                               session[i].throttle_out,
+                               session[i].tbf_in,
+                               session[i].tbf_out);

        }
 
        return CLI_OK;
        }
 
        return CLI_OK;


@@ -1225,7 +1202,7 @@ int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc)
                return CLI_OK;
        }
 
                return CLI_OK;
        }
 

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

        cli_session_actions[s].snoop_ip = ip;
        cli_session_actions[s].snoop_port = port;
        cli_session_actions[s].action |= CLI_SESS_SNOOP;
        cli_session_actions[s].snoop_ip = ip;
        cli_session_actions[s].snoop_port = port;
        cli_session_actions[s].action |= CLI_SESS_SNOOP;


@@ -1275,21 +1252,42 @@ int cmd_throttle(struct cli_def *cli, char *command, char **argv, int argc)
        int rate_out = 0;
        sessionidt s;
 
        int rate_out = 0;
        sessionidt s;
 

+       /*
+          throttle USER                   - throttle in/out to default rate
+          throttle USER RATE              - throttle in/out to default rate
+          throttle USER in RATE           - throttle input only
+          throttle USER out RATE          - throttle output only
+          throttle USER in RATE out RATE  - throttle both
+        */
+

        if (CLI_HELP_REQUESTED)
        {
                switch (argc)
                {
                case 1:
        if (CLI_HELP_REQUESTED)
        {
                switch (argc)
                {
                case 1:

-                       return cli_arg_help(cli, 0, "user", "Username of session to throttle", NULL);
+                       return cli_arg_help(cli, 0,
+                               "USER", "Username of session to throttle", NULL);

 
                case 2:
 
                case 2:

-                       return cli_arg_help(cli, 1, "rate", "Incoming rate in kb/s", NULL);
+                       return cli_arg_help(cli, 1,
+                               "RATE", "Rate in kbps (in and out)",
+                               "in",   "Select incoming rate",
+                               "out",  "Select outgoing rate", NULL);
+
+               case 4:
+                       return cli_arg_help(cli, 1,
+                               "in",   "Select incoming rate",
+                               "out",  "Select outgoing rate", NULL);

 
                case 3:
 
                case 3:

-                       return cli_arg_help(cli, 1, "rate", "Outgoing rate in kb/s", NULL);
+                       if (isdigit(argv[1][0]))
+                               return cli_arg_help(cli, 1, NULL);
+
+               case 5:
+                       return cli_arg_help(cli, 0, "RATE", "Rate in kbps", NULL);

 
                default:
 
                default:

-                       return cli_arg_help(cli, argc > 1, "user", "Username of session to throttle", NULL);
+                       return cli_arg_help(cli, argc > 1, NULL);

                }
        }
 
                }
        }
 


@@ -1305,24 +1303,71 @@ int cmd_throttle(struct cli_def *cli, char *command, char **argv, int argc)
                return CLI_OK;
        }
 
                return CLI_OK;
        }
 

-       rate_in = rate_out = config->rl_rate;
-       if (argc >= 2) rate_in = atoi(argv[1]);
-       if (argc >= 3) rate_out = atoi(argv[2]);
-

        if (!(s = sessionbyuser(argv[0])))
        {
                cli_print(cli, "User %s is not connected", argv[0]);
                return CLI_OK;
        }
 
        if (!(s = sessionbyuser(argv[0])))
        {
                cli_print(cli, "User %s is not connected", argv[0]);
                return CLI_OK;
        }
 

-       if (session[s].throttle)
+       if (argc == 1)
+       {
+               rate_in = rate_out = config->rl_rate;
+       }
+       else if (argc == 2)
+       {
+               rate_in = rate_out = atoi(argv[1]);
+               if (rate_in < 1)
+               {
+                       cli_print(cli, "Invalid rate \"%s\"", argv[1]);
+                       return CLI_OK;
+               }
+       }
+       else if (argc == 3 || argc == 5)
+       {
+               int i;
+               for (i = 1; i < argc - 1; i += 2)
+               {
+                       int len = strlen(argv[i]);
+                       int r = 0;
+                       if (!strncasecmp(argv[i], "in", len))
+                               r = rate_in = atoi(argv[i+1]);
+                       else if (!strncasecmp(argv[i], "out", len))
+                               r = rate_out = atoi(argv[i+1]);
+
+                       if (r < 1)
+                       {
+                               cli_print(cli, "Invalid rate specification \"%s %s\"", argv[i], argv[i+1]);
+                               return CLI_OK;
+                       }
+               }
+       }
+       else
+       {
+               cli_print(cli, "Invalid arguments");
+               return CLI_OK;
+       }
+
+       if ((rate_in && session[s].throttle_in) || (rate_out && session[s].throttle_out))

        {
                cli_print(cli, "User %s already throttled, unthrottle first", argv[0]);
                return CLI_OK;
        }
 
        {
                cli_print(cli, "User %s already throttled, unthrottle first", argv[0]);
                return CLI_OK;
        }
 

+       cli_session_actions[s].throttle_in = cli_session_actions[s].throttle_out = -1;
+       if (rate_in && session[s].throttle_in != rate_in)
+               cli_session_actions[s].throttle_in = rate_in;
+
+       if (rate_out && session[s].throttle_out != rate_out)
+               cli_session_actions[s].throttle_out = rate_out;
+
+       if (cli_session_actions[s].throttle_in == -1 &&
+           cli_session_actions[s].throttle_out == -1)
+       {
+               cli_print(cli, "User %s already throttled at this rate", argv[0]);
+               return CLI_OK;
+       }
+

        cli_print(cli, "Throttling user %s", argv[0]);
        cli_print(cli, "Throttling user %s", argv[0]);

-       cli_session_actions[s].throttle = rate_in << 16 | rate_out;

        cli_session_actions[s].action |= CLI_SESS_THROTTLE;
 
        return CLI_OK;
        cli_session_actions[s].action |= CLI_SESS_THROTTLE;
 
        return CLI_OK;


@@ -1357,14 +1402,15 @@ int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int argc)
                        continue;
                }
 
                        continue;
                }
 

-               if (!session[s].throttle)
+               if (session[s].throttle_in || session[s].throttle_out)
+               {
+                       cli_print(cli, "Unthrottling user %s", argv[i]);
+                       cli_session_actions[s].action |= CLI_SESS_NOTHROTTLE;
+               }
+               else

                {
                        cli_print(cli, "User %s not throttled", argv[i]);
                {
                        cli_print(cli, "User %s not throttled", argv[i]);

-                       continue;

                }
                }

-
-               cli_print(cli, "Unthrottling user %s", argv[i]);
-               cli_session_actions[s].action |= CLI_SESS_NOTHROTTLE;

        }
 
        return CLI_OK;
        }
 
        return CLI_OK;