X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/6b1075b65c4239e97629f3a891f49f5ae9ef3d4b..7bc0c67c3a6748a89c55d98caaf844f65ffd0e1f:/cli.c?ds=inline diff --git a/cli.c b/cli.c index a02f645..75bbe05 100644 --- a/cli.c +++ b/cli.c @@ -2,10 +2,12 @@ // vim: sw=8 ts=8 char const *cvs_name = "$Name: $"; -char const *cvs_id_cli = "$Id: cli.c,v 1.41 2004/12/16 08:49:52 bodea Exp $"; +char const *cvs_id_cli = "$Id: cli.c,v 1.71 2005/12/06 09:43:42 bodea Exp $"; #include +#include #include +#include #include #include #include @@ -19,11 +21,12 @@ char const *cvs_id_cli = "$Id: cli.c,v 1.41 2004/12/16 08:49:52 bodea Exp $"; #include #include #include -#include #include -#include #include +#include + #include "l2tpns.h" +#include "constants.h" #include "util.h" #include "cluster.h" #include "tbf.h" @@ -48,15 +51,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 +61,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 +86,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 +99,13 @@ 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 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 @@ -147,7 +154,7 @@ 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, "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"); @@ -283,13 +290,14 @@ 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 +317,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 +326,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 +367,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 +408,28 @@ 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); + 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,7 +492,7 @@ 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 %4s %-32s %-15s %s %s %s %s %10s %10s %10s %4s %-15s %s", "SID", "TID", "Username", @@ -481,6 +500,7 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int "I", "T", "G", + "6", "opened", "downloaded", "uploaded", @@ -491,7 +511,7 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int for (i = 1; i < MAXSESSION; i++) { if (!session[i].opened) continue; - cli_print(cli, "%5d %4d %-32s %-15s %s %s %s %10u %10lu %10lu %4u %-15s %s", + cli_print(cli, "%5d %4d %-32s %-15s %s %s %s %s %10u %10lu %10lu %4u %-15s %s", i, session[i].tunnel, session[i].user[0] ? session[i].user : "*", @@ -499,9 +519,10 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int (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), session[i].calling[0] ? session[i].calling : "*"); @@ -639,29 +660,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,56 +692,88 @@ 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_clear_counters(struct cli_def *cli, char *command, char **argv, int argc) +{ + if (CLI_HELP_REQUESTED) + return CLI_HELP_NO_ARGS; + + memset(_statistics, 0, sizeof(struct Tstats)); + SET_STAT(last_reset, time(NULL)); + + cli_print(cli, "Counters cleared"); + return CLI_OK; +} +#endif /* STATISTICS */ + static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int argc) { int tag = 0; @@ -754,7 +808,7 @@ static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int p = "HEAD"; e = strpbrk(p, " \t$"); - cli_print(cli, "Tag: %.*s", e ? e - p + 1 : strlen(p), p); + cli_print(cli, "Tag: %.*s", (int) (e ? e - p + 1 : strlen(p)), p); } if (file) @@ -774,7 +828,6 @@ static int cmd_show_version(struct cli_def *cli, char *command, char **argv, int 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); @@ -837,7 +890,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 +929,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 +939,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 +950,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"); @@ -990,6 +1038,7 @@ static int cmd_show_radius(struct cli_def *cli, char *command, char **argv, int "IPCP", "START", "STOP", + "INTRM", "WAIT", }; @@ -1104,16 +1153,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 +1164,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 +1172,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 +1180,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 +1205,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 +1213,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 +1221,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 +1255,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 +1263,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 +1271,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; } @@ -1243,7 +1282,7 @@ static int cmd_drop_session(struct cli_def *cli, char *command, char **argv, int } else { - cli_print(cli, "Session %d is not active.", s); + cli_error(cli, "Session %d is not active.", s); } } @@ -1283,7 +1322,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 +1330,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 +1373,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 +1381,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 +1389,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 +1447,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 +1455,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 +1474,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 +1491,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 +1518,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 +1539,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 +1547,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 +1555,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 +1566,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 +1631,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 +1677,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 +1693,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 +1703,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 +1728,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 +1742,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 +1828,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 +1848,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 +1862,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,16 +1894,16 @@ 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) { +#ifdef RINGBUFFER int out = 0; int i; -#ifdef RINGBUFFER for (i = debug_rb_tail; i != ringbuffer->tail; i = (i + 1) % RINGBUFFER_SIZE) { char *m = ringbuffer->buffer[i].message; @@ -1886,13 +1925,13 @@ int regular_stuff(struct cli_def *cli) if (!show) continue; if (!(p = strchr(m, '\n'))) - p = m + strlen(p); + p = m + strlen(m); - cli_print(cli, "\r%s-%u-%u %.*s", + cli_error(cli, "\r%s-%u-%u %.*s", debug_levels[(int)ringbuffer->buffer[i].level], ringbuffer->buffer[i].tunnel, ringbuffer->buffer[i].session, - p - m, m); + (int) (p - m), m); out++; } @@ -1915,13 +1954,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; } @@ -2015,19 +2054,19 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a 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; } @@ -2036,13 +2075,13 @@ 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; } @@ -2053,13 +2092,13 @@ static int cmd_router_bgp_neighbour(struct cli_def *cli, char *command, char **a 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; } @@ -2068,13 +2107,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; } @@ -2102,19 +2141,19 @@ 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; } @@ -2161,7 +2200,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, @@ -2277,17 +2316,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; @@ -2317,7 +2345,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; } @@ -2327,23 +2355,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; } @@ -2356,7 +2384,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; @@ -2368,14 +2396,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; } @@ -2474,7 +2502,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; @@ -2501,7 +2529,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; } @@ -2518,7 +2546,7 @@ 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; } @@ -2541,7 +2569,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; } } @@ -2556,13 +2584,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; } @@ -2574,13 +2602,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; } @@ -2588,7 +2616,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; } @@ -2616,13 +2644,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; } @@ -2632,13 +2660,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; } @@ -2661,7 +2689,7 @@ 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; } @@ -2679,7 +2707,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; } @@ -2692,7 +2720,7 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * { if (rule.src_ports.op || rule.dst_ports.op || rule.tcp_flag_op) { - cli_print(cli, "Can't specify \"fragments\" on rules with layer 4 matches"); + cli_error(cli, "Can't specify \"fragments\" on rules with layer 4 matches"); return NULL; } @@ -2702,14 +2730,14 @@ ip_filter_rulet *access_list_rule_ext(struct cli_def *cli, char *command, char * 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; @@ -2760,7 +2788,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; } @@ -2779,13 +2807,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; } @@ -2796,13 +2824,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; } @@ -2812,7 +2840,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; } @@ -2843,11 +2871,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; } @@ -2883,7 +2911,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; @@ -2891,13 +2919,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; } @@ -2911,7 +2939,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; @@ -2920,21 +2948,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; } @@ -2958,7 +2986,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; @@ -2966,7 +2994,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; } @@ -2974,7 +3002,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; } @@ -2985,7 +3013,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]); } } @@ -3001,18 +3029,18 @@ 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; } @@ -3027,7 +3055,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); @@ -3036,13 +3064,3 @@ 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]) -{ - 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); -}