X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/69d5f5d08543d16f65e331e18a0d6b65154e30dc..d80d528b9a13dc15c58b3098a221f2ad5bf203c7:/cli.c?ds=inline diff --git a/cli.c b/cli.c index c2e54be..495222d 100644 --- a/cli.c +++ b/cli.c @@ -2,7 +2,7 @@ // vim: sw=8 ts=8 char const *cvs_name = "$Name: $"; -char const *cvs_id_cli = "$Id: cli.c,v 1.51 2005-01-13 08:26:25 bodea Exp $"; +char const *cvs_id_cli = "$Id: cli.c,v 1.56 2005-05-05 10:02:07 bodea Exp $"; #include #include @@ -364,16 +364,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; } @@ -406,14 +406,13 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int cli_print(cli, "\tCalled Num:\t%s", session[s].called); cli_print(cli, "\tTunnel ID:\t%d", session[s].tunnel); 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, "\tUnique SID:\t%u", 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%u/%u", session[s].total_cout, session[s].total_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%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) @@ -478,7 +477,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", @@ -486,6 +485,7 @@ static int cmd_show_session(struct cli_def *cli, char *command, char **argv, int "I", "T", "G", + "6", "opened", "downloaded", "uploaded", @@ -496,7 +496,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 : "*", @@ -504,6 +504,7 @@ 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].flags & SF_IPV6CP_ACKED) ? "Y" : "N", abs(time_now - (unsigned long)session[i].opened), (unsigned long)session[i].total_cout, (unsigned long)session[i].total_cin, @@ -700,18 +701,22 @@ static int cmd_show_counters(struct cli_def *cli, char *command, char **argv, in cli_print(cli, "-----------------------------------------"); 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)); @@ -896,7 +901,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; } @@ -1150,7 +1155,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; @@ -1158,7 +1163,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; } @@ -1166,7 +1171,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; } @@ -1191,7 +1196,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; @@ -1199,7 +1204,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; } @@ -1207,19 +1212,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; } @@ -1241,7 +1246,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; @@ -1249,7 +1254,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; } @@ -1257,7 +1262,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; } @@ -1268,7 +1273,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); } } @@ -1308,7 +1313,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; @@ -1316,27 +1321,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; } @@ -1359,7 +1364,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; @@ -1367,7 +1372,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; } @@ -1375,7 +1380,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; } @@ -1433,7 +1438,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; @@ -1441,13 +1446,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; } @@ -1460,7 +1465,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; } } @@ -1477,20 +1482,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; } @@ -1504,7 +1509,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; } @@ -1525,7 +1530,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; @@ -1533,7 +1538,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; } @@ -1541,7 +1546,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; } @@ -1552,7 +1557,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]); } } @@ -1617,7 +1622,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; @@ -1663,7 +1668,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; @@ -1679,7 +1684,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; } @@ -1689,7 +1694,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; } } @@ -1714,7 +1719,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; } @@ -1728,7 +1733,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; } @@ -1814,7 +1819,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; @@ -1834,7 +1839,7 @@ 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; } @@ -1875,7 +1880,7 @@ static int cmd_set(struct cli_def *cli, char *command, char **argv, int argc) *(int *) value = 0; break; default: - cli_print(cli, "Unknown variable type"); + cli_error(cli, "Unknown variable type"); break; } config->reload_config = 1; @@ -1883,7 +1888,7 @@ 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; } @@ -1916,7 +1921,7 @@ int regular_stuff(struct cli_def *cli) if (!(p = strchr(m, '\n'))) p = m + strlen(p); - 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, @@ -1943,13 +1948,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; } @@ -2043,19 +2048,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; } @@ -2064,7 +2069,7 @@ 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; } @@ -2081,13 +2086,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; } @@ -2096,13 +2101,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; } @@ -2130,19 +2135,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; } @@ -2345,7 +2350,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; } @@ -2355,14 +2360,14 @@ 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; } @@ -2371,7 +2376,7 @@ static int access_list(struct cli_def *cli, char **argv, int argc, int add) { if (filt < 0) { - cli_print(cli, "Too many access-lists"); + cli_error(cli, "Too many access-lists"); return CLI_OK; } @@ -2384,7 +2389,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; @@ -2396,14 +2401,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; } @@ -2502,7 +2507,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; @@ -2529,7 +2534,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; } @@ -2546,7 +2551,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; } @@ -2569,7 +2574,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; } } @@ -2584,13 +2589,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; } @@ -2602,13 +2607,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; } @@ -2616,7 +2621,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; } @@ -2644,13 +2649,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; } @@ -2660,13 +2665,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; } @@ -2689,7 +2694,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; } @@ -2707,7 +2712,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; } @@ -2720,7 +2725,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; } @@ -2730,14 +2735,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; @@ -2788,7 +2793,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; } @@ -2807,13 +2812,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; } @@ -2824,13 +2829,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; } @@ -2840,7 +2845,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; } @@ -2875,7 +2880,7 @@ static int cmd_ip_access_list_rule(struct cli_def *cli, char *command, char **ar return CLI_OK; } - cli_print(cli, "Too many rules"); + cli_error(cli, "Too many rules"); return CLI_OK; } @@ -2911,7 +2916,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; @@ -2919,13 +2924,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; } @@ -2939,7 +2944,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; @@ -2948,21 +2953,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]); 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; } @@ -2986,7 +2991,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; @@ -2994,7 +2999,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; } @@ -3002,7 +3007,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; } @@ -3013,7 +3018,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]); } } @@ -3029,7 +3034,7 @@ 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; } @@ -3040,7 +3045,7 @@ static int cmd_show_access_list(struct cli_def *cli, char *command, char **argv, 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; }