// L2TPNS Command Line Interface
// vim: sw=8 ts=8
-char const *cvs_name = "$Name: $";
-char const *cvs_id_cli = "$Id: cli.c,v 1.63 2005/06/28 14:48:17 bodea Exp $";
-
#include <stdio.h>
+#include <stddef.h>
#include <stdarg.h>
#include <unistd.h>
#include <sys/file.h>
#include <libcli.h>
#include "l2tpns.h"
+#include "constants.h"
#include "util.h"
#include "cluster.h"
#include "tbf.h"
#ifdef BGP
#include "bgp.h"
#endif
+#ifdef LAC
+#include "l2tplac.h"
+#endif
extern tunnelt *tunnel;
+extern bundlet *bundle;
extern sessiont *session;
extern radiust *radius;
extern ippoolt *ip_address_pool;
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);
+#ifdef LAC
+static int cmd_setforward(struct cli_def *cli, char *command, char **argv, int argc);
+static int cmd_show_rmtlnsconf(struct cli_def *cli, char *command, char **argv, int argc);
+#endif
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);
/* 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");
cli_register_command(cli, c, "pool", cmd_show_pool, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show the IP address allocation pool");
cli_register_command(cli, c, "radius", cmd_show_radius, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show active radius queries");
cli_register_command(cli, c, "running-config", cmd_show_run, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Show the currently running configuration");
+#ifdef LAC
+ cli_register_command(cli, c, "remotelns-conf", cmd_show_rmtlnsconf, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Show a list of remote LNS configuration");
+#endif
cli_register_command(cli, c, "session", cmd_show_session, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of sessions or details for a single session");
cli_register_command(cli, c, "tbf", cmd_show_tbf, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all token bucket filters in use");
cli_register_command(cli, c, "throttle", cmd_show_throttle, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all throttled sessions and associated TBFs");
#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");
cli_register_command(cli, NULL, "set", cmd_set, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Set a configuration variable");
+#ifdef LAC
+ cli_register_command(cli, NULL, "setforward", cmd_setforward, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Set the Remote LNS Forward");
+#endif
+
c = cli_register_command(cli, NULL, "ip", NULL, PRIVILEGE_PRIVILEGED, MODE_CONFIG, NULL);
cli_register_command(cli, c, "access-list", cmd_ip_access_list, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Add named access-list");
}
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, 6);
+ clifd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
setsockopt(clifd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
{
int flags;
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)
+ {
+ 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)
{
int require_auth = 1;
struct sockaddr_in addr;
- int l = sizeof(addr);
+ socklen_t l = sizeof(addr);
if (fork_and_close()) return;
- if (getpeername(sockfd, (struct sockaddr *)&addr, &l) == 0)
+ if (getpeername(sockfd, (struct sockaddr *) &addr, &l) == 0)
{
require_auth = addr.sin_addr.s_addr != inet_addr("127.0.0.1");
LOG(require_auth ? 3 : 4, 0, 0, "Accepted connection to CLI from %s\n",
cli_print(cli, "\tCalling Num:\t%s", session[s].calling);
cli_print(cli, "\tCalled Num:\t%s", session[s].called);
cli_print(cli, "\tTunnel ID:\t%d", session[s].tunnel);
+ cli_print(cli, "\tPPP Phase:\t%s", ppp_phase(session[s].ppp.phase));
+ switch (session[s].ppp.phase)
+ {
+ case Establish:
+ cli_print(cli, "\t LCP state:\t%s", ppp_state(session[s].ppp.lcp));
+ break;
+
+ case Authenticate:
+ case Network:
+ cli_print(cli, "\t IPCP state:\t%s", ppp_state(session[s].ppp.ipcp));
+ cli_print(cli, "\t IPV6CP state:\t%s", ppp_state(session[s].ppp.ipv6cp));
+ cli_print(cli, "\t CCP state:\t%s", ppp_state(session[s].ppp.ccp));
+ }
cli_print(cli, "\tIP address:\t%s", fmtaddr(htonl(session[s].ip), 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);
+ 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);
}
// Show Summary
- cli_print(cli, "%5s %4s %-32s %-15s %s %s %s %s %10s %10s %10s %4s %-15s %s",
+#ifdef LAC
+ cli_print(cli, "%5s %7s %4s %-32s %-15s %s %s %s %s %10s %10s %10s %4s %10s %-18s %s",
+#else
+ cli_print(cli, "%5s %4s %-32s %-15s %s %s %s %s %10s %10s %10s %4s %10s %-15s %s",
+#endif
"SID",
+#ifdef LAC
+ "LkToSID",
+#endif
"TID",
"Username",
"IP",
"downloaded",
"uploaded",
"idle",
- "LAC",
+ "Rem.Time",
+#ifdef LAC
+ "LAC(L)/RLNS(R)/PPPOE(P)",
+#else
+ "LAC(L)/PPPOE(P)",
+#endif
"CLI");
for (i = 1; i < MAXSESSION; i++)
{
+ uint32_t rem_time;
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;
+#ifdef LAC
+ cli_print(cli, "%5d %7d %4d %-32s %-15s %s %s %s %s %10u %10lu %10lu %4u %10lu %3s%-20s %s",
+#else
+ cli_print(cli, "%5d %4d %-32s %-15s %s %s %s %s %10u %10lu %10lu %4u %10lu %3s%-20s %s",
+#endif
i,
+#ifdef LAC
+ session[i].forwardtosession,
+#endif
session[i].tunnel,
session[i].user[0] ? session[i].user : "*",
fmtaddr(htonl(session[i].ip), 0),
(session[i].snoop_ip && session[i].snoop_port) ? "Y" : "N",
(session[i].throttle_in || session[i].throttle_out) ? "Y" : "N",
(session[i].walled_garden) ? "Y" : "N",
- (session[i].flags & SF_IPV6CP_ACKED) ? "Y" : "N",
+ (session[i].ppp.ipv6cp == Opened) ? "Y" : "N",
abs(time_now - (unsigned long)session[i].opened),
(unsigned long)session[i].cout,
(unsigned long)session[i].cin,
abs(time_now - (session[i].last_packet ? session[i].last_packet : time_now)),
- fmtaddr(htonl(tunnel[ session[i].tunnel ].ip), 1),
+ (unsigned long)(rem_time),
+#ifdef LAC
+ (session[i].tunnel == TUNNEL_ID_PPPOE)?"(P)":(tunnel[session[i].tunnel].isremotelns?"(R)":"(L)"),
+#else
+ (session[i].tunnel == TUNNEL_ID_PPPOE)?"(P)":"(L)",
+#endif
+ (session[i].tunnel == TUNNEL_ID_PPPOE)?fmtMacAddr(session[i].src_hwaddr):fmtaddr(htonl(tunnel[session[i].tunnel].ip), 1),
session[i].calling[0] ? session[i].calling : "*");
}
return CLI_OK;
if (!show_all && (!tunnel[i].ip || tunnel[i].die)) continue;
for (x = 0; x < MAXSESSION; x++) if (session[x].tunnel == i && session[x].opened && !session[x].die) sessions++;
- cli_print(cli, "%4d %20s %20s %6s %6d",
+ cli_print(cli, "%4d %20s %20s %6s %6d %s",
i,
*tunnel[i].hostname ? tunnel[i].hostname : "(null)",
fmtaddr(htonl(tunnel[i].ip), 0),
states[tunnel[i].state],
- sessions);
+ sessions
+#ifdef LAC
+ ,(i == TUNNEL_ID_PPPOE)?"Tunnel pppoe":(tunnel[i].isremotelns?"Tunnel To Remote LNS":"Tunnel To LAC")
+#else
+ ,(i == TUNNEL_ID_PPPOE)?"Tunnel pppoe":"Tunnel To LAC"
+#endif
+ );
}
return CLI_OK;
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_md5);
- 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;
}
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");
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
cli_print(cli, "Dropping session %d", s);
cli_session_actions[s].action |= CLI_SESS_KILL;
}
+#ifdef LAC
+ else if (session[s].forwardtosession && session[s].opened && !session[s].die)
+ {
+ cli_print(cli, "Dropping session %d", s);
+ cli_session_actions[s].action |= CLI_SESS_KILL;
+ }
+#endif
else
{
cli_error(cli, "Session %d is not active.", s);
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;
if (!show) continue;
if (!(p = strchr(m, '\n')))
- p = m + strlen(p);
+ p = m + strlen(m);
cli_error(cli, "\r%s-%u-%u %.*s",
debug_levels[(int)ringbuffer->buffer[i].level],
int keepalive;
int hold;
- if (CLI_HELP_REQUESTED)
+ if (CLI_HELP_REQUESTED)
{
switch (argc)
{
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:
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;
}
}
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;
}
+ 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");
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;
- 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",
}
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)
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;
}
{
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);
return CLI_OK;
}
-// Convert a string in the form of abcd.ef12.3456 into char[6]
-void parsemac(char *string, char mac[6])
+static int cmd_shutdown(struct cli_def *cli, char *command, char **argv, int argc)
{
- 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);
+ 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;
+}
+
+#ifdef LAC
+
+static int cmd_setforward(struct cli_def *cli, char *command, char **argv, int argc)
+{
+ int ret;
+
+ if (CLI_HELP_REQUESTED)
+ {
+ switch (argc)
+ {
+ case 1:
+ return cli_arg_help(cli, 0,
+ "MASK", "Users mask to forward (ex: myISP@operator.com)", NULL);
+
+ case 2:
+ return cli_arg_help(cli, 0,
+ "IP", "IP of the remote LNS(ex: 64.64.64.64)", NULL);
+
+ case 3:
+ return cli_arg_help(cli, 0,
+ "PORT", "Port of the remote LNS (ex: 1701)", NULL);
+
+ case 4:
+ return cli_arg_help(cli, 0,
+ "SECRET", "l2tp secret of the remote LNS (ex: mysecretpsw)", NULL);
+
+ default:
+ return cli_arg_help(cli, argc > 1, NULL);
+ }
+ }
+
+ if (argc != 4)
+ {
+ cli_error(cli, "Specify variable and value");
+ return CLI_OK;
+ }
+
+ // lac_addremotelns(mask, IP_RemoteLNS, Port_RemoteLNS, SecretRemoteLNS)
+ ret = lac_addremotelns(argv[0], argv[1], argv[2], argv[3]);
+
+ if (ret)
+ {
+ cli_print(cli, "setforward %s %s %s %s", argv[0], argv[1], argv[2], argv[3]);
+ if (ret == 2)
+ cli_print(cli, "%s Updated, the tunnel must be dropped", argv[0]);
+ }
+ else
+ cli_error(cli, "ERROR setforward %s %s %s %s", argv[0], argv[1], argv[2], argv[3]);
+
+ return CLI_OK;
}
+
+static int cmd_show_rmtlnsconf(struct cli_def *cli, char *command, char **argv, int argc)
+{
+ confrlnsidt idrlns;
+ char strdisp[1024];
+
+ if (CLI_HELP_REQUESTED)
+ {
+ return cli_arg_help(cli, 0, "remotelns-conf", "Show a list of remote LNS configurations", NULL);
+ }
+
+ for (idrlns = 0; idrlns < MAXRLNSTUNNEL; idrlns++)
+ {
+ if (lac_cli_show_remotelns(idrlns, strdisp) != 0)
+ cli_print(cli, "%s", strdisp);
+ else
+ break;
+ }
+
+ return CLI_OK;
+}
+#endif
projects / l2tpns.git / blobdiff