// vim: sw=8 ts=8
char const *cvs_name = "$Name: $";
-char const *cvs_id_cli = "$Id: cli.c,v 1.15 2004-09-02 04:18:07 fred_nerk Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.24 2004-11-05 04:55:26 bodea Exp $";
#include <stdio.h>
#include <stdarg.h>
#include <sys/stat.h>
#include <syslog.h>
#include <malloc.h>
-#include <sched.h>
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
extern struct Tstats *_statistics;
struct cli_def *cli = NULL;
int cli_quit = 0;
-extern int clifd, udpfd, tunfd, snoopfd, ifrfd, cluster_sockfd;
-extern int *radfds;
extern struct configt *config;
extern struct config_descriptt config_values[];
#ifdef RINGBUFFER
int cmd_remove_plugin(struct cli_def *cli, char *command, char **argv, int argc);
int cmd_uptime(struct cli_def *cli, char *command, char **argv, int argc);
int regular_stuff(struct cli_def *cli);
+void parsemac(char *string, char mac[6]);
void init_cli(char *hostname)
{
cli = cli_init();
if (hostname && *hostname)
- cli_set_hostname(cli, hostname);
+ cli_set_hostname(cli, hostname);
else
- cli_set_hostname(cli, "l2tpns");
+ 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");
if (!(f = fopen(CLIUSERS, "r")))
{
- log(0, 0, 0, 0, "WARNING! No users specified. Command-line access is open to all\n");
+ LOG(0, 0, 0, 0, "WARNING! No users specified. Command-line access is open to all\n");
}
else
{
if (!strcmp(buf, "enable"))
{
cli_allow_enable(cli, p);
- log(3, 0, 0, 0, "Setting enable password\n");
+ LOG(3, 0, 0, 0, "Setting enable password\n");
}
else
{
cli_allow_user(cli, buf, p);
- log(3, 0, 0, 0, "Allowing user %s to connect to the CLI\n", buf);
+ LOG(3, 0, 0, 0, "Allowing user %s to connect to the CLI\n", buf);
}
}
fclose(f);
addr.sin_port = htons(23);
if (bind(clifd, (void *) &addr, sizeof(addr)) < 0)
{
- log(0, 0, 0, 0, "Error listening on cli port 23: %s\n", strerror(errno));
- return;
+ LOG(0, 0, 0, 0, "Error listening on cli port 23: %s\n", strerror(errno));
+ return;
}
listen(clifd, 10);
}
void cli_do(int sockfd)
{
- int i;
int require_auth = 1;
struct sockaddr_in addr;
int l = sizeof(addr);
- if (fork()) return;
- if (config->scheduler_fifo)
- {
- int ret;
- struct sched_param params = {0};
- params.sched_priority = 0;
- if ((ret = sched_setscheduler(0, SCHED_OTHER, ¶ms)) == 0)
- {
- log(3, 0, 0, 0, "Dropped FIFO scheduler\n");
- }
- else
- {
- log(0, 0, 0, 0, "Error setting scheduler to OTHER: %s\n", strerror(errno));
- log(0, 0, 0, 0, "This is probably really really bad.\n");
- }
- }
-
- signal(SIGPIPE, SIG_DFL);
- signal(SIGCHLD, SIG_DFL);
- signal(SIGHUP, SIG_DFL);
- signal(SIGUSR1, SIG_DFL);
- signal(SIGQUIT, SIG_DFL);
- signal(SIGKILL, SIG_DFL);
- signal(SIGALRM, SIG_DFL);
- signal(SIGTERM, SIG_DFL);
-
- // Close sockets
- if (udpfd) close(udpfd); udpfd = 0;
- if (tunfd) close(tunfd); tunfd = 0;
- if (snoopfd) close(snoopfd); snoopfd = 0;
- for (i = 0; i < config->num_radfds; i++)
- if (radfds[i]) close(radfds[i]);
- if (ifrfd) close(ifrfd); ifrfd = 0;
- if (cluster_sockfd) close(cluster_sockfd); cluster_sockfd = 0;
- if (clifd) close(clifd); clifd = 0;
-#ifdef BGP
- for (i = 0; i < BGP_NUM_PEERS; i++)
- if (bgp_peers[i].sock != -1)
- close(bgp_peers[i].sock);
-#endif /* BGP */
-
+ if (fork_and_close()) return;
if (getpeername(sockfd, (struct sockaddr *)&addr, &l) == 0)
{
- log(3, 0, 0, 0, "Accepted connection to CLI from %s\n", inet_toa(addr.sin_addr.s_addr));
+ LOG(3, 0, 0, 0, "Accepted connection to CLI from %s\n", inet_toa(addr.sin_addr.s_addr));
require_auth = addr.sin_addr.s_addr != inet_addr("127.0.0.1");
}
else
- log(0, 0, 0, 0, "getpeername() failed on cli socket. Requiring authentication: %s\n", strerror(errno));
+ LOG(0, 0, 0, 0, "getpeername() failed on cli socket. Requiring authentication: %s\n", strerror(errno));
if (require_auth)
{
- log(3, 0, 0, 0, "CLI is remote, requiring authentication\n");
+ LOG(3, 0, 0, 0, "CLI is remote, requiring authentication\n");
if (!cli->users) /* paranoia */
{
- log(0, 0, 0, 0, "No users for remote authentication! Exiting CLI\n");
+ LOG(0, 0, 0, 0, "No users for remote authentication! Exiting CLI\n");
exit(0);
}
}
cli_loop(cli, sockfd);
close(sockfd);
- log(3, 0, 0, 0, "Closed CLI connection from %s\n", inet_toa(addr.sin_addr.s_addr));
+ LOG(3, 0, 0, 0, "Closed CLI connection from %s\n", inet_toa(addr.sin_addr.s_addr));
exit(0);
}
void cli_print_log(struct cli_def *cli, char *string)
{
- log(3, 0, 0, 0, "%s\n", string);
+ LOG(3, 0, 0, 0, "%s\n", string);
}
void cli_do_file(FILE *fh)
{
- log(3, 0, 0, 0, "Reading configuration file\n");
+ LOG(3, 0, 0, 0, "Reading configuration file\n");
cli_print_callback(cli, cli_print_log);
cli_file(cli, fh, PRIVILEGE_PRIVILEGED, MODE_CONFIG);
cli_print_callback(cli, NULL);
va_end(ap);
if (cr_ok)
- cli_print(cli, " <cr>");
+ cli_print(cli, " <cr>");
return CLI_OK;
}
continue;
}
cli_print(cli, "\r\nSession %d:", s);
- cli_print(cli, " User: %s", session[s].user[0] ? session[s].user : "none");
- cli_print(cli, " Calling Num: %s", session[s].calling);
- cli_print(cli, " Called Num: %s", session[s].called);
- cli_print(cli, " Tunnel ID: %d", session[s].tunnel);
- cli_print(cli, " IP address: %s", inet_toa(htonl(session[s].ip)));
- cli_print(cli, " Unique SID: %lu", session[s].unique_id);
- cli_print(cli, " Idle time: %u seconds", abs(time_now - session[s].last_packet));
- cli_print(cli, " Next Recv: %u", session[s].nr);
- cli_print(cli, " Next Send: %u", session[s].ns);
- cli_print(cli, " Bytes In/Out: %lu/%lu", (unsigned long)session[s].total_cout, (unsigned long)session[s].total_cin);
- cli_print(cli, " Pkts In/Out: %lu/%lu", (unsigned long)session[s].pout, (unsigned long)session[s].pin);
- cli_print(cli, " MRU: %d", session[s].mru);
- cli_print(cli, " Radius Session: %u", session[s].radius);
- cli_print(cli, " Rx Speed: %lu", session[s].rx_connect_speed);
- cli_print(cli, " Tx Speed: %lu", session[s].tx_connect_speed);
+ cli_print(cli, "\tUser:\t\t%s", session[s].user[0] ? session[s].user : "none");
+ 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, "\tIP address:\t%s", inet_toa(htonl(session[s].ip)));
+ 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, "\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);
if (session[s].snoop_ip && session[s].snoop_port)
- cli_print(cli, " Intercepted: %s:%d", inet_toa(session[s].snoop_ip), session[s] .snoop_port);
+ cli_print(cli, "\tIntercepted:\t%s:%d", inet_toa(session[s].snoop_ip), session[s] .snoop_port);
else
- cli_print(cli, " Intercepted: no");
- cli_print(cli, " Throttled: %s", session[s].throttle ? "YES" : "no");
- cli_print(cli, " Walled Garden: %s", session[s].walled_garden ? "YES" : "no");
+ cli_print(cli, "\tIntercepted:\tno");
+
+ cli_print(cli, "\tWalled Garden:\t%s", session[s].walled_garden ? "YES" : "no");
+ {
+ int t = (session[s].throttle_in || session[s].throttle_out);
+ cli_print(cli, "\tThrottled:\t%s%s%.0d%s%s%.0d%s%s",
+ t ? "YES" : "no", t ? " (" : "",
+ session[s].throttle_in, session[s].throttle_in ? "kbps" : t ? "-" : "",
+ t ? "/" : "",
+ session[s].throttle_out, session[s].throttle_out ? "kbps" : t ? "-" : "",
+ t ? ")" : "");
+ }
+
b_in = session[s].tbf_in;
b_out = session[s].tbf_out;
if (b_in || b_out)
- cli_print(cli, " %5s %6s %6s | %7s %7s %8s %8s %8s %8s",
+ cli_print(cli, "\t\t\t%5s %6s %6s | %7s %7s %8s %8s %8s %8s",
"Rate", "Credit", "Queued", "ByteIn", "PackIn",
"ByteSent", "PackSent", "PackDrop", "PackDelay");
if (b_in)
- cli_print(cli, " TBFI#%d%1s %5d %6d %6d | %7d %7d %8d %8d %8d %8d",
+ cli_print(cli, "\tTBFI#%d%1s%s\t%5d %6d %6d | %7d %7d %8d %8d %8d %8d",
b_in,
(filter_list[b_in].next ? "*" : " "),
+ (b_in < 100 ? "\t" : ""),
filter_list[b_in].rate * 8,
filter_list[b_in].credit,
filter_list[b_in].queued,
filter_list[b_in].p_delayed);
if (b_out)
- cli_print(cli, " TBFO#%d%1s %5d %6d %6d | %7d %7d %8d %8d %8d %8d",
+ cli_print(cli, "\tTBFO#%d%1s%s\t%5d %6d %6d | %7d %7d %8d %8d %8d %8d",
b_out,
(filter_list[b_out].next ? "*" : " "),
+ (b_out < 100 ? "\t" : ""),
filter_list[b_out].rate * 8,
filter_list[b_out].credit,
filter_list[b_out].queued,
}
// Show Summary
- cli_print(cli, " %s %4s %-32s %-15s %s %s %s %10s %10s %10s %4s %-15s %s",
+ cli_print(cli, "%5s %4s %-32s %-15s %s %s %s %10s %10s %10s %4s %-15s %s",
"SID",
"TID",
"Username",
"idle",
"LAC",
"CLI");
+
for (i = 1; i < MAXSESSION; i++)
{
char *userip, *tunnelip;
session[i].user[0] ? session[i].user : "*",
userip,
(session[i].snoop_ip && session[i].snoop_port) ? "Y" : "N",
- (session[i].throttle) ? "Y" : "N",
+ (session[i].throttle_in || session[i].throttle_out) ? "Y" : "N",
(session[i].walled_garden) ? "Y" : "N",
abs(time_now - (unsigned long)session[i].opened),
(unsigned long)session[i].total_cout,
continue;
}
cli_print(cli, "\r\nTunnel %d:", t);
- cli_print(cli, " State: %s", states[tunnel[t].state]);
- cli_print(cli, " Hostname: %s", tunnel[t].hostname[0] ? tunnel[t].hostname : "(none)");
- cli_print(cli, " Remote IP: %s", inet_toa(htonl(tunnel[t].ip)));
- cli_print(cli, " Remote Port: %d", tunnel[t].port);
- cli_print(cli, " Rx Window: %u", tunnel[t].window);
- cli_print(cli, " Next Recv: %u", tunnel[t].nr);
- cli_print(cli, " Next Send: %u", tunnel[t].ns);
- cli_print(cli, " Queue Len: %u", tunnel[t].controlc);
- cli_print(cli, " Last Packet Age:%u", (unsigned)(time_now - tunnel[t].last));
+ cli_print(cli, "\tState:\t\t%s", states[tunnel[t].state]);
+ cli_print(cli, "\tHostname:\t%s", tunnel[t].hostname[0] ? tunnel[t].hostname : "(none)");
+ cli_print(cli, "\tRemote IP:\t%s", inet_toa(htonl(tunnel[t].ip)));
+ cli_print(cli, "\tRemote Port:\t%d", tunnel[t].port);
+ cli_print(cli, "\tRx Window:\t%u", tunnel[t].window);
+ cli_print(cli, "\tNext Recv:\t%u", tunnel[t].nr);
+ cli_print(cli, "\tNext Send:\t%u", tunnel[t].ns);
+ cli_print(cli, "\tQueue Len:\t%u", tunnel[t].controlc);
+ cli_print(cli, "\tLast Packet Age:%u", (unsigned)(time_now - tunnel[t].last));
for (x = 0; x < MAXSESSION; x++)
- if (session[x].tunnel == t && session[x].opened && !session[x].die)
- sprintf(s, "%s%u ", s, x);
- cli_print(cli, " Sessions: %s", s);
+ if (session[x].tunnel == t && session[x].opened && !session[x].die)
+ sprintf(s, "%s%u ", s, x);
+
+ cli_print(cli, "\tSessions:\t%s", s);
}
return CLI_OK;
}
"IP",
"State",
"Sessions");
+
for (i = 1; i < MAXTUNNEL; i++)
{
int sessions = 0;
- if (!show_all && (!tunnel[i].ip || tunnel[i].die || !tunnel[i].hostname[0])) continue;
+ 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",
states[tunnel[i].state],
sessions);
}
+
return CLI_OK;
}
}
if (sargc > 0)
- return cmd_show_session(cli, "users", sargv, sargc);
+ return cmd_show_session(cli, "users", sargv, sargc);
return CLI_OK;
}
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", "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", "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", "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));
+ cli_print(cli, "%-30s%lu", "recv_forward", GET_STAT(recv_forward));
#ifdef STATISTICS
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_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_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_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_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_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
if (!ip_address_pool[i].address) continue;
if (ip_address_pool[i].assigned)
{
- cli_print(cli, "%-15s Y %8d %s",
+ cli_print(cli, "%-15s\tY %8d %s",
inet_toa(htonl(ip_address_pool[i].address)), ip_address_pool[i].session, session[ip_address_pool[i].session].user);
used++;
else
{
if (ip_address_pool[i].last)
- cli_print(cli, "%-15s N %8s [%s] %ds",
+ cli_print(cli, "%-15s\tN %8s [%s] %ds",
inet_toa(htonl(ip_address_pool[i].address)), "",
ip_address_pool[i].user, time_now - ip_address_pool[i].last);
else if (show_all)
- cli_print(cli, "%-15s N", inet_toa(htonl(ip_address_pool[i].address)));
+ cli_print(cli, "%-15s\tN", inet_toa(htonl(ip_address_pool[i].address)));
free++;
}
cli_print(cli, "set %s %d", config_values[i].key, *(int *)value);
else if (config_values[i].type == UNSIGNED_LONG)
cli_print(cli, "set %s %lu", config_values[i].key, *(unsigned long *)value);
+ else if (config_values[i].type == MAC)
+ cli_print(cli, "set %s %02x%02x.%02x%02x.%02x%02x", config_values[i].key,
+ *(unsigned short *)(value + 0),
+ *(unsigned short *)(value + 1),
+ *(unsigned short *)(value + 2),
+ *(unsigned short *)(value + 3),
+ *(unsigned short *)(value + 4),
+ *(unsigned short *)(value + 5));
}
cli_print(cli, "# Plugins");
cli_print(cli, "Plugins currently loaded:");
for (i = 0; i < MAXPLUGINS; i++)
- {
if (*config->plugins[i])
- {
cli_print(cli, " %s", config->plugins[i]);
- }
- }
+
return CLI_OK;
}
if (CLI_HELP_REQUESTED)
return CLI_HELP_NO_ARGS;
- cli_print(cli, "Token bucket filters:");
- cli_print(cli, "%-6s %8s %-4s", "ID", "Handle", "Used");
+ cli_print(cli, "%5s %4s %-32s %7s %6s %6s %6s",
+ "SID",
+ "TID",
+ "Username",
+ "Rate In",
+ "Out",
+ "TBFI",
+ "TBFO");
+
for (i = 0; i < MAXSESSION; i++)
{
- if (!session[i].throttle)
- continue;
-
- cli_print(cli, "%-6d %8d %8d",
- i,
- session[i].tbf_in,
- session[i].tbf_out);
+ if (session[i].throttle_in || session[i].throttle_out)
+ cli_print(cli, "%5d %4d %-32s %6d %6d %6d %6d",
+ i,
+ session[i].tunnel,
+ session[i].user,
+ session[i].throttle_in,
+ session[i].throttle_out,
+ session[i].tbf_in,
+ session[i].tbf_out);
}
+
return CLI_OK;
}
if (CLI_HELP_REQUESTED)
return CLI_HELP_NO_ARGS;
- cli_print(cli, " _\n"
- "//\\\n"
- "V \\\n"
- " \\ \\_\n"
- " \\,'.`-.\n"
- " |\\ `. `.\n"
- " ( \\ `. `-. _,.-:\\\n"
- " \\ \\ `. `-._ __..--' ,-';/\n"
- " \\ `. `-. `-..___..---' _.--' ,'/\n"
- " `. `. `-._ __..--' ,' /\n"
- " `. `-_ ``--..'' _.-' ,'\n"
- " `-_ `-.___ __,--' ,'\n"
- " `-.__ `----\"\"\" __.-'\n"
- "hh `--..____..--'");
+ cli_print(cli, " _\n"
+ "//\\\n"
+ "V \\\n"
+ " \\ \\_\n"
+ " \\,'.`-.\n"
+ " |\\ `. `.\n"
+ " ( \\ `. `-. _,.-:\\\n"
+ " \\ \\ `. `-._ __..--' ,-';/\n"
+ " \\ `. `-. `-..___..---' _.--' ,'/\n"
+ " `. `. `-._ __..--' ,' /\n"
+ " `. `-_ ``--..'' _.-' ,'\n"
+ " `-_ `-.___ __,--' ,'\n"
+ " `-.__ `----\"\"\" __.-'\n"
+ "hh `--..____..--'");
return CLI_OK;
}
if (argc < 3)
{
- cli_print(cli, "Specify username ip port");
+ cli_print(cli, "Specify username, ip and port");
return CLI_OK;
}
return CLI_OK;
}
- cli_print(cli, "Snooping user %s to %s:%d", argv[0], inet_toa(session[s].snoop_ip), session[s].snoop_port);
+ cli_print(cli, "Snooping user %s to %s:%d", argv[0], inet_toa(ip), port);
cli_session_actions[s].snoop_ip = ip;
cli_session_actions[s].snoop_port = port;
cli_session_actions[s].action |= CLI_SESS_SNOOP;
if (CLI_HELP_REQUESTED)
return cli_arg_help(cli, argc > 1,
- "USER", "Username of session to un-snoop", NULL);
+ "USER", "Username of session to unsnoop", NULL);
if (!config->cluster_iam_master)
{
if (!argc)
{
- cli_print(cli, "Specify a user");
+ cli_print(cli, "Specify a user to unsnoop");
return CLI_OK;
}
cli_print(cli, "Not snooping user %s", argv[i]);
cli_session_actions[s].action |= CLI_SESS_NOSNOOP;
}
+
return CLI_OK;
}
int rate_out = 0;
sessionidt s;
+ /*
+ throttle USER - throttle in/out to default rate
+ throttle USER RATE - throttle in/out to default rate
+ throttle USER in RATE - throttle input only
+ throttle USER out RATE - throttle output only
+ throttle USER in RATE out RATE - throttle both
+ */
+
if (CLI_HELP_REQUESTED)
{
switch (argc)
{
- case 1:
- return cli_arg_help(cli, 0, "user", "Username of session to throttle", NULL);
+ case 1:
+ return cli_arg_help(cli, 0,
+ "USER", "Username of session to throttle", NULL);
+
+ case 2:
+ return cli_arg_help(cli, 1,
+ "RATE", "Rate in kbps (in and out)",
+ "in", "Select incoming rate",
+ "out", "Select outgoing rate", NULL);
+
+ case 4:
+ return cli_arg_help(cli, 1,
+ "in", "Select incoming rate",
+ "out", "Select outgoing rate", NULL);
- case 2:
- return cli_arg_help(cli, 1, "rate", "Incoming rate in kb/s", NULL);
+ case 3:
+ if (isdigit(argv[1][0]))
+ return cli_arg_help(cli, 1, NULL);
- case 3:
- return cli_arg_help(cli, 1, "rate", "Outgoing rate in kb/s", NULL);
+ case 5:
+ return cli_arg_help(cli, 0, "RATE", "Rate in kbps", NULL);
- default:
- return cli_arg_help(cli, argc > 1, "user", "Username of session to throttle", NULL);
+ default:
+ return cli_arg_help(cli, argc > 1, NULL);
}
}
if (argc == 0)
{
- cli_print(cli, "You must specify at least a username");
+ cli_print(cli, "Specify a user to throttle");
return CLI_OK;
}
- rate_in = rate_out = config->rl_rate;
- if (argc >= 2) rate_in = atoi(argv[1]);
- if (argc >= 3) rate_out = atoi(argv[2]);
-
if (!(s = sessionbyuser(argv[0])))
{
cli_print(cli, "User %s is not connected", argv[0]);
return CLI_OK;
}
- if (session[s].throttle)
+ if (argc == 1)
+ {
+ rate_in = rate_out = config->rl_rate;
+ }
+ else if (argc == 2)
+ {
+ rate_in = rate_out = atoi(argv[1]);
+ if (rate_in < 1)
+ {
+ cli_print(cli, "Invalid rate \"%s\"", argv[1]);
+ return CLI_OK;
+ }
+ }
+ else if (argc == 3 || argc == 5)
+ {
+ int i;
+ for (i = 1; i < argc - 1; i += 2)
+ {
+ int len = strlen(argv[i]);
+ int r = 0;
+ if (!strncasecmp(argv[i], "in", len))
+ r = rate_in = atoi(argv[i+1]);
+ else if (!strncasecmp(argv[i], "out", len))
+ r = rate_out = atoi(argv[i+1]);
+
+ if (r < 1)
+ {
+ cli_print(cli, "Invalid rate specification \"%s %s\"", argv[i], argv[i+1]);
+ return CLI_OK;
+ }
+ }
+ }
+ else
+ {
+ cli_print(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]);
return CLI_OK;
}
+ cli_session_actions[s].throttle_in = cli_session_actions[s].throttle_out = -1;
+ if (rate_in && session[s].throttle_in != rate_in)
+ cli_session_actions[s].throttle_in = rate_in;
+
+ if (rate_out && session[s].throttle_out != rate_out)
+ cli_session_actions[s].throttle_out = rate_out;
+
+ 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]);
+ return CLI_OK;
+ }
+
cli_print(cli, "Throttling user %s", argv[0]);
- cli_session_actions[s].throttle = rate_in << 16 | rate_out;
cli_session_actions[s].action |= CLI_SESS_THROTTLE;
return CLI_OK;
if (CLI_HELP_REQUESTED)
return cli_arg_help(cli, argc > 1,
- "USER", "Username of session to un-throttle", NULL);
+ "USER", "Username of session to unthrottle", NULL);
if (!config->cluster_iam_master)
{
if (!argc)
{
- cli_print(cli, "Specify a user");
+ cli_print(cli, "Specify a user to unthrottle");
return CLI_OK;
}
continue;
}
- if (!session[s].throttle)
+ if (session[s].throttle_in || session[s].throttle_out)
+ {
+ cli_print(cli, "Unthrottling user %s", argv[i]);
+ cli_session_actions[s].action |= CLI_SESS_NOTHROTTLE;
+ }
+ else
{
cli_print(cli, "User %s not throttled", argv[i]);
- continue;
}
-
- cli_print(cli, "Unthrottling user %s", argv[i]);
- cli_session_actions[s].action |= CLI_SESS_NOTHROTTLE;
}
return CLI_OK;
if (CLI_HELP_REQUESTED)
return cli_arg_help(cli, 1,
- "all", "Enable debugging for all except \"data\"",
- "critical", "", // FIXME: add descriptions
+ "all", "Enable debugging for all except \"data\"",
+ "critical", "", // FIXME: add descriptions
"error", "",
- "warning", "",
- "info", "",
+ "warning", "",
+ "info", "",
"calls", "",
- "data", "",
+ "data", "",
NULL);
if (!argc)
{
cli_print(cli, "Currently debugging:%s%s%s%s%s%s",
(debug_flags.critical) ? " critical" : "",
- (debug_flags.error) ? " error" : "",
+ (debug_flags.error) ? " error" : "",
(debug_flags.warning) ? " warning" : "",
- (debug_flags.info) ? " info" : "",
- (debug_flags.calls) ? " calls" : "",
- (debug_flags.data) ? " data" : "");
+ (debug_flags.info) ? " info" : "",
+ (debug_flags.calls) ? " calls" : "",
+ (debug_flags.data) ? " data" : "");
return CLI_OK;
}
len = 2; /* distinguish [cr]itical from [ca]lls */
if (!strncasecmp(argv[i], "critical", len)) { debug_flags.critical = 1; continue; }
- if (!strncasecmp(argv[i], "error", len)) { debug_flags.error = 1; continue; }
+ if (!strncasecmp(argv[i], "error", len)) { debug_flags.error = 1; continue; }
if (!strncasecmp(argv[i], "warning", len)) { debug_flags.warning = 1; continue; }
- if (!strncasecmp(argv[i], "info", len)) { debug_flags.info = 1; continue; }
- if (!strncasecmp(argv[i], "calls", len)) { debug_flags.calls = 1; continue; }
- if (!strncasecmp(argv[i], "data", len)) { debug_flags.data = 1; continue; }
- if (!strncasecmp(argv[i], "all", len))
+ if (!strncasecmp(argv[i], "info", len)) { debug_flags.info = 1; continue; }
+ if (!strncasecmp(argv[i], "calls", len)) { debug_flags.calls = 1; continue; }
+ if (!strncasecmp(argv[i], "data", len)) { debug_flags.data = 1; continue; }
+ if (!strncasecmp(argv[i], "all", len))
{
memset(&debug_flags, 1, sizeof(debug_flags));
debug_flags.data = 0;
if (CLI_HELP_REQUESTED)
return cli_arg_help(cli, 1,
- "all", "Disable all debugging",
- "critical", "", // FIXME: add descriptions
+ "all", "Disable all debugging",
+ "critical", "", // FIXME: add descriptions
"error", "",
- "warning", "",
- "info", "",
+ "warning", "",
+ "info", "",
"calls", "",
- "data", "",
+ "data", "",
NULL);
if (!argc)
{
- memset(&debug_flags, 0, sizeof(debug_flags));
+ memset(&debug_flags, 0, sizeof(debug_flags));
return CLI_OK;
}
len = 2; /* distinguish [cr]itical from [ca]lls */
if (!strncasecmp(argv[i], "critical", len)) { debug_flags.critical = 0; continue; }
- if (!strncasecmp(argv[i], "error", len)) { debug_flags.error = 0; continue; }
+ if (!strncasecmp(argv[i], "error", len)) { debug_flags.error = 0; continue; }
if (!strncasecmp(argv[i], "warning", len)) { debug_flags.warning = 0; continue; }
- if (!strncasecmp(argv[i], "info", len)) { debug_flags.info = 0; continue; }
- if (!strncasecmp(argv[i], "calls", len)) { debug_flags.calls = 0; continue; }
- if (!strncasecmp(argv[i], "data", len)) { debug_flags.data = 0; continue; }
- if (!strncasecmp(argv[i], "all", len))
+ if (!strncasecmp(argv[i], "info", len)) { debug_flags.info = 0; continue; }
+ if (!strncasecmp(argv[i], "calls", len)) { debug_flags.calls = 0; continue; }
+ if (!strncasecmp(argv[i], "data", len)) { debug_flags.data = 0; continue; }
+ if (!strncasecmp(argv[i], "all", len))
{
memset(&debug_flags, 0, sizeof(debug_flags));
continue;
cli_print(cli, "Setting \"%s\" to \"%s\"", argv[0], argv[1]);
switch (config_values[i].type)
{
- case STRING:
- strncpy((char *)value, argv[1], config_values[i].size - 1);
- break;
- case INT:
- *(int *)value = atoi(argv[1]);
- break;
- case UNSIGNED_LONG:
- *(unsigned long *)value = atol(argv[1]);
- break;
- case SHORT:
- *(short *)value = atoi(argv[1]);
- break;
- case IP:
- *(unsigned *)value = inet_addr(argv[1]);
- break;
- case BOOL:
- if (strcasecmp(argv[1], "yes") == 0 || strcasecmp(argv[1], "true") == 0 || strcasecmp(argv[1], "1") == 0)
- *(int *)value = 1;
- else
- *(int *)value = 0;
- break;
- default:
- cli_print(cli, "Unknown variable type");
- break;
+ case STRING:
+ strncpy((char *)value, argv[1], config_values[i].size - 1);
+ break;
+ case INT:
+ *(int *)value = atoi(argv[1]);
+ break;
+ case UNSIGNED_LONG:
+ *(unsigned long *)value = atol(argv[1]);
+ break;
+ case SHORT:
+ *(short *)value = atoi(argv[1]);
+ break;
+ case IP:
+ *(unsigned *)value = inet_addr(argv[1]);
+ break;
+ case MAC:
+ parsemac(argv[1], (char *)value);
+ break;
+ case BOOL:
+ if (strcasecmp(argv[1], "yes") == 0 || strcasecmp(argv[1], "true") == 0 || strcasecmp(argv[1], "1") == 0)
+ *(int *)value = 1;
+ else
+ *(int *)value = 0;
+ break;
+ default:
+ cli_print(cli, "Unknown variable type");
+ break;
}
config->reload_config = 1;
return CLI_OK;
{
// 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;
+ 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;
}
if (show_message)
#endif
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);
+}
projects / l2tpns.git / blobdiff