Add configurable hostname

[l2tpns.git] / cli.c

diff --git a/cli.c b/cli.c
index 772c32d..8c43590 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -2,7 +2,7 @@
 // vim: sw=8 ts=8
 
 char const *cvs_name = "$Name:  $";
-char const *cvs_id_cli = "$Id: cli.c,v 1.14 2004/08/26 06:24:12 fred_nerk Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.16 2004/09/19 23:26:46 fred_nerk Exp $";
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -103,7 +103,7 @@ 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(char *hostname)
+void init_cli()
 {
        FILE *f;
        char buf[4096];
@@ -113,10 +113,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");
@@ -258,6 +258,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);
@@ -397,7 +400,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);