don't shutdown on TerminateReq, wait for CDN

[l2tpns.git] / cli.c

diff --git a/cli.c b/cli.c
index 80b92a9..75bbe05 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -2,9 +2,10 @@
 // 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.66 2005/09/01 06:59:06 bodea Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.71 2005/12/06 09:43:42 bodea Exp $";

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

+#include <stddef.h>

 #include <stdarg.h>
 #include <unistd.h>
 #include <sys/file.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <sys/file.h>


@@ -100,7 +101,6 @@ static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, in
 static int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc);
 
 static int regular_stuff(struct cli_def *cli);
 static int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc);
 
 static int regular_stuff(struct cli_def *cli);

-static void parsemac(char *string, char mac[6]);

 
 #ifdef STATISTICS
 static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc);
 
 #ifdef STATISTICS
 static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc);


@@ -425,8 +425,6 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
                        cli_print(cli, "\tUnique SID:\t%u", session[s].unique_id);
                        cli_print(cli, "\tOpened:\t\t%u seconds", session[s].opened ? abs(time_now - session[s].opened) : 0);
                        cli_print(cli, "\tIdle time:\t%u seconds", session[s].last_packet ? abs(time_now - session[s].last_packet) : 0);
                        cli_print(cli, "\tUnique SID:\t%u", session[s].unique_id);
                        cli_print(cli, "\tOpened:\t\t%u seconds", session[s].opened ? abs(time_now - session[s].opened) : 0);
                        cli_print(cli, "\tIdle time:\t%u seconds", session[s].last_packet ? abs(time_now - session[s].last_packet) : 0);

-                       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%u/%u", session[s].cout, session[s].cin);
                        cli_print(cli, "\tPkts In/Out:\t%u/%u", session[s].pout, session[s].pin);
                        cli_print(cli, "\tMRU:\t\t%d", session[s].mru);
                        cli_print(cli, "\tBytes In/Out:\t%u/%u", session[s].cout, session[s].cin);
                        cli_print(cli, "\tPkts In/Out:\t%u/%u", session[s].pout, session[s].pin);
                        cli_print(cli, "\tMRU:\t\t%d", session[s].mru);


@@ -965,14 +963,6 @@ static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int arg
                        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, "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");
        }
 
        cli_print(cli, "# Plugins");


@@ -1889,9 +1879,6 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc)
                        case IPv6:
                                inet_pton(AF_INET6, argv[1], value);
                                break;
                        case IPv6:
                                inet_pton(AF_INET6, argv[1], value);
                                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;
                        case BOOL:
                                if (strcasecmp(argv[1], "yes") == 0 || strcasecmp(argv[1], "true") == 0 || strcasecmp(argv[1], "1") == 0)
                                        *(int *) value = 1;


@@ -2884,7 +2871,7 @@ static int cmd_ip_access_list_rule(struct cli_def *cli, char *command, char **ar
                        return CLI_OK;
                }
 
                        return CLI_OK;
                }
 

-               if (!memcmp(&ip_filters[filt].rules[i], rule, sizeof(*rule)))
+               if (!memcmp(&ip_filters[filt].rules[i], rule, offsetof(ip_filter_rulet, counter)))

                        return CLI_OK;
        }
 
                        return CLI_OK;
        }
 


@@ -3068,7 +3055,7 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
                {
                        char const *r = show_access_list_rule(ip_filters[f].extended, rules);
                        if (rules->counter)
                {
                        char const *r = show_access_list_rule(ip_filters[f].extended, rules);
                        if (rules->counter)

-                               cli_print(cli, "%s (%d match%s)", r,
+                               cli_print(cli, "%s (%u match%s)", r,

                                        rules->counter, rules->counter > 1 ? "es" : "");
                        else
                                cli_print(cli, "%s", r);
                                        rules->counter, rules->counter > 1 ? "es" : "");
                        else
                                cli_print(cli, "%s", r);


@@ -3077,13 +3064,3 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
 
        return CLI_OK;
 }
 
        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);
-}