Fix binding of the cli to the configured address

[l2tpns.git] / cli.c

diff --git a/cli.c b/cli.c
index 75bbe05..25ba34f 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.71 2005/12/06 09:43:42 bodea Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.76 2006/12/18 12:08:28 bodea Exp $";

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


@@ -36,6 +36,7 @@ char const *cvs_id_cli = "$Id: cli.c,v 1.71 2005/12/06 09:43:42 bodea Exp $";
 #endif
 
 extern tunnelt *tunnel;
 #endif
 
 extern tunnelt *tunnel;

+extern bundlet *bundle;

 extern sessiont *session;
 extern radiust *radius;
 extern ippoolt *ip_address_pool;
 extern sessiont *session;
 extern radiust *radius;
 extern ippoolt *ip_address_pool;


@@ -99,6 +100,9 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, int argc);
 static int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc);

+static int cmd_shutdown(struct cli_def *cli, char *command, char **argv, int argc);
+static int cmd_reload(struct cli_def *cli, char *command, char **argv, int argc);
+

 
 static int regular_stuff(struct cli_def *cli);
 
 
 static int regular_stuff(struct cli_def *cli);
 


@@ -129,20 +133,14 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
 /* match if b is a substr of a */
 #define MATCH(a,b) (!strncmp((a), (b), strlen(b)))
 
 /* match if b is a substr of a */
 #define MATCH(a,b) (!strncmp((a), (b), strlen(b)))
 

-void init_cli(char *hostname)
+void init_cli()

 {
        FILE *f;
        char buf[4096];
        struct cli_command *c;
        struct cli_command *c2;
 {
        FILE *f;
        char buf[4096];
        struct cli_command *c;
        struct cli_command *c2;

-       int on = 1;
-       struct sockaddr_in addr;

 
        cli = cli_init();
 
        cli = cli_init();

-       if (hostname && *hostname)
-               cli_set_hostname(cli, hostname);
-       else
-               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");
 
        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");


@@ -175,6 +173,8 @@ void init_cli(char *hostname)
 #endif
 
        cli_register_command(cli, NULL, "uptime", cmd_uptime, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show uptime and bandwidth utilisation");
 #endif
 
        cli_register_command(cli, NULL, "uptime", cmd_uptime, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show uptime and bandwidth utilisation");

+       cli_register_command(cli, NULL, "shutdown", cmd_shutdown, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Shutdown l2tpns daemon and exit");
+       cli_register_command(cli, NULL, "reload", cmd_reload, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Reload configuration");

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


@@ -266,9 +266,20 @@ void init_cli(char *hostname)
                }
                fclose(f);
        }
                }
                fclose(f);
        }

+}
+
+void cli_init_complete(char *hostname)
+{
+       int on = 1;
+       struct sockaddr_in addr;
+
+       if (hostname && *hostname)
+               cli_set_hostname(cli, hostname);
+       else
+               cli_set_hostname(cli, "l2tpns");

 
        memset(&addr, 0, sizeof(addr));
 
        memset(&addr, 0, sizeof(addr));

-       clifd = socket(PF_INET, SOCK_STREAM, 6);
+       clifd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);

        setsockopt(clifd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
        {
                int flags;
        setsockopt(clifd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
        {
                int flags;


@@ -277,13 +288,22 @@ void init_cli(char *hostname)
                fcntl(clifd, F_SETFL, flags | O_NONBLOCK);
        }
        addr.sin_family = AF_INET;
                fcntl(clifd, F_SETFL, flags | O_NONBLOCK);
        }
        addr.sin_family = AF_INET;

+       addr.sin_addr.s_addr = config->cli_bind_address; /* defaults to INADDR_ANY */

        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, "Error binding cli on port 23: %s\n", strerror(errno));
+               close(clifd);
+               clifd = -1;
+               return;
+       }
+       if (listen(clifd, 10) < 0)

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

+               close(clifd);
+               clifd = -1;

                return;
        }
                return;
        }

-       listen(clifd, 10);

 }
 
 void cli_do(int sockfd)
 }
 
 void cli_do(int sockfd)


@@ -425,6 +445,26 @@ 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);

