// L2TPNS Command Line Interface
-// $Id: cli.c,v 1.5 2004/06/23 03:52:24 fred_nerk Exp $
// vim: sw=4 ts=8
+char const *cvs_name = "$Name: $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.6 2004/06/28 02:43:13 fred_nerk Exp $";
+
#include <stdio.h>
+#include <stdarg.h>
#include <sys/file.h>
#include <sys/stat.h>
#include <syslog.h>
#include <malloc.h>
#include <sched.h>
#include <string.h>
+#include <ctype.h>
#include <stdlib.h>
#include <time.h>
#include <arpa/inet.h>
#include <sys/types.h>
#include <signal.h>
#include <unistd.h>
+#include <dlfcn.h>
#include <libcli.h>
#include "l2tpns.h"
#include "util.h"
#include "cluster.h"
#include "tbf.h"
+#include "ll.h"
#ifdef BGP
#include "bgp.h"
#endif
extern tunnelidt *cli_tunnel_kill;
extern struct configt *config;
extern struct config_descriptt config_values[];
-extern char hostname[];
#ifdef RINGBUFFER
extern struct Tringbuffer *ringbuffer;
#endif
-char *rcs_id = "$Id: cli.c,v 1.5 2004/06/23 03:52:24 fred_nerk Exp $";
-
char *debug_levels[] = {
"CRIT",
"ERROR",
struct sockaddr_in addr;
cli = cli_init();
+ cli_set_hostname(cli, "l2tpns");
- c = cli_register_command(cli, NULL, "show", NULL, NULL);
- cli_register_command(cli, c, "banana", cmd_show_banana, "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");
#ifdef BGP
- cli_register_command(cli, c, "bgp", cmd_show_bgp, "Show BGP status");
+ cli_register_command(cli, c, "bgp", cmd_show_bgp, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show BGP status");
#endif /* BGP */
- cli_register_command(cli, c, "cluster", cmd_show_cluster, "Show cluster information");
- cli_register_command(cli, c, "ipcache", cmd_show_ipcache, "Show contents of the IP cache");
- cli_register_command(cli, c, "plugins", cmd_show_plugins, "List all installed plugins");
- cli_register_command(cli, c, "pool", cmd_show_pool, "Show the IP address allocation pool");
- cli_register_command(cli, c, "radius", cmd_show_radius, "Show active radius queries");
- cli_register_command(cli, c, "running-config", cmd_show_run, "Show the currently running configuration");
- cli_register_command(cli, c, "session", cmd_show_session, "Show a list of sessions or details for a single session");
- cli_register_command(cli, c, "tbf", cmd_show_tbf, "List all token bucket filters in use");
- cli_register_command(cli, c, "throttle", cmd_show_throttle, "List all throttled sessions and associated TBFs");
- cli_register_command(cli, c, "tunnels", cmd_show_tunnels, "Show a list of tunnels or details for a single tunnel");
- cli_register_command(cli, c, "users", cmd_show_users, "Show a list of all connected users or details of selected user");
- cli_register_command(cli, c, "version", cmd_show_version, "Show currently running software version");
-
- c2 = cli_register_command(cli, c, "histogram", NULL, NULL);
- cli_register_command(cli, c2, "idle", cmd_show_hist_idle, "Show histogram of session idle times");
- cli_register_command(cli, c2, "open", cmd_show_hist_open, "Show histogram of session durations");
+ cli_register_command(cli, c, "cluster", cmd_show_cluster, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show cluster information");
+ cli_register_command(cli, c, "ipcache", cmd_show_ipcache, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show contents of the IP cache");
+ cli_register_command(cli, c, "plugins", cmd_show_plugins, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "List all installed plugins");
+ 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_UNPRIVILEGED, MODE_EXEC, "Show the currently running configuration");
+ 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");
+ cli_register_command(cli, c, "tunnels", cmd_show_tunnels, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of tunnels or details for a single tunnel");
+ cli_register_command(cli, c, "users", cmd_show_users, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show a list of all connected users or details of selected user");
+ cli_register_command(cli, c, "version", cmd_show_version, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show currently running software version");
+
+ c2 = cli_register_command(cli, c, "histogram", NULL, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, NULL);
+ cli_register_command(cli, c2, "idle", cmd_show_hist_idle, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show histogram of session idle times");
+ cli_register_command(cli, c2, "open", cmd_show_hist_open, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show histogram of session durations");
#ifdef STATISTICS
- cli_register_command(cli, c, "counters", cmd_show_counters, "Display all the internal counters and running totals");
+ cli_register_command(cli, c, "counters", cmd_show_counters, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Display all the internal counters and running totals");
- c = cli_register_command(cli, NULL, "clear", NULL, NULL);
- cli_register_command(cli, c, "counters", cmd_clear_counters, "Clear internal counters");
+ c = cli_register_command(cli, NULL, "clear", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+ cli_register_command(cli, c, "counters", cmd_clear_counters, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Clear internal counters");
#endif
- cli_register_command(cli, NULL, "uptime", cmd_uptime, "Show uptime and bandwidth utilisation");
+ cli_register_command(cli, NULL, "uptime", cmd_uptime, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show uptime and bandwidth utilisation");
- c = cli_register_command(cli, NULL, "write", NULL, NULL);
- cli_register_command(cli, c, "memory", cmd_write_memory, "Save the running config to flash");
- cli_register_command(cli, c, "terminal", cmd_show_run, "Show the running config");
+ 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, c, "terminal", cmd_show_run, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Show the running config");
- cli_register_command(cli, NULL, "snoop", cmd_snoop, "Temporarily enable interception for a user");
- cli_register_command(cli, NULL, "throttle", cmd_throttle, "Temporarily enable throttling for a user");
- cli_register_command(cli, NULL, "debug", cmd_debug, "Set the level of logging that is shown on the console");
+ cli_register_command(cli, NULL, "snoop", cmd_snoop, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Temporarily enable interception for a user");
+ cli_register_command(cli, NULL, "throttle", cmd_throttle, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Temporarily enable throttling for a user");
+ cli_register_command(cli, NULL, "debug", cmd_debug, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Set the level of logging that is shown on the console");
- c = cli_register_command(cli, NULL, "suspend", NULL, NULL);
- cli_register_command(cli, c, "bgp", cmd_suspend_bgp, "Withdraw routes from BGP peer");
+ c = cli_register_command(cli, NULL, "suspend", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+ cli_register_command(cli, c, "bgp", cmd_suspend_bgp, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Withdraw routes from BGP peer");
- c = cli_register_command(cli, NULL, "no", NULL, NULL);
- cli_register_command(cli, c, "snoop", cmd_no_snoop, "Temporarily disable interception for a user");
- cli_register_command(cli, c, "throttle", cmd_no_throttle, "Temporarily disable throttling for a user");
- cli_register_command(cli, c, "debug", cmd_no_debug, "Turn off logging of a certain level of debugging");
- c2 = cli_register_command(cli, c, "suspend", NULL, NULL);
- cli_register_command(cli, c2, "bgp", cmd_no_suspend_bgp, "Advertise routes to BGP peer");
+ c = cli_register_command(cli, NULL, "no", NULL, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, NULL);
+ cli_register_command(cli, c, "snoop", cmd_no_snoop, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Temporarily disable interception for a user");
+ cli_register_command(cli, c, "throttle", cmd_no_throttle, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Temporarily disable throttling for a user");
+ cli_register_command(cli, c, "debug", cmd_no_debug, PRIVILEGE_UNPRIVILEGED, MODE_EXEC, "Turn off logging of a certain level of debugging");
+ c2 = cli_register_command(cli, c, "suspend", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+ cli_register_command(cli, c2, "bgp", cmd_no_suspend_bgp, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Advertise routes to BGP peer");
- c = cli_register_command(cli, NULL, "drop", NULL, NULL);
- cli_register_command(cli, c, "user", cmd_drop_user, "Disconnect a user");
- cli_register_command(cli, c, "tunnel", cmd_drop_tunnel, "Disconnect a tunnel and all sessions on that tunnel");
- cli_register_command(cli, c, "session", cmd_drop_session, "Disconnect a session");
+ c = cli_register_command(cli, NULL, "drop", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+ cli_register_command(cli, c, "user", cmd_drop_user, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Disconnect a user");
+ cli_register_command(cli, c, "tunnel", cmd_drop_tunnel, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Disconnect a tunnel and all sessions on that tunnel");
+ cli_register_command(cli, c, "session", cmd_drop_session, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Disconnect a session");
- c = cli_register_command(cli, NULL, "restart", NULL, NULL);
- cli_register_command(cli, c, "bgp", cmd_restart_bgp, "Restart BGP");
+ c = cli_register_command(cli, NULL, "restart", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+ cli_register_command(cli, c, "bgp", cmd_restart_bgp, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Restart BGP");
- c = cli_register_command(cli, NULL, "load", NULL, NULL);
- cli_register_command(cli, c, "plugin", cmd_load_plugin, "Load a plugin");
+ c = cli_register_command(cli, NULL, "load", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+ cli_register_command(cli, c, "plugin", cmd_load_plugin, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Load a plugin");
- c = cli_register_command(cli, NULL, "remove", NULL, NULL);
- cli_register_command(cli, c, "plugin", cmd_remove_plugin, "Remove a plugin");
+ c = cli_register_command(cli, NULL, "remove", NULL, PRIVILEGE_PRIVILEGED, MODE_EXEC, NULL);
+ cli_register_command(cli, c, "plugin", cmd_remove_plugin, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Remove a plugin");
- cli_register_command(cli, NULL, "set", cmd_set, "Set a configuration variable");
+ cli_register_command(cli, NULL, "set", cmd_set, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Set a configuration variable");
// Enable regular processing
cli_regular(cli, regular_stuff);
if (!*buf) continue;
if (!(p = strchr((char *)buf, ':'))) continue;
*p++ = 0;
+ if (!strcmp(buf, "enable"))
+ {
+ cli_allow_enable(cli, p);
+ log(3, 0, 0, 0, "Setting enable password\n");
+ }
+ else
+ {
cli_allow_user(cli, buf, p);
log(3, 0, 0, 0, "Allowing user %s to connect to the CLI\n", buf);
}
+ }
fclose(f);
}
close(bgp_peers[i].sock);
#endif /* BGP */
- log(3, 0, 0, 0, "Accepted connection to CLI\n");
+ {
+ int require_auth = 1;
+ struct sockaddr_in addr;
+ int l = sizeof(addr);
+ if (getpeername(sockfd, (struct sockaddr *)&addr, &l) == 0)
+ {
+ log(3, 0, 0, 0, "Accepted connection to CLI from %s\n", inet_toa(addr.sin_addr.s_addr));
+ require_auth = addr.sin_addr.s_addr != inet_addr("127.0.0.1");
+ }
+ else
+ log(0, 0, 0, 0, "getpeername() failed on cli socket. Requiring authentication: %s\n", strerror(errno));
+
+ if (require_auth)
+ {
+ log(3, 0, 0, 0, "CLI is remote, requiring authentication\n");
+ if (!cli->users) /* paranoia */
+ {
+ log(0, 0, 0, 0, "No users for remote authentication! Exiting CLI\n");
+ exit(0);
+ }
+ }
+ else
+ {
+ /* no username/pass required */
+ cli->users = 0;
+ }
+ }
debug_session = 0;
debug_tunnel = 0;
{
log(3, 0, 0, 0, "Reading configuration file\n");
cli_print_callback(cli, cli_print_log);
- cli_file(cli, fh);
+ cli_file(cli, fh, PRIVILEGE_PRIVILEGED);
cli_print_callback(cli, NULL);
}
+int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...)
+{
+ va_list ap;
+ char *desc;
+ char buf[16];
+ char *p;
+
+ va_start(ap, entry);
+ while (entry)
+ {
+ /* allow one %d */
+ if ((p = strchr(entry, '%')) && !strchr(p+1, '%') && p[1] == 'd')
+ {
+ int v = va_arg(ap, int);
+ snprintf(buf, sizeof(buf), entry, v);
+ p = buf;
+ }
+ else
+ p = entry;
+
+ desc = va_arg(ap, char *);
+ if (desc && *desc)
+ cli_print(cli, " %-20s %s", p, desc);
+ else
+ cli_print(cli, " %s", p);
+
+ entry = desc ? va_arg(ap, char *) : 0;
+ }
+
+ va_end(ap);
+ if (cr_ok)
+ cli_print(cli, " <cr>");
+
+ return CLI_OK;
+}
+
int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc)
{
int i;
time_t time_now;
+ if (CLI_HELP_REQUESTED)
+ return cli_arg_help(cli, 1,
+ "<1-%d>", MAXSESSION-1, "Show specific session by id",
+ NULL);
+
time(&time_now);
if (argc > 0)
{
{
unsigned int s;
s = atoi(argv[i]);
- if (!s || s > MAXSESSION)
+ if (s <= 0 || s >= MAXSESSION)
{
cli_print(cli, "Invalid session id \"%s\"", argv[i]);
continue;
"Opening",
};
+ if (CLI_HELP_REQUESTED)
+ {
+ if (argc > 1)
+ return cli_arg_help(cli, 1,
+ "<1-%d>", MAXTUNNEL-1, "Show specific tunnel by id",
+ NULL);
+
+ return cli_arg_help(cli, 1,
+ "all", "Show all tunnels, including unused",
+ "<1-%d>", MAXTUNNEL-1, "Show specific tunnel by id",
+ NULL);
+ }
+
time(&time_now);
if (argc > 0)
{
char s[65535] = {0};
unsigned int t;
t = atoi(argv[i]);
- if (!t || t > MAXTUNNEL)
+ if (t <= 0 || t >= MAXTUNNEL)
{
cli_print(cli, "Invalid tunnel id \"%s\"", argv[i]);
continue;
char *sargv[32];
int sargc = 0;
int i;
+
+ if (CLI_HELP_REQUESTED)
+ return cli_arg_help(cli, 1,
+ "USER", "Show details for specific username",
+ NULL);
+
for (i = 0; i < MAXSESSION; i++)
{
if (!session[i].opened) continue;
int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc)
{
+ if (CLI_HELP_REQUESTED)
+ return CLI_HELP_NO_ARGS;
+
cli_print(cli, "%-10s %-8s %-10s %-8s", "Ethernet", "Bytes", "Packets", "Errors");
cli_print(cli, "%-10s %8lu %8lu %8lu", "RX",
GET_STAT(tap_rx_bytes),
cli_print(cli, "%-30s%lu", "recv_forward", GET_STAT(recv_forward));
-#ifdef STAT_CALLS
+#ifdef STATISTICS
cli_print(cli, "\n%-30s%-10s", "Counter", "Value");
cli_print(cli, "-----------------------------------------");
cli_print(cli, "%-30s%lu", "call_processtap", GET_STAT(call_processtap));
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++;
+
cli_print(cli, "L2TPNS %s", VERSION);
- cli_print(cli, "ID: %s", rcs_id);
+ 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", 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;
}
int used = 0, free = 0, show_all = 0;
time_t time_now;
+ if (!config->cluster_iam_master)
+ {
+ cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));
+ return CLI_OK;
+ }
+
+ if (CLI_HELP_REQUESTED)
+ {
+ if (argc > 1)
+ return cli_arg_help(cli, 1, NULL);
+
+ return cli_arg_help(cli, 1,
+ "all", "Show all pool addresses, including unused",
+ NULL);
+ }
+
if (argc > 0 && strcmp(argv[0], "all") == 0)
show_all = 1;
int cmd_write_memory(struct cli_def *cli, char *command, char **argv, int argc)
{
+ if (CLI_HELP_REQUESTED)
+ return CLI_HELP_NO_ARGS;
+
if ((save_config_fh = fopen(config->config_file, "w")))
{
cli_print(cli, "Writing configuration");
{
int i;
+ if (CLI_HELP_REQUESTED)
+ return CLI_HELP_NO_ARGS;
+
cli_print(cli, "# Current configuration:");
for (i = 0; config_values[i].key; i++)
int i, free = 0, used = 0, show_all = 0;
time_t time_now;
+ if (CLI_HELP_REQUESTED)
+ {
+ if (argc > 1)
+ return cli_arg_help(cli, 1, NULL);
+
+ return cli_arg_help(cli, 1,
+ "all", "Show all RADIUS sessions, including unused",
+ NULL);
+ }
+
cli_print(cli, "%6s%5s%6s%9s%9s%4s", "Radius", "Sock", "State", "Session", "Retry", "Try");
time(&time_now);
int cmd_show_plugins(struct cli_def *cli, char *command, char **argv, int argc)
{
int i;
+
+ if (CLI_HELP_REQUESTED)
+ return CLI_HELP_NO_ARGS;
+
cli_print(cli, "Plugins currently loaded:");
for (i = 0; i < MAXPLUGINS; i++)
{
int cmd_show_throttle(struct cli_def *cli, char *command, char **argv, int argc)
{
int i;
+
+ if (CLI_HELP_REQUESTED)
+ return CLI_HELP_NO_ARGS;
+
cli_print(cli, "Token bucket filters:");
cli_print(cli, "%-6s %8s %-4s", "ID", "Handle", "Used");
for (i = 0; i < MAXSESSION; i++)
int cmd_show_banana(struct cli_def *cli, char *command, char **argv, int argc)
{
+ if (CLI_HELP_REQUESTED)
+ return CLI_HELP_NO_ARGS;
+
cli_print(cli, " _\n"
"//\\\n"
"V \\\n"
int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, int argc)
{
+ if (CLI_HELP_REQUESTED)
+ return CLI_HELP_NO_ARGS;
+
cli_print(cli, "Counters cleared");
SET_STAT(last_reset, time(NULL));
return CLI_OK;
int i;
sessionidt s;
+ if (CLI_HELP_REQUESTED)
+ return cli_arg_help(cli, argc > 1,
+ "USER", "Username of session to drop", NULL);
+
if (!config->cluster_iam_master)
{
cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));
cli_print(cli, "Specify a user to drop");
return CLI_OK;
}
- for (i = 0; i < argc; i++)
- {
- if (strchr(argv[i], '?'))
- {
- cli_print(cli, "username ...");
- return CLI_OK;
- }
- }
for (i = 0; i < argc; i++)
{
int i;
tunnelidt tid;
+ if (CLI_HELP_REQUESTED)
+ return cli_arg_help(cli, argc > 1,
+ "<1-%d>", MAXTUNNEL-1, "Tunnel id to drop", NULL);
+
if (!config->cluster_iam_master)
{
cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));
cli_print(cli, "Specify a tunnel to drop");
return CLI_OK;
}
- for (i = 0; i < argc; i++)
- {
- if (strchr(argv[i], '?'))
- {
- cli_print(cli, "tunnel_id ...");
- return CLI_OK;
- }
- }
for (i = 0; i < argc; i++)
{
int x;
- if ((tid = atol(argv[i])) <= 0 || (tid > MAXTUNNEL))
+ if ((tid = atol(argv[i])) <= 0 || (tid >= MAXTUNNEL))
{
- cli_print(cli, "Invalid tunnel ID (%d - %d)", 0, MAXTUNNEL);
+ cli_print(cli, "Invalid tunnel ID (1-%d)", MAXTUNNEL-1);
continue;
}
int i;
sessionidt s;
+ if (CLI_HELP_REQUESTED)
+ return cli_arg_help(cli, argc > 1,
+ "<1-%d>", MAXSESSION-1, "Session id to drop", NULL);
+
if (!config->cluster_iam_master)
{
cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));
cli_print(cli, "Specify a session id to drop");
return CLI_OK;
}
- for (i = 0; i < argc; i++)
- {
- if (strchr(argv[i], '?'))
- {
- cli_print(cli, "session_id ...");
- return CLI_OK;
- }
- }
for (i = 0; i < argc; i++)
{
if ((s = atol(argv[i])) <= 0 || (s > MAXSESSION))
{
- cli_print(cli, "Invalid session ID (%d - %d)", 0, MAXSESSION);
+ cli_print(cli, "Invalid session ID (1-%d)", MAXSESSION-1);
continue;
}
int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc)
{
- int i;
ipt ip;
u16 port;
sessionidt s;
+ if (CLI_HELP_REQUESTED)
+ {
+ switch (argc)
+ {
+ case 1:
+ return cli_arg_help(cli, 0,
+ "USER", "Username of session to snoop", NULL);
+
+ case 2:
+ return cli_arg_help(cli, 0,
+ "A.B.C.D", "IP address of snoop destination", NULL);
+
+ case 3:
+ return cli_arg_help(cli, 0,
+ "N", "Port of snoop destination", NULL);
+
+ case 4:
+ if (!argv[3][1])
+ return cli_arg_help(cli, 1, NULL);
+
+ default:
+ return CLI_OK;
+ }
+ }
+
if (!config->cluster_iam_master)
{
- cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));
+ cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));
return CLI_OK;
}
return CLI_OK;
}
- for (i = 0; i < argc; i++)
- {
- if (strchr(argv[i], '?'))
- {
- cli_print(cli, "username ip port");
- return CLI_OK;
- }
- }
-
-
if (!(s = sessionbyuser(argv[0])))
{
cli_print(cli, "User %s is not connected", argv[0]);
int i;
sessionidt s;
+ if (CLI_HELP_REQUESTED)
+ return cli_arg_help(cli, argc > 1,
+ "USER", "Username of session to un-snoop", NULL);
+
if (!config->cluster_iam_master)
{
cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));
cli_print(cli, "Specify a user");
return CLI_OK;
}
- for (i = 0; i < argc; i++)
- {
- if (strchr(argv[i], '?'))
- {
- cli_print(cli, "username ...");
- return CLI_OK;
- }
- }
for (i = 0; i < argc; i++)
{
int i;
sessionidt s;
+ if (CLI_HELP_REQUESTED)
+ return cli_arg_help(cli, argc > 1,
+ "USER", "Username of session to throttle", NULL);
+
if (!config->cluster_iam_master)
{
cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));
cli_print(cli, "Specify a user");
return CLI_OK;
}
- for (i = 0; i < argc; i++)
- {
- if (strchr(argv[i], '?'))
- {
- cli_print(cli, "username ...");
- return CLI_OK;
- }
- }
for (i = 0; i < argc; i++)
{
int i;
sessionidt s;
+ if (CLI_HELP_REQUESTED)
+ return cli_arg_help(cli, argc > 1,
+ "USER", "Username of session to un-throttle", NULL);
+
if (!config->cluster_iam_master)
{
cli_print(cli, "Can't do this on a slave. Do it on %s", inet_toa(config->cluster_master_address));
cli_print(cli, "Specify a user");
return CLI_OK;
}
- for (i = 0; i < argc; i++)
- {
- if (strchr(argv[i], '?'))
- {
- cli_print(cli, "username ...");
- return CLI_OK;
- }
- }
for (i = 0; i < argc; i++)
{
}
throttle_session(s, 0);
- cli_print(cli, "unthrottling user %s", argv[i]);
+ cli_print(cli, "Unthrottling user %s", argv[i]);
}
+
return CLI_OK;
}
{
int i;
+ if (CLI_HELP_REQUESTED)
+ return cli_arg_help(cli, 1,
+ "all", "Enable debugging for all except \"data\"",
+ "critical", "", // FIXME: add descriptions
+ "error", "",
+ "warning", "",
+ "info", "",
+ "calls", "",
+ "data", "",
+ NULL);
+
if (!argc)
{
- cli_print(cli, "Currently debugging: ");
- if (debug_flags.critical) cli_print(cli, "critical ");
- if (debug_flags.error) cli_print(cli, "error ");
- if (debug_flags.warning) cli_print(cli, "warning ");
- if (debug_flags.info) cli_print(cli, "info ");
- if (debug_flags.calls) cli_print(cli, "calls ");
- if (debug_flags.data) cli_print(cli, "data ");
- cli_print(cli, "");
- return CLI_OK;
- }
-
- for (i = 0; i < argc; i++)
+ char *p = (char *) &debug_flags;
+ for (i = 0; i < sizeof(debug_flags); i++)
{
- if (*argv[i] == '?')
+ if (p[i])
{
- cli_print(cli, "Possible debugging states are:");
- cli_print(cli, " critical");
- cli_print(cli, " error");
- cli_print(cli, " warning");
- cli_print(cli, " info");
- cli_print(cli, " calls");
- cli_print(cli, " data");
+ cli_print(cli, "Currently debugging:%s%s%s%s%s%s",
+ (debug_flags.critical) ? " critical" : "",
+ (debug_flags.error) ? " error" : "",
+ (debug_flags.warning) ? " warning" : "",
+ (debug_flags.info) ? " info" : "",
+ (debug_flags.calls) ? " calls" : "",
+ (debug_flags.data) ? " data" : "");
+
return CLI_OK;
}
}
+ cli_print(cli, "Debugging off");
+ return CLI_OK;
+ }
+
for (i = 0; i < argc; i++)
{
- if (strcasecmp(argv[i], "critical") == 0) debug_flags.critical = 1;
- if (strcasecmp(argv[i], "error") == 0) debug_flags.error = 1;
- if (strcasecmp(argv[i], "warning") == 0) debug_flags.warning = 1;
- if (strcasecmp(argv[i], "info") == 0) debug_flags.info = 1;
- if (strcasecmp(argv[i], "calls") == 0) debug_flags.calls = 1;
- if (strcasecmp(argv[i], "data") == 0) debug_flags.data = 1;
- if (strcasecmp(argv[i], "all") == 0)
+ int len = strlen(argv[i]);
+
+ if (argv[i][0] == 'c' && len < 2)
+ len = 2; /* distinguish [cr]itical from [ca]lls */
+
+ if (!strncasecmp(argv[i], "critical", len)) { debug_flags.critical = 1; continue; }
+ if (!strncasecmp(argv[i], "error", len)) { debug_flags.error = 1; continue; }
+ if (!strncasecmp(argv[i], "warning", len)) { debug_flags.warning = 1; continue; }
+ if (!strncasecmp(argv[i], "info", len)) { debug_flags.info = 1; continue; }
+ if (!strncasecmp(argv[i], "calls", len)) { debug_flags.calls = 1; continue; }
+ if (!strncasecmp(argv[i], "data", len)) { debug_flags.data = 1; continue; }
+ if (!strncasecmp(argv[i], "all", len))
{
memset(&debug_flags, 1, sizeof(debug_flags));
debug_flags.data = 0;
+ continue;
}
+
+ cli_print(cli, "Invalid debugging flag \"%s\"", argv[i]);
}
return CLI_OK;
{
int i;
+ if (CLI_HELP_REQUESTED)
+ return cli_arg_help(cli, 1,
+ "all", "Disable all debugging",
+ "critical", "", // FIXME: add descriptions
+ "error", "",
+ "warning", "",
+ "info", "",
+ "calls", "",
+ "data", "",
+ NULL);
+
+ if (!argc)
+ {
+ memset(&debug_flags, 0, sizeof(debug_flags));
+ return CLI_OK;
+ }
+
for (i = 0; i < argc; i++)
{
- if (strcasecmp(argv[i], "critical") == 0) debug_flags.critical = 0;
- if (strcasecmp(argv[i], "error") == 0) debug_flags.error = 0;
- if (strcasecmp(argv[i], "warning") == 0) debug_flags.warning = 0;
- if (strcasecmp(argv[i], "info") == 0) debug_flags.info = 0;
- if (strcasecmp(argv[i], "calls") == 0) debug_flags.calls = 0;
- if (strcasecmp(argv[i], "data") == 0) debug_flags.data = 0;
- if (strcasecmp(argv[i], "all") == 0) memset(&debug_flags, 0, sizeof(debug_flags));
+ int len = strlen(argv[i]);
+
+ if (argv[i][0] == 'c' && len < 2)
+ len = 2; /* distinguish [cr]itical from [ca]lls */
+
+ if (!strncasecmp(argv[i], "critical", len)) { debug_flags.critical = 0; continue; }
+ if (!strncasecmp(argv[i], "error", len)) { debug_flags.error = 0; continue; }
+ if (!strncasecmp(argv[i], "warning", len)) { debug_flags.warning = 0; continue; }
+ if (!strncasecmp(argv[i], "info", len)) { debug_flags.info = 0; continue; }
+ if (!strncasecmp(argv[i], "calls", len)) { debug_flags.calls = 0; continue; }
+ if (!strncasecmp(argv[i], "data", len)) { debug_flags.data = 0; continue; }
+ if (!strncasecmp(argv[i], "all", len))
+ {
+ memset(&debug_flags, 0, sizeof(debug_flags));
+ continue;
+ }
+
+ cli_print(cli, "Invalid debugging flag \"%s\"", argv[i]);
}
return CLI_OK;
int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int argc)
{
int i, firstfree = 0;
+
+ if (CLI_HELP_REQUESTED)
+ return cli_arg_help(cli, argc > 1,
+ "PLUGIN", "Name of plugin to load", NULL);
+
if (argc != 1)
{
cli_print(cli, "Specify a plugin to load");
{
int i;
+ if (CLI_HELP_REQUESTED)
+ return cli_arg_help(cli, argc > 1,
+ "PLUGIN", "Name of plugin to unload", NULL);
+
if (argc != 1)
{
cli_print(cli, "Specify a plugin to remove");
return CLI_OK;
}
-char *duration(time_t seconds)
+char *duration(time_t secs)
{
static char *buf = NULL;
+ int p = 0;
+
if (!buf) buf = calloc(64, 1);
- if (seconds > 86400)
- sprintf(buf, "%d days", (int)(seconds / 86400.0));
- else if (seconds > 60)
- sprintf(buf, "%02d:%02lu", (int)(seconds / 3600.0), seconds % 60);
+ if (secs >= 86400)
+ {
+ int days = secs / 86400;
+ p = sprintf(buf, "%d day%s, ", days, days > 1 ? "s" : "");
+ secs %= 86400;
+ }
+
+ if (secs >= 3600)
+ {
+ int mins = secs / 60;
+ int hrs = mins / 60;
+
+ mins %= 60;
+ sprintf(buf + p, "%d:%02d", hrs, mins);
+ }
+ else if (secs >= 60)
+ {
+ int mins = secs / 60;
+ sprintf(buf + p, "%d min%s", mins, mins > 1 ? "s" : "");
+ }
else
- sprintf(buf, "%lu sec", seconds);
+ sprintf(buf, "%ld sec%s", secs, secs > 1 ? "s" : "");
+
return buf;
}
int i, num_sessions = 0;
time_t time_now;
+ if (CLI_HELP_REQUESTED)
+ return CLI_HELP_NO_ARGS;
+
fh = fopen("/proc/loadavg", "r");
fgets(buf, 100, fh);
fclose(fh);
cli_print(cli, "%s up %s, %d users, load average: %s, %s, %s",
buf,
- duration(abs(time_now - config->start_time)),
+ duration(time_now - config->start_time),
num_sessions,
loads[0], loads[1], loads[2]
);
{
int i;
+ if (CLI_HELP_REQUESTED)
+ {
+ switch (argc)
+ {
+ case 1:
+ {
+ int len = strlen(argv[0])-1;
+ for (i = 0; config_values[i].key; i++)
+ if (!len || !strncmp(argv[0], config_values[i].key, len))
+ cli_print(cli, " %s", config_values[i].key);
+ }
+
+ return CLI_OK;
+
+ case 2:
+ return cli_arg_help(cli, 0,
+ "VALUE", "Value for variable", NULL);
+
+ case 3:
+ if (!argv[2][1])
+ return cli_arg_help(cli, 1, NULL);
+
+ default:
+ return CLI_OK;
+ }
+ }
+
if (argc != 2)
{
- cli_print(cli, "Usage: set <variable> <value>");
+ cli_print(cli, "Specify variable and value");
return CLI_OK;
}
// L2TP Network Server
// Adrian Kennard 2002
-// (c) Copyrigth 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd)
+// Copyright (c) 2003, 2004 Optus Internet Engineering
+// Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
// vim: sw=8 ts=8
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.9 2004/06/28 02:43:13 fred_nerk Exp $";
+
#include <arpa/inet.h>
#include <assert.h>
#include <errno.h>
CONFIG("icmp_rate", icmp_rate, INT),
CONFIG("cluster_address", cluster_address, IP),
CONFIG("cluster_interface", cluster_interface, STRING),
+ CONFIG("cluster_hb_interval", cluster_hb_interval, INT),
+ CONFIG("cluster_hb_timeout", cluster_hb_timeout, INT),
#ifdef BGP
CONFIG("as_number", as_number, SHORT),
CONFIG("bgp_peer1", bgp_peer[0], STRING),
if (!mask) mask = 0xffffffff;
- ip = ip & mask; // Force the ip to be the first one in the route.
+ ip &= mask; // Force the ip to be the first one in the route.
memset(&r, 0, sizeof(r));
r.rt_dev = config->tapdevice;
r.rt_flags |= RTF_GATEWAY;
else if (mask == 0xffffffff)
r.rt_flags |= RTF_HOST;
- if (ioctl(ifrfd, add ? SIOCADDRT : SIOCDELRT, (void *) &r) < 0)
- log(0, 0, 0, 0, "routeset() error in ioctl: %s\n", strerror(errno));
log(1, ip, 0, 0, "Route %s %u.%u.%u.%u/%u.%u.%u.%u %u.%u.%u.%u\n",
add ? "add" : "del",
mask >> 24, mask >> 16 & 0xff, mask >> 8 & 0xff, mask & 0xff,
gw >> 24, gw >> 16 & 0xff, gw >> 8 & 0xff, gw & 0xff);
+ if (ioctl(ifrfd, add ? SIOCADDRT : SIOCDELRT, (void *) &r) < 0)
+ log(0, 0, 0, 0, "routeset() error in ioctl: %s\n", strerror(errno));
+
#ifdef BGP
if (add)
bgp_add_route(htonl(ip), htonl(mask));
sessionidt sessionbyip(ipt ip)
{
int s = lookup_ipmap(ip);
+ CSTAT(call_sessionbyip);
-#ifdef STAT_CALLS
- STAT(call_sessionbyip);
-#endif
if (s > 0 && s < MAXSESSION && session[s].tunnel)
return s;
return 0;
int i, j, k, l;
int count = 0;
+ if (CLI_HELP_REQUESTED)
+ return CLI_HELP_NO_ARGS;
+
cli_print(cli, "%7s %s", "Sess#", "IP Address");
for (i = 0; i < 256; ++i) {
sessionidt sessionbyuser(char *username)
{
int s;
-#ifdef STAT_CALLS
- STAT(call_sessionbyuser);
-#endif
+ CSTAT(call_sessionbyuser);
+
for (s = 1; s < MAXSESSION ; ++s) {
if (session[s].walled_garden)
continue; // Skip walled garden users.
ipt ip;
sessionidt s;
-#ifdef STAT_CALLS
- STAT(call_processarp);
-#endif
+ CSTAT(call_processarp);
STAT(arp_recv);
+
if (len != 46)
{
log(0, 0, 0, 0, "Unexpected length ARP %d bytes\n", len);
{
struct sockaddr_in addr;
-#ifdef STAT_CALLS
- STAT(call_tunnelsend);
-#endif
+ CSTAT(call_tunnelsend);
+
if (!t)
{
static int backtrace_count = 0;
int size = len;
u8 b[MAXETHER + 20];
-#ifdef STAT_CALLS
- STAT(call_processipout);
-#endif
+
+ CSTAT(call_processipout);
+
if (len < MIN_IP_SIZE)
{
log(1, 0, 0, 0, "Short IP, %d bytes\n", len);
t = session[s].tunnel;
sp = &session[s];
- log(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
-
- // Snooping this session, send it to ASIO
+ // Snooping this session, send it to intercept box
if (sp->snoop_ip && sp->snoop_port)
snoop_send_packet(buf, len, sp->snoop_ip, sp->snoop_port);
+ log(5, session[s].ip, s, t, "Ethernet -> Tunnel (%d bytes)\n", len);
+
// Add on L2TP header
{
u8 *p = makeppp(b, sizeof(b), buf, len, t, s, PPPIP);
int dead = session[s].die;
int walled_garden = session[s].walled_garden;
-#ifdef STAT_CALLS
- STAT(call_sessionshutdown);
-#endif
+
+ CSTAT(call_sessionshutdown);
+
if (!session[s].tunnel)
{
log(3, session[s].ip, s, session[s].tunnel, "Called sessionshutdown on a session with no tunnel.\n");
u8 buf[MAXCONTROL];
u16 r = session[s].radius;
u8 *q;
-#ifdef STAT_CALLS
- STAT(call_sendipcp);
-#endif
+
+ CSTAT(call_sendipcp);
+
if (!r)
r = radiusnew(s);
if (radius[r].state != RADIUSIPCP)
// kill a session now
void sessionkill(sessionidt s, char *reason)
{
-#ifdef STAT_CALLS
- STAT(call_sessionkill);
-#endif
+
+ CSTAT(call_sessionkill);
+
sessionshutdown(s, reason); // close radius/routes, etc.
if (session[s].radius)
radiusclear(session[s].radius, 0); // cant send clean accounting data, session is killed
{
sessionidt s;
controlt *c;
-#ifdef STAT_CALLS
- STAT(call_tunnelkill);
-#endif
+
+ CSTAT(call_tunnelkill);
tunnel[t].state = TUNNELDIE;
void tunnelshutdown(tunnelidt t, char *reason)
{
sessionidt s;
-#ifdef STAT_CALLS
- STAT(call_tunnelshutdown);
-#endif
+
+ CSTAT(call_tunnelshutdown);
+
if (!tunnel[t].last || !tunnel[t].far || tunnel[t].state == TUNNELFREE)
{
// never set up, can immediately kill
u16 l = len, t = 0, s = 0, ns = 0, nr = 0;
u8 *p = buf + 2;
-#ifdef STAT_CALLS
- STAT(call_processudp);
-#endif
+
+ CSTAT(call_processudp);
+
udp_rx += len;
udp_rx_pkt++;
log_hex(5, "UDP Data", buf, len);
log_hex(5, "Receive TAP Data", buf, len);
STAT(tap_rx_packets);
INC_STAT(tap_rx_bytes, len);
-#ifdef STAT_CALLS
- STAT(call_processtap);
-#endif
+
+ CSTAT(call_processtap);
+
eth_rx_pkt++;
eth_rx += len;
if (len < 22)
continue;
if (radius[r].retry)
{
- if (radius[r].retry <= config->current_time)
+ if (radius[r].retry <= TIME)
radiusretry(r);
} else
radius[r].retry = backoff(radius[r].try+1); // Is this really needed? --mo
for (t = 1; t < config->cluster_highest_tunnelid; t++)
{
// check for expired tunnels
- if (tunnel[t].die && tunnel[t].die <= config->current_time)
+ if (tunnel[t].die && tunnel[t].die <= TIME)
{
STAT(tunnel_timeout);
tunnelkill(t, "Expired");
if (tunnel[t].retry && tunnel[t].controlc)
{
// resend pending messages as timeout on reply
- if (tunnel[t].retry <= config->current_time)
+ if (tunnel[t].retry <= TIME)
{
controlt *c = tunnel[t].controls;
u8 w = tunnel[t].window;
}
}
// Send hello
- if (tunnel[t].state == TUNNELOPEN && tunnel[t].lastrec < config->current_time + 600)
+ if (tunnel[t].state == TUNNELOPEN && tunnel[t].lastrec < TIME + 600)
{
controlt *c = controlnew(6); // sending HELLO
controladd(c, t, 0); // send the message
}
count = 0;
- for (i = 1; i < config->cluster_highest_sessionid; i++)
+ for (i = 1; i <= config->cluster_highest_sessionid; i++)
{
s++;
- if (s >= config->cluster_highest_sessionid)
+ if (s > config->cluster_highest_sessionid)
s = 1;
if (!session[s].tunnel) // Session isn't in use
}
// check for expired sessions
- if (session[s].die && session[s].die <= config->current_time)
+ if (session[s].die && session[s].die <= TIME)
{
sessionkill(s, "Expired");
if (++count >= MAX_ACTIONS) break;
continue;
}
}
- if (config->accounting_dir && next_acct <= config->current_time)
+ if (config->accounting_dir && next_acct <= TIME)
{
// Dump accounting data
- next_acct = config->current_time + ACCT_TIME;
+ next_acct = TIME + ACCT_TIME;
dump_acct_info();
}
if (!tunnel[i].controlc)
continue;
- if (last_talked != config->current_time) {
- log(2,0,0,0, "Tunnel %d still has an-acked control messages.\n", i);
- last_talked = config->current_time;
+ if (last_talked != TIME) {
+ log(2,0,0,0, "Tunnel %d still has un-acked control messages.\n", i);
+ last_talked = TIME;
}
return 1;
}
if (radius[i].state == RADIUSWAIT)
continue;
- if (last_talked != config->current_time) {
+ if (last_talked != TIME) {
log(2,0,0,0, "Radius session %d is still busy (sid %d)\n", i, radius[i].session);
- last_talked = config->current_time;
+ last_talked = TIME;
}
return 1;
}
n = select(n + 1, &r, 0, 0, &to);
#endif /* BGP */
- config->current_time = now();
+ TIME = now();
if (n < 0)
{
if (errno == EINTR)
// Runs on all machines both master and slave.
{
static clockt last_run = 0;
- if (last_run != config->current_time) {
- last_run = config->current_time;
+ if (last_run != TIME) {
+ last_run = TIME;
tbf_run_timer();
}
}
char *u = session[s].user;
char reuse = 0;
-#ifdef STAT_CALLS
- STAT(call_assign_ip_address);
-#endif
+
+ CSTAT(call_assign_ip_address);
+
for (i = 1; i < ip_pool_size; i++)
{
if (!ip_address_pool[i].address || ip_address_pool[i].assigned)
ip_address_pool[i].session = 0;
ip_address_pool[i].last = time_now;
-#ifdef STAT_CALLS
- STAT(call_free_ip_address);
-#endif
+
+ CSTAT(call_free_ip_address);
+
}
//
if (ipid < 1) // Not found in the pool either? good.
continue;
- log(0, 0, i, 0, "Session %d has an IP address (%s) that was marked static, but is in the pool (%d)!",
+ log(0, 0, i, 0, "Session %d has an IP address (%s) that was marked static, but is in the pool (%d)!\n",
i, inet_toa(session[i].ip), ipid);
// Fall through and process it as part of the pool.
src = inet_addr(buf);
if (src == INADDR_NONE)
{
- log(0, 0, 0, 0, "Invalid address pool IP %s", buf);
+ log(0, 0, 0, 0, "Invalid address pool IP %s\n", buf);
exit(1);
}
// This entry is for a specific IP only
int i;
FILE *f = NULL;
-#ifdef STAT_CALLS
- STAT(call_dump_acct_info);
-#endif
+
+ CSTAT(call_dump_acct_info);
+
strftime(timestr, 64, "%Y%m%d%H%M%S", localtime(&t));
snprintf(filename, 1024, "%s/%s", config->accounting_dir, timestr);
init_cli();
read_config_file();
- log(0, 0, 0, 0, "$Id: l2tpns.c,v 1.8 2004/06/23 03:52:24 fred_nerk Exp $\n"
- "(c) Copyright 2003, 2004 Optus Internet Engineering\n"
- "(c) Copyright 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced\n");
+ log(0, 0, 0, 0, "L2TPNS version " VERSION "\n");
+ log(0, 0, 0, 0, "Copyright (c) 2003, 2004 Optus Internet Engineering\n");
+ log(0, 0, 0, 0, "Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced\n");
{
struct rlimit rlim;
rlim.rlim_cur = RLIM_INFINITY;
}
memcpy(config->old_plugins, config->plugins, sizeof(config->plugins));
if (!config->cleanup_interval) config->cleanup_interval = 10;
- if (!config->multi_read_count) config->multi_read_count = 1;
+ if (!config->multi_read_count) config->multi_read_count = 10;
if (!config->cluster_address) config->cluster_address = inet_addr(DEFAULT_MCAST_ADDR);
if (!*config->cluster_interface)
strncpy(config->cluster_interface, DEFAULT_MCAST_INTERFACE, sizeof(config->cluster_interface) - 1);
+ if (!config->cluster_hb_interval)
+ config->cluster_hb_interval = PING_INTERVAL; // Heartbeat every 0.5 seconds.
+
+ if (!config->cluster_hb_timeout)
+ config->cluster_hb_timeout = HB_TIMEOUT; // 10 missed heartbeat triggers an election.
+
config->reload_config = 0;
}
char *user;
sessionidt i;
int r;
-#ifdef STAT_CALLS
- STAT(call_sessionsetup);
-#endif
+
+ CSTAT(call_sessionsetup);
+
log(3, session[s].ip, s, t, "Doing session setup for session\n");
{
if (session[s].ip) // If there's an old one, remove it.
{
+ // Remove any routes if the IP has changed
+ for (i = 0; i < MAXROUTE && session[s].route[i].ip; i++)
+ {
+ routeset(s, session[s].route[i].ip, session[s].route[i].mask, session[s].ip, 0);
+ session[s].route[i].ip = 0;
+ }
+
if (session[s].ip_pool_index == -1) // static IP
routeset(s, session[s].ip, 0, 0, 0);
- else // It's part of the IP pool, add it manually.
+ else // It's part of the IP pool, remove it manually.
uncache_ipmap(session[s].ip);
}
}
}
- // Add routes for the session if they're new.
+ // Update routed networks
for (i = 0; i < MAXROUTE && (session[s].route[i].ip || new->route[i].ip); i++)
{
if (new->route[i].ip == session[s].route[i].ip &&
continue;
if (session[s].route[i].ip) // Remove the old one if it exists.
- routeset(s, session[s].route[i].ip, session[s].route[i].mask, session[s].route[i].ip, 0);
+ routeset(s, session[s].route[i].ip, session[s].route[i].mask, session[s].ip, 0);
if (new->route[i].ip) // Add the new one if it exists.
routeset(s, new->route[i].ip, new->route[i].mask, new->ip, 1);
int l;
struct param_control param = { buf, len, ntohl(addr->sin_addr.s_addr), ntohs(addr->sin_port), NULL, 0, 0 };
+
+ if (log_stream && config->debug >= 4)
+ {
log(4, ntohl(addr->sin_addr.s_addr), 0, 0, "Received ");
- if (log_stream)
dump_packet(buf, log_stream);
+ }
resp = calloc(1400, 1);
l = new_packet(PKT_RESP_ERROR, resp);
int count = 0;
int buckets[64];
+ if (CLI_HELP_REQUESTED)
+ return CLI_HELP_NO_ARGS;
+
time(&time_now);
for (i = 0; i < 64;++i) buckets[i] = 0;
int count = 0;
int buckets[64];
+ if (CLI_HELP_REQUESTED)
+ return CLI_HELP_NO_ARGS;
+
time(&time_now);
for (i = 0; i < 64;++i) buckets[i] = 0;
projects / l2tpns.git / commitdiff