Make it compile
[l2tpns.git] / cli.c
diff --git a/cli.c b/cli.c
index bada0a9..83b5c8d 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -1,8 +1,8 @@
 // L2TPNS Command Line Interface
-// vim: sw=4 ts=8
+// vim: sw=8 ts=8
 
 char const *cvs_name = "$Name:  $";
-char const *cvs_id_cli = "$Id: cli.c,v 1.11 2004-08-13 00:02:50 fred_nerk Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.17 2004-09-21 05:09:09 fred_nerk Exp $";
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -48,6 +48,7 @@ extern struct Tringbuffer *ringbuffer;
 #endif
 extern struct cli_session_actions *cli_session_actions;
 extern struct cli_tunnel_actions *cli_tunnel_actions;
+extern tbft *filter_list;
 
 char *debug_levels[] = {
        "CRIT",
@@ -101,8 +102,9 @@ 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 parsemac(char *string, char mac[6]);
 
-void init_cli(char *hostname)
+void init_cli()
 {
        FILE *f;
        char buf[4096];
@@ -112,10 +114,10 @@ void init_cli(char *hostname)
        struct sockaddr_in addr;
 
        cli = cli_init();
-       if (hostname && *hostname)
-                       cli_set_hostname(cli, hostname);
+       if (config->hostname && *config->hostname)
+               cli_set_hostname(cli, config->hostname);
        else
-                       cli_set_hostname(cli, "l2tpns");
+               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");
@@ -236,6 +238,9 @@ void init_cli(char *hostname)
 void cli_do(int sockfd)
 {
        int i;
+       int require_auth = 1;
+       struct sockaddr_in addr;
+       int l = sizeof(addr);
 
        if (fork()) return;
        if (config->scheduler_fifo)
@@ -254,6 +259,9 @@ void cli_do(int sockfd)
                }
        }
 
+       if (config->hostname && *config->hostname)
+               cli_set_hostname(cli, config->hostname);
+
        signal(SIGPIPE, SIG_DFL);
        signal(SIGCHLD, SIG_DFL);
        signal(SIGHUP, SIG_DFL);
@@ -278,33 +286,28 @@ void cli_do(int sockfd)
                        close(bgp_peers[i].sock);
 #endif /* BGP */
 
+       if (getpeername(sockfd, (struct sockaddr *)&addr, &l) == 0)
        {
-               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 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));
 
-               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
+       if (require_auth)
+       {
+               log(3, 0, 0, 0, "CLI is remote, requiring authentication\n");
+               if (!cli->users) /* paranoia */
                {
-                       /* no username/pass required */
-                       cli->users = 0;
+                       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;
@@ -317,7 +320,7 @@ void cli_do(int sockfd)
        cli_loop(cli, sockfd);
 
        close(sockfd);
-       log(3, 0, 0, 0, "Closed CLI connection\n");
+       log(3, 0, 0, 0, "Closed CLI connection from %s\n", inet_toa(addr.sin_addr.s_addr));
        exit(0);
 }
 
@@ -385,7 +388,7 @@ int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc)
                // Show individual session
                for (i = 0; i < argc; i++)
                {
-                       unsigned int s;
+                       unsigned int s, b_in, b_out;
                        s = atoi(argv[i]);
                        if (s <= 0 || s >= MAXSESSION)
                        {
@@ -398,7 +401,7 @@ int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc)
                        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, "                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);
@@ -414,8 +417,41 @@ int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc)
                                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);
+                       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",
+                                       "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",
+                                       b_in,
+                                       (filter_list[b_in].next ? "*" : " "),
+                                       filter_list[b_in].rate * 8,
+                                       filter_list[b_in].credit,
+                                       filter_list[b_in].queued,
+                                       filter_list[b_in].b_queued,
+                                       filter_list[b_in].p_queued,
+                                       filter_list[b_in].b_sent,
+                                       filter_list[b_in].p_sent,
+                                       filter_list[b_in].p_dropped,
+                                       filter_list[b_in].p_delayed);
+
+                       if (b_out)
+                               cli_print(cli, "        TBFO#%d%1s      %5d %6d %6d | %7d %7d %8d %8d %8d %8d",
+                                       b_out,
+                                       (filter_list[b_out].next ? "*" : " "),
+                                       filter_list[b_out].rate * 8,
+                                       filter_list[b_out].credit,
+                                       filter_list[b_out].queued,
+                                       filter_list[b_out].b_queued,
+                                       filter_list[b_out].p_queued,
+                                       filter_list[b_out].b_sent,
+                                       filter_list[b_out].p_sent,
+                                       filter_list[b_out].p_dropped,
+                                       filter_list[b_out].p_delayed);
+
                }
                return CLI_OK;
        }
@@ -847,6 +883,14 @@ int cmd_show_run(struct cli_def *cli, char *command, char **argv, int argc)
                        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);
+               else if (config_values[i].type == MAC)
+                       cli_print(cli, "set %s %02x%02x.%02x%02x.%02x%02x", config_values[i].key,
+                                       *(unsigned short *)(value + 0),
+                                       *(unsigned short *)(value + 1),
+                                       *(unsigned short *)(value + 2),
+                                       *(unsigned short *)(value + 3),
+                                       *(unsigned short *)(value + 4),
+                                       *(unsigned short *)(value + 5));
        }
 
        cli_print(cli, "# Plugins");