+                       if (session[s].session_timeout)
+                       {
+                               clockt opened = session[s].opened;
+                               if (session[s].bundle && bundle[session[s].bundle].num_of_links > 1)
+                                       opened = bundle[session[s].bundle].online_time;
+
+                               cli_print(cli, "\tSess Timeout:\t%u seconds", session[s].session_timeout - (opened ? abs(time_now - opened) : 0));
+                       }
+
+                       if (session[s].idle_timeout)
+                               cli_print(cli, "\tIdle Timeout:\t%u seconds", session[s].idle_timeout - (session[s].last_data ? abs(time_now - session[s].last_data) : 0));
+
+                       if (session[s].timeout)
+                       {
+                               cli_print(cli, "\tRemaining time:\t%u",
+                                       (session[s].bundle && bundle[session[s].bundle].num_of_links > 1)
+                                       ? (unsigned) (session[s].timeout - bundle[session[s].bundle].online_time)
+                                       : (unsigned) (session[s].timeout - (time_now - session[s].opened)));
+                       }
+

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


@@ -492,7 +532,7 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
        }
 
        // Show Summary
        }
 
        // Show Summary

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

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


@@ -505,13 +545,20 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
                        "downloaded",
                        "uploaded",
                        "idle",
                        "downloaded",
                        "uploaded",
                        "idle",

+                       "Rem.Time",

                        "LAC",
                        "CLI");
 
        for (i = 1; i < MAXSESSION; i++)
        {
                        "LAC",
                        "CLI");
 
        for (i = 1; i < MAXSESSION; i++)
        {

+               uint32_t rem_time;

                if (!session[i].opened) continue;
                if (!session[i].opened) continue;

-               cli_print(cli, "%5d %4d %-32s %-15s %s %s %s %s %10u %10lu %10lu %4u %-15s %s",
+               if (session[i].bundle && bundle[session[i].bundle].num_of_links > 1)
+                       rem_time = session[i].timeout ? (session[i].timeout - bundle[session[i].bundle].online_time) : 0;
+               else
+                       rem_time = session[i].timeout ? (session[i].timeout - (time_now-session[i].opened)) : 0;
+
+               cli_print(cli, "%5d %4d %-32s %-15s %s %s %s %s %10u %10lu %10lu %4u %10lu %-15s %s",

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


@@ -524,6 +571,7 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int
                                (unsigned long)session[i].cout,
                                (unsigned long)session[i].cin,
                                abs(time_now - (session[i].last_packet ? session[i].last_packet : time_now)),
                                (unsigned long)session[i].cout,
                                (unsigned long)session[i].cin,
                                abs(time_now - (session[i].last_packet ? session[i].last_packet : time_now)),

+                               (unsigned long)(rem_time),

                                fmtaddr(htonl(tunnel[ session[i].tunnel ].ip), 1),
                                session[i].calling[0] ? session[i].calling : "*");
        }
                                fmtaddr(htonl(tunnel[ session[i].tunnel ].ip), 1),
                                session[i].calling[0] ? session[i].calling : "*");
        }


@@ -1004,6 +1052,11 @@ static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int arg
                                h = BGP_HOLD_TIME;
 
                        cli_print(cli, " neighbour %s timers %d %d", config->neighbour[i].name, k, h);
                                h = BGP_HOLD_TIME;
 
                        cli_print(cli, " neighbour %s timers %d %d", config->neighbour[i].name, k, h);

+
+                       if (config->neighbour[i].update_source.s_addr != INADDR_ANY)
+                               cli_print(cli, " neighbour %s update-source %s",
+                                               config->neighbour[i].name,
+                                               inet_ntoa(config->neighbour[i].update_source));

                }
        }
 #endif
                }
        }
 #endif


@@ -2016,7 +2069,7 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
        int keepalive;
        int hold;
 
        int keepalive;
        int hold;
 

-       if (CLI_HELP_REQUESTED)
+       if (CLI_HELP_REQUESTED)

        {
                switch (argc)
                {
        {
                switch (argc)
                {


@@ -2030,6 +2083,7 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
                        return cli_arg_help(cli, 0,
                                "remote-as", "Set remote autonomous system number",
                                "timers",    "Set timers",
                        return cli_arg_help(cli, 0,
                                "remote-as", "Set remote autonomous system number",
                                "timers",    "Set timers",

+                               "update-source",    "Set source address to use for the BGP session",

                                NULL);
 
                default:
                                NULL);
 
                default:


@@ -2048,6 +2102,9 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
                                        return cli_arg_help(cli, 1, NULL);
                        }
 
                                        return cli_arg_help(cli, 1, NULL);
                        }
 

+                       if (MATCH("update-source", argv[1]))
+                               return cli_arg_help(cli, argc > 3, "A.B.C.D", "Source IP address", NULL);
+

                        return CLI_OK;
                }
        }
                        return CLI_OK;
                }
        }


