// L2TPNS Command Line Interface
-// vim: sw=4 ts=8
+// vim: sw=8 ts=8
char const *cvs_name = "$Name: $";
-char const *cvs_id_cli = "$Id: cli.c,v 1.12 2004/08/26 04:38:40 fred_nerk Exp $";
+char const *cvs_id_cli = "$Id: cli.c,v 1.15 2004/09/02 04:18:07 fred_nerk Exp $";
#include <stdio.h>
#include <stdarg.h>
#endif
extern struct cli_session_actions *cli_session_actions;
extern struct cli_tunnel_actions *cli_tunnel_actions;
+extern tbft *filter_list;
char *debug_levels[] = {
"CRIT",
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)
close(bgp_peers[i].sock);
#endif /* BGP */
+ if (getpeername(sockfd, (struct sockaddr *)&addr, &l) == 0)
{
- int require_auth = 1;
- struct sockaddr_in addr;
- int l = sizeof(addr);
- if (getpeername(sockfd, (struct sockaddr *)&addr, &l) == 0)
- {
- log(3, 0, 0, 0, "Accepted connection to CLI from %s\n", inet_toa(addr.sin_addr.s_addr));
- require_auth = addr.sin_addr.s_addr != inet_addr("127.0.0.1");
- }
- else
- log(0, 0, 0, 0, "getpeername() failed on cli socket. Requiring authentication: %s\n", strerror(errno));
+ log(3, 0, 0, 0, "Accepted connection to CLI from %s\n", inet_toa(addr.sin_addr.s_addr));
+ require_auth = addr.sin_addr.s_addr != inet_addr("127.0.0.1");
+ }
+ else
+ log(0, 0, 0, 0, "getpeername() failed on cli socket. Requiring authentication: %s\n", strerror(errno));
- if (require_auth)
- {
- log(3, 0, 0, 0, "CLI is remote, requiring authentication\n");
- if (!cli->users) /* paranoia */
- {
- log(0, 0, 0, 0, "No users for remote authentication! Exiting CLI\n");
- exit(0);
- }
- }
- else
+ if (require_auth)
+ {
+ log(3, 0, 0, 0, "CLI is remote, requiring authentication\n");
+ if (!cli->users) /* paranoia */
{
- /* no username/pass required */
- cli->users = 0;
+ log(0, 0, 0, 0, "No users for remote authentication! Exiting CLI\n");
+ exit(0);
}
}
+ else
+ {
+ /* no username/pass required */
+ cli->users = 0;
+ }
debug_session = 0;
debug_tunnel = 0;
cli_loop(cli, sockfd);
close(sockfd);
- log(3, 0, 0, 0, "Closed CLI connection\n");
+ log(3, 0, 0, 0, "Closed CLI connection from %s\n", inet_toa(addr.sin_addr.s_addr));
exit(0);
}
// Show individual session
for (i = 0; i < argc; i++)
{
- unsigned int s;
+ unsigned int s, b_in, b_out;
s = atoi(argv[i]);
if (s <= 0 || s >= MAXSESSION)
{
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, " HSD sid: %lu", session[s].sid);
+ 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, " 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, " Filter BucketI: %d", session[s].tbf_in);
- cli_print(cli, " Filter BucketO: %d", session[s].tbf_out);
+ 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",
+ "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",
+ b_in,
+ (filter_list[b_in].next ? "*" : " "),
+ filter_list[b_in].rate * 8,
+ filter_list[b_in].credit,
+ filter_list[b_in].queued,
+ filter_list[b_in].b_queued,
+ filter_list[b_in].p_queued,
+ filter_list[b_in].b_sent,
+ filter_list[b_in].p_sent,
+ filter_list[b_in].p_dropped,
+ filter_list[b_in].p_delayed);
+
+ if (b_out)
+ cli_print(cli, " TBFO#%d%1s %5d %6d %6d | %7d %7d %8d %8d %8d %8d",
+ b_out,
+ (filter_list[b_out].next ? "*" : " "),
+ filter_list[b_out].rate * 8,
+ filter_list[b_out].credit,
+ filter_list[b_out].queued,
+ filter_list[b_out].b_queued,
+ filter_list[b_out].p_queued,
+ filter_list[b_out].b_sent,
+ filter_list[b_out].p_sent,
+ filter_list[b_out].p_dropped,
+ filter_list[b_out].p_delayed);
+
}
return CLI_OK;
}
int cmd_throttle(struct cli_def *cli, char *command, char **argv, int argc)
{
- int i;
+ int rate_in = 0;
+ int rate_out = 0;
sessionidt s;
if (CLI_HELP_REQUESTED)
- return cli_arg_help(cli, argc > 1,
- "USER", "Username of session to throttle", NULL);
+ {
+ switch (argc)
+ {
+ case 1:
+ return cli_arg_help(cli, 0, "user", "Username of session to throttle", NULL);
+
+ case 2:
+ return cli_arg_help(cli, 1, "rate", "Incoming rate in kb/s", NULL);
+
+ case 3:
+ return cli_arg_help(cli, 1, "rate", "Outgoing rate in kb/s", NULL);
+
+ default:
+ return cli_arg_help(cli, argc > 1, "user", "Username of session to throttle", NULL);
+ }
+ }
if (!config->cluster_iam_master)
{
return CLI_OK;
}
- if (!argc)
+ if (argc == 0)
{
- cli_print(cli, "Specify a user");
+ cli_print(cli, "You must specify at least a username");
return CLI_OK;
}
- for (i = 0; i < argc; i++)
- {
- if (!(s = sessionbyuser(argv[i])))
- {
- cli_print(cli, "User %s is not connected", argv[i]);
- continue;
- }
+ rate_in = rate_out = config->rl_rate;
+ if (argc >= 2) rate_in = atoi(argv[1]);
+ if (argc >= 3) rate_out = atoi(argv[2]);
- if (session[s].throttle)
- {
- cli_print(cli, "User %s already throttled", argv[i]);
- continue;
- }
+ if (!(s = sessionbyuser(argv[0])))
+ {
+ cli_print(cli, "User %s is not connected", argv[0]);
+ return CLI_OK;
+ }
- cli_print(cli, "Throttling user %s", argv[i]);
- cli_session_actions[s].throttle = config->rl_rate; // could be configurable at some stage
- cli_session_actions[s].action |= CLI_SESS_THROTTLE;
+ if (session[s].throttle)
+ {
+ cli_print(cli, "User %s already throttled, unthrottle first", 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;
}
case 3:
if (!argv[2][1])
- return cli_arg_help(cli, 1, NULL);
+ return cli_arg_help(cli, 1, NULL);
default:
return CLI_OK;
projects / l2tpns.git / blobdiff