@@ -885,7 +929,7 @@ int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int argc)
                        NULL);
        }
 
-       cli_print(cli, "%6s%5s%6s%9s%9s%4s", "Radius", "Sock", "State", "Session", "Retry", "Try");
+       cli_print(cli, "%6s%6s%5s%6s%9s%9s%4s", "ID", "Radius", "Sock", "State", "Session", "Retry", "Try");
 
        time(&time_now);
 
@@ -901,7 +945,8 @@ int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int argc)
 
                if (!show_all && radius[i].state == RADIUSNULL) continue;
 
-               cli_print(cli, "%6d%5d%6s%9d%9u%4d",
+               cli_print(cli, "%6d%6d%5d%6s%9d%9u%4d",
+                               i,
                                i >> RADIUS_SHIFT,
                                i & RADIUS_MASK,
                                states[radius[i].state],
@@ -1226,12 +1271,27 @@ 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 i;
+       int rate_in = 0;
+       int rate_out = 0;
        sessionidt s;
 
        if (CLI_HELP_REQUESTED)
-               return cli_arg_help(cli, argc > 1,
-                       "USER", "Username of session to throttle", NULL);
+       {
+               switch (argc)
+               {
+                       case 1:
+                               return cli_arg_help(cli, 0, "user", "Username of session to throttle", NULL);
+
+                       case 2:
+                               return cli_arg_help(cli, 1, "rate", "Incoming rate in kb/s", NULL);
+
+                       case 3:
+                               return cli_arg_help(cli, 1, "rate", "Outgoing rate in kb/s", NULL);
+
+                       default:
+                               return cli_arg_help(cli, argc > 1, "user", "Username of session to throttle", NULL);
+               }
+       }
 
        if (!config->cluster_iam_master)
        {
@@ -1239,31 +1299,32 @@ int cmd_throttle(struct cli_def *cli, char *command, char **argv, int argc)
                return CLI_OK;
        }
 
-       if (!argc)
+       if (argc == 0)
        {
-               cli_print(cli, "Specify a user");
+               cli_print(cli, "You must specify at least a username");
                return CLI_OK;
        }
 
-       for (i = 0; i < argc; i++)
-       {
-               if (!(s = sessionbyuser(argv[i])))
-               {
-                       cli_print(cli, "User %s is not connected", argv[i]);
-                       continue;
-               }
+       rate_in = rate_out = config->rl_rate;
+       if (argc >= 2) rate_in = atoi(argv[1]);
+       if (argc >= 3) rate_out = atoi(argv[2]);
 
-               if (session[s].throttle)
-               {
-                       cli_print(cli, "User %s already throttled", argv[i]);
-                       continue;
-               }
+       if (!(s = sessionbyuser(argv[0])))
+       {
+               cli_print(cli, "User %s is not connected", argv[0]);
+               return CLI_OK;
+       }
 
-               cli_print(cli, "Throttling user %s", argv[i]);
-               cli_session_actions[s].throttle = config->rl_rate; // could be configurable at some stage
-               cli_session_actions[s].action |= CLI_SESS_THROTTLE;
+       if (session[s].throttle)
+       {
+               cli_print(cli, "User %s already throttled, unthrottle first", argv[0]);
+               return CLI_OK;
        }
 
+       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;
 }
 
@@ -1575,7 +1636,7 @@ int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
 
                case 3:
                        if (!argv[2][1])
-                                       return cli_arg_help(cli, 1, NULL);
+                               return cli_arg_help(cli, 1, NULL);
 
                default:
                        return CLI_OK;
@@ -1612,6 +1673,9 @@ int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
                                case IP:
                                        *(unsigned *)value = inet_addr(argv[1]);
                                        break;
+                               case MAC:
+                                       parsemac(argv[1], (char *)value);
+                                       break;
                                case BOOL:
                                        if (strcasecmp(argv[1], "yes") == 0 || strcasecmp(argv[1], "true") == 0 || strcasecmp(argv[1], "1") == 0)
                                                *(int *)value = 1;
@@ -1681,3 +1745,14 @@ int regular_stuff(struct cli_def *cli)
 #endif
        return CLI_OK;
 }
+
+// Convert a string in the form of abcd.ef12.3456 into char[6]
+void parsemac(char *string, char mac[6])
+{
+       if (sscanf(string, "%02x%02x.%02x%02x.%02x%02x", (unsigned int *)&mac[0], (unsigned int *)&mac[1], (unsigned int *)&mac[2], (unsigned int *)&mac[3], (unsigned int *)&mac[4], (unsigned int *)&mac[5]) == 6)
+               return;
+       if (sscanf(string, "%02x%02x:%02x%02x:%02x%02x", (unsigned int *)&mac[0], (unsigned int *)&mac[1], (unsigned int *)&mac[2], (unsigned int *)&mac[3], (unsigned int *)&mac[4], (unsigned int *)&mac[5]) == 6)
+               return;
+       memset(mac, 0, 6);
+}
+