@@ -2084,12 +2141,33 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
                        snprintf(config->neighbour[i].name, sizeof(config->neighbour[i].name), "%s", argv[0]);
                        config->neighbour[i].keepalive = -1;
                        config->neighbour[i].hold = -1;
                        snprintf(config->neighbour[i].name, sizeof(config->neighbour[i].name), "%s", argv[0]);
                        config->neighbour[i].keepalive = -1;
                        config->neighbour[i].hold = -1;

+                       config->neighbour[i].update_source.s_addr = INADDR_ANY;

                }
 
                config->neighbour[i].as = as;
                return CLI_OK;
        }
 
                }
 
                config->neighbour[i].as = as;
                return CLI_OK;
        }
 

+       if (MATCH("update-source", argv[1]))
+       {
+               struct in_addr addr;
+
+               if (!config->neighbour[i].name[0])
+               {
+                       cli_error(cli, "Specify remote-as first");
+                       return CLI_OK;
+               }
+
+               if (!inet_aton(argv[2], &addr))
+               {
+                       cli_error(cli, "Cannot parse IP \"%s\"", argv[2]);
+                       return CLI_OK;
+               }
+
+               config->neighbour[i].update_source = addr;
+               return CLI_OK;
+       }
+

        if (argc != 4 || !MATCH("timers", argv[1]))
        {
                cli_error(cli, "Invalid arguments");
        if (argc != 4 || !MATCH("timers", argv[1]))
        {
                cli_error(cli, "Invalid arguments");


@@ -2126,14 +2204,14 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a
        config->neighbour[i].keepalive = keepalive;
        config->neighbour[i].hold = hold;
 
        config->neighbour[i].keepalive = keepalive;
        config->neighbour[i].hold = hold;
 

-       return CLI_OK;
+       return CLI_OK;

 }
 
 static int cmd_router_bgp_no_neighbour(struct cli_def *cli, char *command, char **argv, int argc)
 {
        int i;
 
 }
 
 static int cmd_router_bgp_no_neighbour(struct cli_def *cli, char *command, char **argv, int argc)
 {
        int i;
 

-       if (CLI_HELP_REQUESTED)
+       if (CLI_HELP_REQUESTED)

                return cli_arg_help(cli, argc > 0,
                        "A.B.C.D", "BGP neighbour address",
                        "NAME",    "BGP neighbour name",
                return cli_arg_help(cli, argc > 0,
                        "A.B.C.D", "BGP neighbour address",
                        "NAME",    "BGP neighbour name",


@@ -2158,7 +2236,7 @@ static int cmd_router_bgp_no_neighbour(struct cli_def *cli, char *command, char
        }
 
        memset(&config->neighbour[i], 0, sizeof(config->neighbour[i]));
        }
 
        memset(&config->neighbour[i], 0, sizeof(config->neighbour[i]));

-       return CLI_OK;
+       return CLI_OK;

 }
 
 static int cmd_show_bgp(struct cli_def *cli, char *command, char **argv, int argc)
 }
 
 static int cmd_show_bgp(struct cli_def *cli, char *command, char **argv, int argc)


@@ -3064,3 +3142,21 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv,
 
        return CLI_OK;
 }
 
        return CLI_OK;
 }

+
+static int cmd_shutdown(struct cli_def *cli, char *command, char **argv, int argc)
+{
+       if (CLI_HELP_REQUESTED)
+               return CLI_HELP_NO_ARGS;
+
+       kill(getppid(), SIGQUIT);
+       return CLI_OK;
+}
+
+static int cmd_reload(struct cli_def *cli, char *command, char **argv, int argc)
+{
+       if (CLI_HELP_REQUESTED)
+               return CLI_HELP_NO_ARGS;
+
+       kill(getppid(), SIGHUP);
+       return CLI_OK;
+}