X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/7d4d3c7bcaea62121eaa60dce83c6d8209328838..refs/heads/fendo-mods:/cli.c?ds=inline

diff --git a/cli.c b/cli.c
index 9433106..3f63413 100644
--- a/cli.c
+++ b/cli.c
@@ -1,9 +1,6 @@
 // L2TPNS Command Line Interface
 // vim: sw=8 ts=8
 
-char const *cvs_name = "$Name:  $";
-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 <stdarg.h>
@@ -133,20 +130,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)))
 
-void init_cli(char *hostname)
+void init_cli()
 {
 	FILE *f;
 	char buf[4096];
 	struct cli_command *c;
 	struct cli_command *c2;
-	int on = 1;
-	struct sockaddr_in addr;
 
 	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");
@@ -272,6 +263,17 @@ void init_cli(char *hostname)
 		}
 		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));
 	clifd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -286,11 +288,19 @@ void init_cli(char *hostname)
 	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)
+	{
+		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));
+		close(clifd);
+		clifd = -1;
 		return;
 	}
-	listen(clifd, 10);
 }
 
 void cli_do(int sockfd)
@@ -811,72 +821,10 @@ static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, i
 
 static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc)
 {
-	int tag = 0;
-	int file = 0;
-	int i = 0;
-
 	if (CLI_HELP_REQUESTED)
-		return cli_arg_help(cli, 1,
-			"tag", "Include CVS release tag",
-			"file", "Include file versions",
-			NULL);
-
-	for (i = 0; i < argc; i++)
-		if (!strcmp(argv[i], "tag"))
-			tag++;
-		else if (!strcmp(argv[i], "file"))
-			file++;
+		return CLI_HELP_NO_ARGS;
 
 	cli_print(cli, "L2TPNS %s", VERSION);
-	if (tag)
-	{
-		char const *p = strchr(cvs_name, ':');
-		char const *e;
-		if (p)
-		{
-			p++;
-			while (isspace(*p))
-				p++;
-		}
-
-		if (!p || *p == '$')
-			p = "HEAD";
-
-		e = strpbrk(p, " \t$");
-		cli_print(cli, "Tag: %.*s", (int) (e ? e - p + 1 : strlen(p)), p);
-	}
-	
-	if (file)
-	{
-		extern linked_list *loaded_plugins;
-		void *p;
-
-		cli_print(cli, "Files:");
-		cli_print(cli, "  %s", cvs_id_arp);
-#ifdef BGP
-		cli_print(cli, "  %s", cvs_id_bgp);
-#endif /* BGP */
-		cli_print(cli, "  %s", cvs_id_cli);
-		cli_print(cli, "  %s", cvs_id_cluster);
-		cli_print(cli, "  %s", cvs_id_constants);
-		cli_print(cli, "  %s", cvs_id_control);
-		cli_print(cli, "  %s", cvs_id_icmp);
-		cli_print(cli, "  %s", cvs_id_l2tpns);
-		cli_print(cli, "  %s", cvs_id_ll);
-		cli_print(cli, "  %s", cvs_id_ppp);
-		cli_print(cli, "  %s", cvs_id_radius);
-		cli_print(cli, "  %s", cvs_id_tbf);
-		cli_print(cli, "  %s", cvs_id_util);
-
-		ll_reset(loaded_plugins);
-		while ((p = ll_next(loaded_plugins)))
-		{
-			char const **id = dlsym(p, "cvs_id");
-			if (id)
-				cli_print(cli, "  %s", *id);
-		}
-	}
-
 	return CLI_OK;
 }