X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/af2489f67ad3e5c83566b661ebd67806b6b96a0e..1e722029bc405a555e81840c00708084128c5cdd:/cli.c diff --git a/cli.c b/cli.c index cce382b..fc150d7 100644 --- a/cli.c +++ b/cli.c @@ -1,11 +1,10 @@ // L2TPNS Command Line Interface // vim: sw=8 ts=8 -char const *cvs_name = "$Name: $"; -char const *cvs_id_cli = "$Id: cli.c,v 1.35 2004-11-29 03:55:19 bodea Exp $"; - #include +#include #include +#include #include #include #include @@ -19,20 +18,23 @@ char const *cvs_id_cli = "$Id: cli.c,v 1.35 2004-11-29 03:55:19 bodea Exp $"; #include #include #include -#include #include +#include #include + #include "l2tpns.h" +#include "constants.h" #include "util.h" #include "cluster.h" #include "tbf.h" #include "ll.h" #ifdef BGP #include "bgp.h" -#include #endif +#include "l2tplac.h" extern tunnelt *tunnel; +extern bundlet *bundle; extern sessiont *session; extern radiust *radius; extern ippoolt *ip_address_pool; @@ -48,15 +50,6 @@ extern struct cli_tunnel_actions *cli_tunnel_actions; extern tbft *filter_list; extern ip_filtert *ip_filters; -static char *debug_levels[] = { - "CRIT", - "ERROR", - "WARN", - "INFO", - "CALL", - "DATA", -}; - struct { char critical; @@ -67,15 +60,24 @@ struct char data; } debug_flags; -static int debug_session; -static int debug_tunnel; +#ifdef RINGBUFFER + static int debug_rb_tail; +static char *debug_levels[] = { + "CRIT", + "ERROR", + "WARN", + "INFO", + "CALL", + "DATA", +}; + +#endif static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int argc); static int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int argc); static int cmd_show_users(struct cli_def *cli, char *command, char **argv, int argc); static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int argc); -static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, int argc); static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc); static int cmd_show_pool(struct cli_def *cli, char *command, char **argv, int argc); static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int argc); @@ -83,7 +85,6 @@ static int cmd_show_banana(struct cli_def *cli, char *command, char **argv, int static int cmd_show_plugins(struct cli_def *cli, char *command, char **argv, int argc); static int cmd_show_throttle(struct cli_def *cli, char *command, char **argv, int argc); static int cmd_write_memory(struct cli_def *cli, char *command, char **argv, int argc); -static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, int argc); static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int argc); static int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int argc); static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int argc); @@ -97,8 +98,17 @@ 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_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 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); + 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); +static int cmd_clear_counters(struct cli_def *cli, char *command, char **argv, int argc); +#endif /* STATISTICS */ #ifdef BGP #define MODE_CONFIG_BGP 8 @@ -122,20 +132,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"); @@ -147,7 +151,8 @@ void init_cli(char *hostname) 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, "running-config", cmd_show_run, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Show the currently running configuration"); + cli_register_command(cli, c, "remotelns-conf", cmd_show_rmtlnsconf, PRIVILEGE_PRIVILEGED, MODE_EXEC, "Show a list of remote LNS 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"); @@ -168,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"); + 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"); @@ -218,6 +225,8 @@ void init_cli(char *hostname) cli_register_command(cli, NULL, "set", cmd_set, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Set a configuration variable"); + cli_register_command(cli, NULL, "setforward", cmd_setforward, PRIVILEGE_PRIVILEGED, MODE_CONFIG, "Set the Remote LNS Forward"); + 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"); @@ -259,9 +268,20 @@ 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, 6); + clifd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); setsockopt(clifd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)); { int flags; @@ -270,26 +290,36 @@ void init_cli(char *hostname) 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) { - LOG(3, 0, 0, "Accepted connection to CLI from %s\n", fmtaddr(addr.sin_addr.s_addr, 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", + fmtaddr(addr.sin_addr.s_addr, 0)); } else LOG(0, 0, 0, "getpeername() failed on cli socket. Requiring authentication: %s\n", strerror(errno)); @@ -309,8 +339,6 @@ void cli_do(int sockfd) cli->users = 0; } - debug_session = 0; - debug_tunnel = 0; #ifdef RINGBUFFER debug_rb_tail = ringbuffer->tail; #endif @@ -320,7 +348,9 @@ void cli_do(int sockfd) cli_loop(cli, sockfd); close(sockfd); - LOG(3, 0, 0, "Closed CLI connection from %s\n", fmtaddr(addr.sin_addr.s_addr, 0)); + LOG(require_auth ? 3 : 4, 0, 0, "Closed CLI connection from %s\n", + fmtaddr(addr.sin_addr.s_addr, 0)); + exit(0); } @@ -359,16 +389,16 @@ int cli_arg_help(struct cli_def *cli, int cr_ok, char *entry, ...) desc = va_arg(ap, char *); if (desc && *desc) - cli_print(cli, " %-20s %s", p, desc); + cli_error(cli, " %-20s %s", p, desc); else - cli_print(cli, " %s", p); + cli_error(cli, " %s", p); entry = desc ? va_arg(ap, char *) : 0; } va_end(ap); if (cr_ok) - cli_print(cli, " "); + cli_error(cli, " "); return CLI_OK; } @@ -400,17 +430,48 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int 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%lu", session[s].unique_id); - cli_print(cli, "\tIdle time:\t%u seconds", abs(time_now - session[s].last_packet)); - cli_print(cli, "\tNext Recv:\t%u", session[s].nr); - cli_print(cli, "\tNext Send:\t%u", session[s].ns); - cli_print(cli, "\tBytes In/Out:\t%lu/%lu", (unsigned long)session[s].total_cout, (unsigned long)session[s].total_cin); - cli_print(cli, "\tPkts In/Out:\t%lu/%lu", (unsigned long)session[s].pout, (unsigned long)session[s].pin); + 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, "\tRadius Session:\t%u", session[s].radius); - cli_print(cli, "\tRx Speed:\t%lu", session[s].rx_connect_speed); - cli_print(cli, "\tTx Speed:\t%lu", session[s].tx_connect_speed); + cli_print(cli, "\tRx Speed:\t%u", session[s].rx_connect_speed); + cli_print(cli, "\tTx Speed:\t%u", session[s].tx_connect_speed); if (session[s].filter_in && session[s].filter_in <= MAXFILTER) cli_print(cli, "\tFilter in:\t%u (%s)", session[s].filter_in, ip_filters[session[s].filter_in - 1].name); if (session[s].filter_out && session[s].filter_out <= MAXFILTER) @@ -473,37 +534,49 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int } // Show Summary - cli_print(cli, "%5s %4s %-32s %-15s %s %s %s %10s %10s %10s %4s %-15s %s", + cli_print(cli, "%5s %7s %4s %-32s %-15s %s %s %s %s %10s %10s %10s %4s %10s %-18s %s", "SID", + "LkToSID", "TID", "Username", "IP", "I", "T", "G", + "6", "opened", "downloaded", "uploaded", "idle", - "LAC", + "Rem.Time", + "LAC(L)/RLNS(R)/PPPOE(P)", "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 %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 %7d %4d %-32s %-15s %s %s %s %s %10u %10lu %10lu %4u %10lu %3s%-20s %s", i, + session[i].forwardtosession, 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].ppp.ipv6cp == Opened) ? "Y" : "N", abs(time_now - (unsigned long)session[i].opened), - (unsigned long)session[i].total_cout, - (unsigned long)session[i].total_cin, + (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), + (session[i].tunnel == TUNNEL_ID_PPPOE)?"(P)":(tunnel[session[i].tunnel].isremotelns?"(R)":"(L)"), + (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; @@ -587,12 +660,14 @@ static int cmd_show_tunnels(struct cli_def *cli, char *command, char **argv, int 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 + ,(i == TUNNEL_ID_PPPOE)?"Tunnel pppoe":(tunnel[i].isremotelns?"Tunnel To Remote LNS":"Tunnel To LAC") + ); } return CLI_OK; @@ -639,29 +714,30 @@ static int cmd_show_users(struct cli_def *cli, char *command, char **argv, int a return CLI_OK; } +#ifdef STATISTICS static 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", + cli_print(cli, "%-10s %10s %10s %10s %10s", "Ethernet", "Bytes", "Packets", "Errors", "Dropped"); + cli_print(cli, "%-10s %10u %10u %10u %10u", "RX", GET_STAT(tun_rx_bytes), GET_STAT(tun_rx_packets), - GET_STAT(tun_rx_errors)); - cli_print(cli, "%-10s %8lu %8lu %8lu", "TX", + GET_STAT(tun_rx_errors), + GET_STAT(tun_rx_dropped)); + cli_print(cli, "%-10s %10u %10u %10u", "TX", GET_STAT(tun_tx_bytes), GET_STAT(tun_tx_packets), GET_STAT(tun_tx_errors)); cli_print(cli, ""); - cli_print(cli, "%-10s %-8s %-10s %-8s %-8s", "Tunnel", "Bytes", "Packets", "Errors", "Retries"); - cli_print(cli, "%-10s %8lu %8lu %8lu %8lu", "RX", + cli_print(cli, "%-10s %10s %10s %10s %10s", "Tunnel", "Bytes", "Packets", "Errors", "Retries"); + cli_print(cli, "%-10s %10u %10u %10u", "RX", GET_STAT(tunnel_rx_bytes), GET_STAT(tunnel_rx_packets), - GET_STAT(tunnel_rx_errors), - 0L); - cli_print(cli, "%-10s %8lu %8lu %8lu %8lu", "TX", + GET_STAT(tunnel_rx_errors)); + cli_print(cli, "%-10s %10u %10u %10u %10u", "TX", GET_STAT(tunnel_tx_bytes), GET_STAT(tunnel_tx_packets), GET_STAT(tunnel_tx_errors), @@ -670,125 +746,94 @@ static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, in cli_print(cli, "%-30s%-10s", "Counter", "Value"); cli_print(cli, "-----------------------------------------"); - cli_print(cli, "%-30s%lu", "radius_retries", GET_STAT(radius_retries)); - cli_print(cli, "%-30s%lu", "arp_sent", GET_STAT(arp_sent)); - cli_print(cli, "%-30s%lu", "packets_snooped", GET_STAT(packets_snooped)); - cli_print(cli, "%-30s%lu", "tunnel_created", GET_STAT(tunnel_created)); - cli_print(cli, "%-30s%lu", "session_created", GET_STAT(session_created)); - cli_print(cli, "%-30s%lu", "tunnel_timeout", GET_STAT(tunnel_timeout)); - cli_print(cli, "%-30s%lu", "session_timeout", GET_STAT(session_timeout)); - cli_print(cli, "%-30s%lu", "radius_timeout", GET_STAT(radius_timeout)); - cli_print(cli, "%-30s%lu", "radius_overflow", GET_STAT(radius_overflow)); - cli_print(cli, "%-30s%lu", "tunnel_overflow", GET_STAT(tunnel_overflow)); - cli_print(cli, "%-30s%lu", "session_overflow", GET_STAT(session_overflow)); - cli_print(cli, "%-30s%lu", "ip_allocated", GET_STAT(ip_allocated)); - cli_print(cli, "%-30s%lu", "ip_freed", GET_STAT(ip_freed)); - cli_print(cli, "%-30s%lu", "cluster_forwarded", GET_STAT(c_forwarded)); - cli_print(cli, "%-30s%lu", "recv_forward", GET_STAT(recv_forward)); - - -#ifdef STATISTICS + cli_print(cli, "%-30s%u", "radius_retries", GET_STAT(radius_retries)); + cli_print(cli, "%-30s%u", "arp_sent", GET_STAT(arp_sent)); + cli_print(cli, "%-30s%u", "packets_snooped", GET_STAT(packets_snooped)); + cli_print(cli, "%-30s%u", "tunnel_created", GET_STAT(tunnel_created)); + cli_print(cli, "%-30s%u", "session_created", GET_STAT(session_created)); + cli_print(cli, "%-30s%u", "tunnel_timeout", GET_STAT(tunnel_timeout)); + cli_print(cli, "%-30s%u", "session_timeout", GET_STAT(session_timeout)); + cli_print(cli, "%-30s%u", "radius_timeout", GET_STAT(radius_timeout)); + cli_print(cli, "%-30s%u", "radius_overflow", GET_STAT(radius_overflow)); + cli_print(cli, "%-30s%u", "tunnel_overflow", GET_STAT(tunnel_overflow)); + cli_print(cli, "%-30s%u", "session_overflow", GET_STAT(session_overflow)); + cli_print(cli, "%-30s%u", "ip_allocated", GET_STAT(ip_allocated)); + cli_print(cli, "%-30s%u", "ip_freed", GET_STAT(ip_freed)); + cli_print(cli, "%-30s%u", "cluster_forwarded", GET_STAT(c_forwarded)); + cli_print(cli, "%-30s%u", "recv_forward", GET_STAT(recv_forward)); + cli_print(cli, "%-30s%u", "select_called", GET_STAT(select_called)); + cli_print(cli, "%-30s%u", "multi_read_used", GET_STAT(multi_read_used)); + cli_print(cli, "%-30s%u", "multi_read_exceeded", GET_STAT(multi_read_exceeded)); + + +#ifdef STAT_CALLS cli_print(cli, "\n%-30s%-10s", "Counter", "Value"); cli_print(cli, "-----------------------------------------"); - cli_print(cli, "%-30s%lu", "call_processtun", GET_STAT(call_processtun)); - cli_print(cli, "%-30s%lu", "call_processipout", GET_STAT(call_processipout)); - cli_print(cli, "%-30s%lu", "call_processudp", GET_STAT(call_processudp)); - cli_print(cli, "%-30s%lu", "call_processpap", GET_STAT(call_processpap)); - cli_print(cli, "%-30s%lu", "call_processchap", GET_STAT(call_processchap)); - cli_print(cli, "%-30s%lu", "call_processlcp", GET_STAT(call_processlcp)); - cli_print(cli, "%-30s%lu", "call_processipcp", GET_STAT(call_processipcp)); - cli_print(cli, "%-30s%lu", "call_processipin", GET_STAT(call_processipin)); - cli_print(cli, "%-30s%lu", "call_processccp", GET_STAT(call_processccp)); - cli_print(cli, "%-30s%lu", "call_processrad", GET_STAT(call_processrad)); - cli_print(cli, "%-30s%lu", "call_sendarp", GET_STAT(call_sendarp)); - cli_print(cli, "%-30s%lu", "call_sendipcp", GET_STAT(call_sendipcp)); - cli_print(cli, "%-30s%lu", "call_sendchap", GET_STAT(call_sendchap)); - cli_print(cli, "%-30s%lu", "call_sessionbyip", GET_STAT(call_sessionbyip)); - cli_print(cli, "%-30s%lu", "call_sessionbyuser", GET_STAT(call_sessionbyuser)); - cli_print(cli, "%-30s%lu", "call_tunnelsend", GET_STAT(call_tunnelsend)); - cli_print(cli, "%-30s%lu", "call_tunnelkill", GET_STAT(call_tunnelkill)); - cli_print(cli, "%-30s%lu", "call_tunnelshutdown", GET_STAT(call_tunnelshutdown)); - cli_print(cli, "%-30s%lu", "call_sessionkill", GET_STAT(call_sessionkill)); - cli_print(cli, "%-30s%lu", "call_sessionshutdown", GET_STAT(call_sessionshutdown)); - cli_print(cli, "%-30s%lu", "call_sessionsetup", GET_STAT(call_sessionsetup)); - cli_print(cli, "%-30s%lu", "call_assign_ip_address", GET_STAT(call_assign_ip_address)); - cli_print(cli, "%-30s%lu", "call_free_ip_address", GET_STAT(call_free_ip_address)); - cli_print(cli, "%-30s%lu", "call_dump_acct_info", GET_STAT(call_dump_acct_info)); - cli_print(cli, "%-30s%lu", "call_radiussend", GET_STAT(call_radiussend)); - cli_print(cli, "%-30s%lu", "call_radiusretry", GET_STAT(call_radiusretry)); -#endif + cli_print(cli, "%-30s%u", "call_processtun", GET_STAT(call_processtun)); + cli_print(cli, "%-30s%u", "call_processipout", GET_STAT(call_processipout)); + cli_print(cli, "%-30s%u", "call_processipv6out", GET_STAT(call_processipv6out)); + cli_print(cli, "%-30s%u", "call_processudp", GET_STAT(call_processudp)); + cli_print(cli, "%-30s%u", "call_processpap", GET_STAT(call_processpap)); + cli_print(cli, "%-30s%u", "call_processchap", GET_STAT(call_processchap)); + cli_print(cli, "%-30s%u", "call_processlcp", GET_STAT(call_processlcp)); + cli_print(cli, "%-30s%u", "call_processipcp", GET_STAT(call_processipcp)); + cli_print(cli, "%-30s%u", "call_processipv6cp", GET_STAT(call_processipv6cp)); + cli_print(cli, "%-30s%u", "call_processipin", GET_STAT(call_processipin)); + cli_print(cli, "%-30s%u", "call_processipv6in", GET_STAT(call_processipv6in)); + cli_print(cli, "%-30s%u", "call_processccp", GET_STAT(call_processccp)); + cli_print(cli, "%-30s%u", "call_processrad", GET_STAT(call_processrad)); + cli_print(cli, "%-30s%u", "call_sendarp", GET_STAT(call_sendarp)); + cli_print(cli, "%-30s%u", "call_sendipcp", GET_STAT(call_sendipcp)); + cli_print(cli, "%-30s%u", "call_sendchap", GET_STAT(call_sendchap)); + cli_print(cli, "%-30s%u", "call_sessionbyip", GET_STAT(call_sessionbyip)); + cli_print(cli, "%-30s%u", "call_sessionbyipv6", GET_STAT(call_sessionbyipv6)); + cli_print(cli, "%-30s%u", "call_sessionbyuser", GET_STAT(call_sessionbyuser)); + cli_print(cli, "%-30s%u", "call_tunnelsend", GET_STAT(call_tunnelsend)); + cli_print(cli, "%-30s%u", "call_tunnelkill", GET_STAT(call_tunnelkill)); + cli_print(cli, "%-30s%u", "call_tunnelshutdown", GET_STAT(call_tunnelshutdown)); + cli_print(cli, "%-30s%u", "call_sessionkill", GET_STAT(call_sessionkill)); + cli_print(cli, "%-30s%u", "call_sessionshutdown", GET_STAT(call_sessionshutdown)); + cli_print(cli, "%-30s%u", "call_sessionsetup", GET_STAT(call_sessionsetup)); + cli_print(cli, "%-30s%u", "call_assign_ip_address", GET_STAT(call_assign_ip_address)); + cli_print(cli, "%-30s%u", "call_free_ip_address", GET_STAT(call_free_ip_address)); + cli_print(cli, "%-30s%u", "call_dump_acct_info", GET_STAT(call_dump_acct_info)); + cli_print(cli, "%-30s%u", "call_radiussend", GET_STAT(call_radiussend)); + cli_print(cli, "%-30s%u", "call_radiusretry", GET_STAT(call_radiusretry)); + cli_print(cli, "%-30s%u", "call_random_data", GET_STAT(call_random_data)); +#endif /* STAT_CALLS */ + + { + time_t l = GET_STAT(last_reset); + char *t = ctime(&l); + char *p = strchr(t, '\n'); + if (p) *p = 0; + + cli_print(cli, ""); + cli_print(cli, "Last counter reset %s", t); + } + return CLI_OK; } -static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc) +static int cmd_clear_counters(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); - if (tag) - { - char const *p = strchr(cvs_name, ':'); - char const *e; - if (p) - { - p++; - while (isspace(*p)) - p++; - } - - if (!p || *p == '$') - p = "HEAD"; + return CLI_HELP_NO_ARGS; - 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; + memset(_statistics, 0, sizeof(struct Tstats)); + SET_STAT(last_reset, time(NULL)); - 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); + cli_print(cli, "Counters cleared"); + return CLI_OK; +} +#endif /* STATISTICS */ - ll_reset(loaded_plugins); - while ((p = ll_next(loaded_plugins))) - { - char const **id = dlsym(p, "cvs_id"); - if (id) - cli_print(cli, " %s", *id); - } - } +static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc) +{ + if (CLI_HELP_REQUESTED) + return CLI_HELP_NO_ARGS; + cli_print(cli, "L2TPNS %s", VERSION); return CLI_OK; } @@ -837,7 +882,7 @@ static int cmd_show_pool(struct cli_def *cli, char *command, char **argv, int ar if (ip_address_pool[i].last) cli_print(cli, "%-15s\tN %8s [%s] %ds", fmtaddr(htonl(ip_address_pool[i].address), 0), "", - ip_address_pool[i].user, time_now - ip_address_pool[i].last); + ip_address_pool[i].user, (int) time_now - ip_address_pool[i].last); else if (show_all) cli_print(cli, "%-15s\tN", fmtaddr(htonl(ip_address_pool[i].address), 0)); @@ -876,7 +921,7 @@ static int cmd_write_memory(struct cli_def *cli, char *command, char **argv, int } else { - cli_print(cli, "Error writing configuration: %s", strerror(errno)); + cli_error(cli, "Error writing configuration: %s", strerror(errno)); } return CLI_OK; } @@ -886,6 +931,7 @@ static char const *show_access_list_rule(int extended, ip_filter_rulet *rule); static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int argc) { int i; + char ipv6addr[INET6_ADDRSTRLEN]; if (CLI_HELP_REQUESTED) return CLI_HELP_NO_ARGS; @@ -896,25 +942,19 @@ static int cmd_show_run(struct cli_def *cli, char *command, char **argv, int arg { void *value = ((void *)config) + config_values[i].offset; if (config_values[i].type == STRING) - cli_print(cli, "set %s \"%.*s\"", config_values[i].key, config_values[i].size, (char *)value); - else if (config_values[i].type == IP) - cli_print(cli, "set %s %s", config_values[i].key, fmtaddr(*(unsigned *)value, 0)); + cli_print(cli, "set %s \"%.*s\"", config_values[i].key, config_values[i].size, (char *) value); + else if (config_values[i].type == IPv4) + cli_print(cli, "set %s %s", config_values[i].key, fmtaddr(*(in_addr_t *) value, 0)); + else if (config_values[i].type == IPv6) + cli_print(cli, "set %s %s", config_values[i].key, inet_ntop(AF_INET6, value, ipv6addr, INET6_ADDRSTRLEN)); else if (config_values[i].type == SHORT) - cli_print(cli, "set %s %hu", config_values[i].key, *(short *)value); + cli_print(cli, "set %s %hu", config_values[i].key, *(short *) value); else if (config_values[i].type == BOOL) - cli_print(cli, "set %s %s", config_values[i].key, (*(int *)value) ? "yes" : "no"); + cli_print(cli, "set %s %s", config_values[i].key, (*(int *) value) ? "yes" : "no"); else if (config_values[i].type == INT) - cli_print(cli, "set %s %d", config_values[i].key, *(int *)value); + 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, "set %s %lu", config_values[i].key, *(unsigned long *) value); } cli_print(cli, "# Plugins"); @@ -956,6 +996,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); + + 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 @@ -990,6 +1035,7 @@ static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int "IPCP", "START", "STOP", + "INTRM", "WAIT", }; @@ -1003,7 +1049,7 @@ static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int NULL); } - cli_print(cli, "%6s%6s%5s%6s%9s%9s%4s", "ID", "Radius", "Sock", "State", "Session", "Retry", "Try"); + cli_print(cli, "%6s%7s%5s%6s%9s%9s%4s", "ID", "Radius", "Sock", "State", "Session", "Retry", "Try"); time(&time_now); @@ -1019,7 +1065,7 @@ static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int if (!show_all && radius[i].state == RADIUSNULL) continue; - cli_print(cli, "%6d%6d%5d%6s%9d%9u%4d", + cli_print(cli, "%6d%7d%5d%6s%9d%9u%4d", i, i >> RADIUS_SHIFT, i & RADIUS_MASK, @@ -1104,16 +1150,6 @@ static int cmd_show_banana(struct cli_def *cli, char *command, char **argv, int return CLI_OK; } -static 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; -} - static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int argc) { int i; @@ -1125,7 +1161,7 @@ static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int ar if (!config->cluster_iam_master) { - cli_print(cli, "Can't do this on a slave. Do it on %s", + cli_error(cli, "Can't do this on a slave. Do it on %s", fmtaddr(config->cluster_master_address, 0)); return CLI_OK; @@ -1133,7 +1169,7 @@ static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int ar if (!argc) { - cli_print(cli, "Specify a user to drop"); + cli_error(cli, "Specify a user to drop"); return CLI_OK; } @@ -1141,7 +1177,7 @@ static int cmd_drop_user(struct cli_def *cli, char *command, char **argv, int ar { if (!(s = sessionbyuser(argv[i]))) { - cli_print(cli, "User %s is not connected", argv[i]); + cli_error(cli, "User %s is not connected", argv[i]); continue; } @@ -1166,7 +1202,7 @@ static int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int if (!config->cluster_iam_master) { - cli_print(cli, "Can't do this on a slave. Do it on %s", + cli_error(cli, "Can't do this on a slave. Do it on %s", fmtaddr(config->cluster_master_address, 0)); return CLI_OK; @@ -1174,7 +1210,7 @@ static int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int if (!argc) { - cli_print(cli, "Specify a tunnel to drop"); + cli_error(cli, "Specify a tunnel to drop"); return CLI_OK; } @@ -1182,19 +1218,19 @@ static int cmd_drop_tunnel(struct cli_def *cli, char *command, char **argv, int { if ((t = atol(argv[i])) <= 0 || (t >= MAXTUNNEL)) { - cli_print(cli, "Invalid tunnel ID (1-%d)", MAXTUNNEL-1); + cli_error(cli, "Invalid tunnel ID (1-%d)", MAXTUNNEL-1); continue; } if (!tunnel[t].ip) { - cli_print(cli, "Tunnel %d is not connected", t); + cli_error(cli, "Tunnel %d is not connected", t); continue; } if (tunnel[t].die) { - cli_print(cli, "Tunnel %d is already being shut down", t); + cli_error(cli, "Tunnel %d is already being shut down", t); continue; } @@ -1216,7 +1252,7 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int if (!config->cluster_iam_master) { - cli_print(cli, "Can't do this on a slave. Do it on %s", + cli_error(cli, "Can't do this on a slave. Do it on %s", fmtaddr(config->cluster_master_address, 0)); return CLI_OK; @@ -1224,7 +1260,7 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int if (!argc) { - cli_print(cli, "Specify a session id to drop"); + cli_error(cli, "Specify a session id to drop"); return CLI_OK; } @@ -1232,7 +1268,7 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int { if ((s = atol(argv[i])) <= 0 || (s > MAXSESSION)) { - cli_print(cli, "Invalid session ID (1-%d)", MAXSESSION-1); + cli_error(cli, "Invalid session ID (1-%d)", MAXSESSION-1); continue; } @@ -1241,9 +1277,14 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int cli_print(cli, "Dropping session %d", s); cli_session_actions[s].action |= CLI_SESS_KILL; } + 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; + } else { - cli_print(cli, "Session %d is not active.", s); + cli_error(cli, "Session %d is not active.", s); } } @@ -1252,8 +1293,8 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int static int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc) { - ipt ip; - u16 port; + in_addr_t ip; + uint16_t port; sessionidt s; if (CLI_HELP_REQUESTED) @@ -1283,7 +1324,7 @@ static int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc) if (!config->cluster_iam_master) { - cli_print(cli, "Can't do this on a slave. Do it on %s", + cli_error(cli, "Can't do this on a slave. Do it on %s", fmtaddr(config->cluster_master_address, 0)); return CLI_OK; @@ -1291,27 +1332,27 @@ static int cmd_snoop(struct cli_def *cli, char *command, char **argv, int argc) if (argc < 3) { - cli_print(cli, "Specify username, ip and port"); + cli_error(cli, "Specify username, ip and port"); return CLI_OK; } if (!(s = sessionbyuser(argv[0]))) { - cli_print(cli, "User %s is not connected", argv[0]); + cli_error(cli, "User %s is not connected", argv[0]); return CLI_OK; } ip = inet_addr(argv[1]); if (!ip || ip == INADDR_NONE) { - cli_print(cli, "Cannot parse IP \"%s\"", argv[1]); + cli_error(cli, "Cannot parse IP \"%s\"", argv[1]); return CLI_OK; } port = atoi(argv[2]); if (!port) { - cli_print(cli, "Invalid port %s", argv[2]); + cli_error(cli, "Invalid port %s", argv[2]); return CLI_OK; } @@ -1334,7 +1375,7 @@ static int cmd_no_snoop(struct cli_def *cli, char *command, char **argv, int arg if (!config->cluster_iam_master) { - cli_print(cli, "Can't do this on a slave. Do it on %s", + cli_error(cli, "Can't do this on a slave. Do it on %s", fmtaddr(config->cluster_master_address, 0)); return CLI_OK; @@ -1342,7 +1383,7 @@ static int cmd_no_snoop(struct cli_def *cli, char *command, char **argv, int arg if (!argc) { - cli_print(cli, "Specify a user to unsnoop"); + cli_error(cli, "Specify a user to unsnoop"); return CLI_OK; } @@ -1350,7 +1391,7 @@ static int cmd_no_snoop(struct cli_def *cli, char *command, char **argv, int arg { if (!(s = sessionbyuser(argv[i]))) { - cli_print(cli, "User %s is not connected", argv[i]); + cli_error(cli, "User %s is not connected", argv[i]); continue; } @@ -1408,7 +1449,7 @@ static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int arg if (!config->cluster_iam_master) { - cli_print(cli, "Can't do this on a slave. Do it on %s", + cli_error(cli, "Can't do this on a slave. Do it on %s", fmtaddr(config->cluster_master_address, 0)); return CLI_OK; @@ -1416,13 +1457,13 @@ static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int arg if (argc == 0) { - cli_print(cli, "Specify a user to throttle"); + cli_error(cli, "Specify a user to throttle"); return CLI_OK; } if (!(s = sessionbyuser(argv[0]))) { - cli_print(cli, "User %s is not connected", argv[0]); + cli_error(cli, "User %s is not connected", argv[0]); return CLI_OK; } @@ -1435,7 +1476,7 @@ static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int arg rate_in = rate_out = atoi(argv[1]); if (rate_in < 1) { - cli_print(cli, "Invalid rate \"%s\"", argv[1]); + cli_error(cli, "Invalid rate \"%s\"", argv[1]); return CLI_OK; } } @@ -1452,20 +1493,20 @@ static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int arg if (r < 1) { - cli_print(cli, "Invalid rate specification \"%s %s\"", argv[i], argv[i+1]); + cli_error(cli, "Invalid rate specification \"%s %s\"", argv[i], argv[i+1]); return CLI_OK; } } } else { - cli_print(cli, "Invalid arguments"); + cli_error(cli, "Invalid arguments"); return CLI_OK; } if ((rate_in && session[s].throttle_in) || (rate_out && session[s].throttle_out)) { - cli_print(cli, "User %s already throttled, unthrottle first", argv[0]); + cli_error(cli, "User %s already throttled, unthrottle first", argv[0]); return CLI_OK; } @@ -1479,7 +1520,7 @@ static int cmd_throttle(struct cli_def *cli, char *command, char **argv, int arg if (cli_session_actions[s].throttle_in == -1 && cli_session_actions[s].throttle_out == -1) { - cli_print(cli, "User %s already throttled at this rate", argv[0]); + cli_error(cli, "User %s already throttled at this rate", argv[0]); return CLI_OK; } @@ -1500,7 +1541,7 @@ static int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int if (!config->cluster_iam_master) { - cli_print(cli, "Can't do this on a slave. Do it on %s", + cli_error(cli, "Can't do this on a slave. Do it on %s", fmtaddr(config->cluster_master_address, 0)); return CLI_OK; @@ -1508,7 +1549,7 @@ static int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int if (!argc) { - cli_print(cli, "Specify a user to unthrottle"); + cli_error(cli, "Specify a user to unthrottle"); return CLI_OK; } @@ -1516,7 +1557,7 @@ static int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int { if (!(s = sessionbyuser(argv[i]))) { - cli_print(cli, "User %s is not connected", argv[i]); + cli_error(cli, "User %s is not connected", argv[i]); continue; } @@ -1527,7 +1568,7 @@ static int cmd_no_throttle(struct cli_def *cli, char *command, char **argv, int } else { - cli_print(cli, "User %s not throttled", argv[i]); + cli_error(cli, "User %s not throttled", argv[i]); } } @@ -1592,7 +1633,7 @@ static int cmd_debug(struct cli_def *cli, char *command, char **argv, int argc) continue; } - cli_print(cli, "Invalid debugging flag \"%s\"", argv[i]); + cli_error(cli, "Invalid debugging flag \"%s\"", argv[i]); } return CLI_OK; @@ -1638,7 +1679,7 @@ static int cmd_no_debug(struct cli_def *cli, char *command, char **argv, int arg continue; } - cli_print(cli, "Invalid debugging flag \"%s\"", argv[i]); + cli_error(cli, "Invalid debugging flag \"%s\"", argv[i]); } return CLI_OK; @@ -1654,7 +1695,7 @@ static int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int if (argc != 1) { - cli_print(cli, "Specify a plugin to load"); + cli_error(cli, "Specify a plugin to load"); return CLI_OK; } @@ -1664,7 +1705,7 @@ static int cmd_load_plugin(struct cli_def *cli, char *command, char **argv, int firstfree = i; if (strcmp(config->plugins[i], argv[0]) == 0) { - cli_print(cli, "Plugin is already loaded"); + cli_error(cli, "Plugin is already loaded"); return CLI_OK; } } @@ -1689,7 +1730,7 @@ static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, in if (argc != 1) { - cli_print(cli, "Specify a plugin to remove"); + cli_error(cli, "Specify a plugin to remove"); return CLI_OK; } @@ -1703,7 +1744,7 @@ static int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, in } } - cli_print(cli, "Plugin is not loaded"); + cli_error(cli, "Plugin is not loaded"); return CLI_OK; } @@ -1789,7 +1830,7 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc) int len = strlen(argv[0])-1; for (i = 0; config_values[i].key; i++) if (!len || !strncmp(config_values[i].key, argv[0], len)) - cli_print(cli, " %s", config_values[i].key); + cli_error(cli, " %s", config_values[i].key); } return CLI_OK; @@ -1809,13 +1850,13 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc) if (argc != 2) { - cli_print(cli, "Specify variable and value"); + cli_error(cli, "Specify variable and value"); return CLI_OK; } for (i = 0; config_values[i].key; i++) { - void *value = ((void *)config) + config_values[i].offset; + void *value = ((void *) config) + config_values[i].offset; if (strcmp(config_values[i].key, argv[0]) == 0) { // Found a value to set @@ -1823,31 +1864,31 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc) switch (config_values[i].type) { case STRING: - strncpy((char *)value, argv[1], config_values[i].size - 1); + snprintf((char *) value, config_values[i].size, "%s", argv[1]); break; case INT: - *(int *)value = atoi(argv[1]); + *(int *) value = atoi(argv[1]); break; case UNSIGNED_LONG: - *(unsigned long *)value = atol(argv[1]); + *(unsigned long *) value = atol(argv[1]); break; case SHORT: - *(short *)value = atoi(argv[1]); + *(short *) value = atoi(argv[1]); break; - case IP: - *(unsigned *)value = inet_addr(argv[1]); + case IPv4: + *(in_addr_t *) value = inet_addr(argv[1]); break; - case MAC: - parsemac(argv[1], (char *)value); + case IPv6: + inet_pton(AF_INET6, argv[1], value); break; case BOOL: if (strcasecmp(argv[1], "yes") == 0 || strcasecmp(argv[1], "true") == 0 || strcasecmp(argv[1], "1") == 0) - *(int *)value = 1; + *(int *) value = 1; else - *(int *)value = 0; + *(int *) value = 0; break; default: - cli_print(cli, "Unknown variable type"); + cli_error(cli, "Unknown variable type"); break; } config->reload_config = 1; @@ -1855,48 +1896,50 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc) } } - cli_print(cli, "Unknown variable \"%s\"", argv[0]); + cli_error(cli, "Unknown variable \"%s\"", argv[0]); return CLI_OK; } int regular_stuff(struct cli_def *cli) { - int i = debug_rb_tail; - int reprompt = 0; - #ifdef RINGBUFFER - while (i != ringbuffer->tail) + int out = 0; + int i; + + for (i = debug_rb_tail; i != ringbuffer->tail; i = (i + 1) % RINGBUFFER_SIZE) { - int show_message = 0; + char *m = ringbuffer->buffer[i].message; + char *p; + int show = 0; - if (*ringbuffer->buffer[i].message) + if (!*m) continue; + + switch (ringbuffer->buffer[i].level) { - // Always show messages if we are doing general debug - if (ringbuffer->buffer[i].level == 0 && debug_flags.critical) show_message = 1; - if (ringbuffer->buffer[i].level == 1 && debug_flags.error) show_message = 1; - if (ringbuffer->buffer[i].level == 2 && debug_flags.warning) show_message = 1; - if (ringbuffer->buffer[i].level == 3 && debug_flags.info) show_message = 1; - if (ringbuffer->buffer[i].level == 4 && debug_flags.calls) show_message = 1; - if (ringbuffer->buffer[i].level == 5 && debug_flags.data) show_message = 1; + case 0: show = debug_flags.critical; break; + case 1: show = debug_flags.error; break; + case 2: show = debug_flags.warning; break; + case 3: show = debug_flags.info; break; + case 4: show = debug_flags.calls; break; + case 5: show = debug_flags.data; break; } - if (show_message) - { - cli_print(cli, "\r%s-%u-%u %s", - debug_levels[(int)ringbuffer->buffer[i].level], - ringbuffer->buffer[i].tunnel, - ringbuffer->buffer[i].session, - ringbuffer->buffer[i].message); + if (!show) continue; - reprompt = 1; - } + if (!(p = strchr(m, '\n'))) + p = m + strlen(m); + + cli_error(cli, "\r%s-%u-%u %.*s", + debug_levels[(int)ringbuffer->buffer[i].level], + ringbuffer->buffer[i].tunnel, + ringbuffer->buffer[i].session, + (int) (p - m), m); - if (++i == ringbuffer->tail) break; - if (i == RINGBUFFER_SIZE) i = 0; + out++; } debug_rb_tail = ringbuffer->tail; - if (reprompt) + if (out) cli_reprompt(cli); #endif return CLI_OK; @@ -1913,13 +1956,13 @@ static int cmd_router_bgp(struct cli_def *cli, char *command, char **argv, int a if (argc != 1 || (as = atoi(argv[0])) < 1 || as > 65535) { - cli_print(cli, "Invalid autonomous system number"); + cli_error(cli, "Invalid autonomous system number"); return CLI_OK; } if (bgp_configured && as != config->as_number) { - cli_print(cli, "Can't change local AS on a running system"); + cli_error(cli, "Can't change local AS on a running system"); return CLI_OK; } @@ -1975,7 +2018,7 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a int keepalive; int hold; - if (CLI_HELP_REQUESTED) + if (CLI_HELP_REQUESTED) { switch (argc) { @@ -1989,6 +2032,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", + "update-source", "Set source address to use for the BGP session", NULL); default: @@ -2007,25 +2051,28 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a 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; } } if (argc < 3) { - cli_print(cli, "Invalid arguments"); + cli_error(cli, "Invalid arguments"); return CLI_OK; } if ((i = find_bgp_neighbour(argv[0])) == -2) { - cli_print(cli, "Invalid neighbour"); + cli_error(cli, "Invalid neighbour"); return CLI_OK; } if (i == -1) { - cli_print(cli, "Too many neighbours (max %d)", BGP_NUM_PEERS); + cli_error(cli, "Too many neighbours (max %d)", BGP_NUM_PEERS); return CLI_OK; } @@ -2034,30 +2081,51 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a int as = atoi(argv[2]); if (as < 0 || as > 65535) { - cli_print(cli, "Invalid autonomous system number"); + cli_error(cli, "Invalid autonomous system number"); return CLI_OK; } if (!config->neighbour[i].name[0]) { - snprintf(config->neighbour[i].name, sizeof(config->neighbour[i].name), argv[0]); + 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_print(cli, "Invalid arguments"); + cli_error(cli, "Invalid arguments"); return CLI_OK; } if (!config->neighbour[i].name[0]) { - cli_print(cli, "Specify remote-as first"); + cli_error(cli, "Specify remote-as first"); return CLI_OK; } @@ -2066,13 +2134,13 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a if (keepalive < 1 || keepalive > 65535) { - cli_print(cli, "Invalid keepalive time"); + cli_error(cli, "Invalid keepalive time"); return CLI_OK; } if (hold < 3 || hold > 65535) { - cli_print(cli, "Invalid hold time"); + cli_error(cli, "Invalid hold time"); return CLI_OK; } @@ -2085,14 +2153,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; - 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", @@ -2100,24 +2168,24 @@ static int cmd_router_bgp_no_neighbour(struct cli_def *cli, char *command, char if (argc != 1) { - cli_print(cli, "Specify a BGP neighbour"); + cli_error(cli, "Specify a BGP neighbour"); return CLI_OK; } if ((i = find_bgp_neighbour(argv[0])) == -2) { - cli_print(cli, "Invalid neighbour"); + cli_error(cli, "Invalid neighbour"); return CLI_OK; } if (i < 0 || !config->neighbour[i].name[0]) { - cli_print(cli, "Neighbour %s not configured", argv[0]); + cli_error(cli, "Neighbour %s not configured", argv[0]); return CLI_OK; } 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) @@ -2159,7 +2227,7 @@ static int cmd_show_bgp(struct cli_def *cli, char *command, char **argv, int arg "----------- ------- -------- ----- ---- ---------"); } - cli_print(cli, "%-18.18s %5d %15s %-11s %7d %7ds %5s %4s %4d %4d", + cli_print(cli, "%-18.18s %5d %15s %-11s %7d %7lds %5s %4s %4d %4d", bgp_peers[i].name, bgp_peers[i].as, addr, @@ -2275,17 +2343,6 @@ static int cmd_restart_bgp(struct cli_def *cli, char *command, char **argv, int #endif /* BGP*/ static int filt; -static int find_access_list(char const *name) -{ - int i; - - for (i = 0; i < MAXFILTER; i++) - if (!(*ip_filters[i].name && strcmp(ip_filters[i].name, name))) - return i; - - return -1; -} - static int access_list(struct cli_def *cli, char **argv, int argc, int add) { int extended; @@ -2315,7 +2372,7 @@ static int access_list(struct cli_def *cli, char **argv, int argc, int add) if (argc != 2) { - cli_print(cli, "Specify access-list type and name"); + cli_error(cli, "Specify access-list type and name"); return CLI_OK; } @@ -2325,23 +2382,23 @@ static int access_list(struct cli_def *cli, char **argv, int argc, int add) extended = 1; else { - cli_print(cli, "Invalid access-list type"); + cli_error(cli, "Invalid access-list type"); return CLI_OK; } if (strlen(argv[1]) > sizeof(ip_filters[0].name) - 1 || strspn(argv[1], "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-") != strlen(argv[1])) { - cli_print(cli, "Invalid access-list name"); + cli_error(cli, "Invalid access-list name"); return CLI_OK; } - filt = find_access_list(argv[1]); + filt = find_filter(argv[1], strlen(argv[1])); if (add) { if (filt < 0) { - cli_print(cli, "Too many access-lists"); + cli_error(cli, "Too many access-lists"); return CLI_OK; } @@ -2354,7 +2411,7 @@ static int access_list(struct cli_def *cli, char **argv, int argc, int add) } else if (ip_filters[filt].extended != extended) { - cli_print(cli, "Access-list is %s", + cli_error(cli, "Access-list is %s", ip_filters[filt].extended ? "extended" : "standard"); return CLI_OK; @@ -2366,14 +2423,14 @@ static int access_list(struct cli_def *cli, char **argv, int argc, int add) if (filt < 0 || !*ip_filters[filt].name) { - cli_print(cli, "Access-list not defined"); + cli_error(cli, "Access-list not defined"); return CLI_OK; } // racy if (ip_filters[filt].used) { - cli_print(cli, "Access-list in use"); + cli_error(cli, "Access-list in use"); return CLI_OK; } @@ -2391,7 +2448,7 @@ static int cmd_no_ip_access_list(struct cli_def *cli, char *command, char **argv return access_list(cli, argv, argc, 0); } -static int show_ip_wild(char *buf, ipt ip, ipt wild) +static int show_ip_wild(char *buf, in_addr_t ip, in_addr_t wild) { if (ip == INADDR_ANY && wild == INADDR_BROADCAST) return sprintf(buf, " any"); @@ -2472,7 +2529,7 @@ static char const *show_access_list_rule(int extended, ip_filter_rulet *rule) return buf; } -ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char **argv, int argc) +static ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char **argv, int argc) { static ip_filter_rulet rule; struct in_addr addr; @@ -2499,7 +2556,7 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * if (argc < 3) { - cli_print(cli, "Specify rule details"); + cli_error(cli, "Specify rule details"); return NULL; } @@ -2516,14 +2573,14 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * rule.proto = IPPROTO_TCP; else { - cli_print(cli, "Invalid protocol \"%s\"", argv[0]); + cli_error(cli, "Invalid protocol \"%s\"", argv[0]); return NULL; } for (a = 1, i = 0; i < 2; i++) { - ipt *ip; - ipt *wild; + in_addr_t *ip; + in_addr_t *wild; ip_filter_portt *port; if (i == 0) @@ -2539,7 +2596,7 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * port = &rule.dst_ports; if (a >= argc) { - cli_print(cli, "Specify destination"); + cli_error(cli, "Specify destination"); return NULL; } } @@ -2554,13 +2611,13 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * { if (++a >= argc) { - cli_print(cli, "Specify host ip address"); + cli_error(cli, "Specify host ip address"); return NULL; } if (!inet_aton(argv[a], &addr)) { - cli_print(cli, "Cannot parse IP \"%s\"", argv[a]); + cli_error(cli, "Cannot parse IP \"%s\"", argv[a]); return NULL; } @@ -2572,13 +2629,13 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * { if (a >= argc - 1) { - cli_print(cli, "Specify %s ip address and wildcard", i ? "destination" : "source"); + cli_error(cli, "Specify %s ip address and wildcard", i ? "destination" : "source"); return NULL; } if (!inet_aton(argv[a], &addr)) { - cli_print(cli, "Cannot parse IP \"%s\"", argv[a]); + cli_error(cli, "Cannot parse IP \"%s\"", argv[a]); return NULL; } @@ -2586,7 +2643,7 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * if (!inet_aton(argv[++a], &addr)) { - cli_print(cli, "Cannot parse IP \"%s\"", argv[a]); + cli_error(cli, "Cannot parse IP \"%s\"", argv[a]); return NULL; } @@ -2614,13 +2671,13 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * if (++a >= argc) { - cli_print(cli, "Specify port"); + cli_error(cli, "Specify port"); return NULL; } if (!(port->port = atoi(argv[a]))) { - cli_print(cli, "Invalid port \"%s\"", argv[a]); + cli_error(cli, "Invalid port \"%s\"", argv[a]); return NULL; } @@ -2630,13 +2687,13 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * if (a >= argc) { - cli_print(cli, "Specify port"); + cli_error(cli, "Specify port"); return NULL; } if (!(port->port2 = atoi(argv[a])) || port->port2 < port->port) { - cli_print(cli, "Invalid port \"%s\"", argv[a]); + cli_error(cli, "Invalid port \"%s\"", argv[a]); return NULL; } @@ -2659,13 +2716,13 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * if (++a >= argc) { - cli_print(cli, "Specify tcp flags"); + cli_error(cli, "Specify tcp flags"); return NULL; } while (a < argc && (argv[a][0] == '+' || argv[a][0] == '-')) { - u8 *f; + uint8_t *f; f = (argv[a][0] == '+') ? &rule.tcp_sflags : &rule.tcp_cflags; @@ -2677,7 +2734,7 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * else if (MATCH("urg", &argv[a][1])) *f |= TCP_FLAG_URG; else { - cli_print(cli, "Invalid tcp flag \"%s\"", argv[a]); + cli_error(cli, "Invalid tcp flag \"%s\"", argv[a]); return NULL; } @@ -2688,20 +2745,26 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * if (a < argc && MATCH("fragments", argv[a])) { + if (rule.src_ports.op || rule.dst_ports.op || rule.tcp_flag_op) + { + cli_error(cli, "Can't specify \"fragments\" on rules with layer 4 matches"); + return NULL; + } + rule.frag = 1; a++; } if (a < argc) { - cli_print(cli, "Invalid flag \"%s\"", argv[a]); + cli_error(cli, "Invalid flag \"%s\"", argv[a]); return NULL; } return &rule; } -ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char **argv, int argc) +static ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char **argv, int argc) { static ip_filter_rulet rule; struct in_addr addr; @@ -2752,7 +2815,7 @@ ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char * if (argc < 1) { - cli_print(cli, "Specify rule details"); + cli_error(cli, "Specify rule details"); return NULL; } @@ -2771,13 +2834,13 @@ ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char * { if (argc != 2) { - cli_print(cli, "Specify host ip address"); + cli_error(cli, "Specify host ip address"); return NULL; } if (!inet_aton(argv[1], &addr)) { - cli_print(cli, "Cannot parse IP \"%s\"", argv[1]); + cli_error(cli, "Cannot parse IP \"%s\"", argv[1]); return NULL; } @@ -2788,13 +2851,13 @@ ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char * { if (argc > 2) { - cli_print(cli, "Specify source ip address and wildcard"); + cli_error(cli, "Specify source ip address and wildcard"); return NULL; } if (!inet_aton(argv[0], &addr)) { - cli_print(cli, "Cannot parse IP \"%s\"", argv[0]); + cli_error(cli, "Cannot parse IP \"%s\"", argv[0]); return NULL; } @@ -2804,7 +2867,7 @@ ip_filter_rulet *access_list_rule_std(struct cli_def *cli, char *command, char * { if (!inet_aton(argv[1], &addr)) { - cli_print(cli, "Cannot parse IP \"%s\"", argv[1]); + cli_error(cli, "Cannot parse IP \"%s\"", argv[1]); return NULL; } @@ -2835,11 +2898,11 @@ static int cmd_ip_access_list_rule(struct cli_def *cli, char *command, char **ar 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; } - cli_print(cli, "Too many rules"); + cli_error(cli, "Too many rules"); return CLI_OK; } @@ -2875,7 +2938,7 @@ static int cmd_filter(struct cli_def *cli, char *command, char **argv, int argc) if (!config->cluster_iam_master) { - cli_print(cli, "Can't do this on a slave. Do it on %s", + cli_error(cli, "Can't do this on a slave. Do it on %s", fmtaddr(config->cluster_master_address, 0)); return CLI_OK; @@ -2883,13 +2946,13 @@ static int cmd_filter(struct cli_def *cli, char *command, char **argv, int argc) if (argc != 3 && argc != 5) { - cli_print(cli, "Specify a user and filters"); + cli_error(cli, "Specify a user and filters"); return CLI_OK; } if (!(s = sessionbyuser(argv[0]))) { - cli_print(cli, "User %s is not connected", argv[0]); + cli_error(cli, "User %s is not connected", argv[0]); return CLI_OK; } @@ -2903,7 +2966,7 @@ static int cmd_filter(struct cli_def *cli, char *command, char **argv, int argc) { if (session[s].filter_in) { - cli_print(cli, "Input already filtered"); + cli_error(cli, "Input already filtered"); return CLI_OK; } f = &cli_session_actions[s].filter_in; @@ -2912,21 +2975,21 @@ static int cmd_filter(struct cli_def *cli, char *command, char **argv, int argc) { if (session[s].filter_out) { - cli_print(cli, "Output already filtered"); + cli_error(cli, "Output already filtered"); return CLI_OK; } f = &cli_session_actions[s].filter_out; } else { - cli_print(cli, "Invalid filter specification"); + cli_error(cli, "Invalid filter specification"); return CLI_OK; } - v = find_access_list(argv[i+1]); + v = find_filter(argv[i+1], strlen(argv[i+1])); if (v < 0 || !*ip_filters[v].name) { - cli_print(cli, "Access-list %s not defined", argv[i+1]); + cli_error(cli, "Access-list %s not defined", argv[i+1]); return CLI_OK; } @@ -2950,7 +3013,7 @@ static int cmd_no_filter(struct cli_def *cli, char *command, char **argv, int ar if (!config->cluster_iam_master) { - cli_print(cli, "Can't do this on a slave. Do it on %s", + cli_error(cli, "Can't do this on a slave. Do it on %s", fmtaddr(config->cluster_master_address, 0)); return CLI_OK; @@ -2958,7 +3021,7 @@ static int cmd_no_filter(struct cli_def *cli, char *command, char **argv, int ar if (!argc) { - cli_print(cli, "Specify a user to remove filters from"); + cli_error(cli, "Specify a user to remove filters from"); return CLI_OK; } @@ -2966,7 +3029,7 @@ static int cmd_no_filter(struct cli_def *cli, char *command, char **argv, int ar { if (!(s = sessionbyuser(argv[i]))) { - cli_print(cli, "User %s is not connected", argv[i]); + cli_error(cli, "User %s is not connected", argv[i]); continue; } @@ -2977,7 +3040,7 @@ static int cmd_no_filter(struct cli_def *cli, char *command, char **argv, int ar } else { - cli_print(cli, "User %s not filtered", argv[i]); + cli_error(cli, "User %s not filtered", argv[i]); } } @@ -2993,23 +3056,23 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv, if (argc < 1) { - cli_print(cli, "Specify a filter name"); + cli_error(cli, "Specify a filter name"); return CLI_OK; } for (i = 0; i < argc; i++) { - int f = find_access_list(argv[i]); + int f = find_filter(argv[i], strlen(argv[i])); ip_filter_rulet *rules; if (f < 0 || !*ip_filters[f].name) { - cli_print(cli, "Access-list %s not defined", argv[i]); + cli_error(cli, "Access-list %s not defined", argv[i]); return CLI_OK; } if (i) - cli_print(cli, ""); + cli_print(cli, " "); cli_print(cli, "%s IP access list %s", ip_filters[f].extended ? "Extended" : "Standard", @@ -3019,7 +3082,7 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv, { 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); @@ -3029,12 +3092,91 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv, 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; +} + +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; }