GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

occtl: combined stats and status cmd

Browse Source 
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
This commit is contained in:
Nikos Mavrogiannopoulos
2017-04-24 19:35:38 +02:00
parent 03c81b190a
commit 5c20ad2c61
3 changed files with 5 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/occtl/occtl.c
View File

@@ -56,9 +56,7 @@ static const commands_st commands[] = {
ENTRY("reload", NULL, handle_reload_cmd,
"Reloads the server configuration", 1, 1),
ENTRY("show status", NULL, handle_status_cmd,
"Prints the status of the server", 1, 1),
ENTRY("show stats", NULL, handle_stats_cmd,
"Prints statistics of the server operation", 1, 1),
"Prints the status and statistics of the server", 1, 1),
ENTRY("show users", NULL, handle_list_users_cmd,
"Prints the connected users", 1, 1),
ENTRY("show ip bans", NULL, handle_list_banned_ips_cmd,

1
src/occtl/occtl.h
View File

@@ -78,7 +78,6 @@ void conn_posthandle(CONN_TYPE *ctx);
typedef int (*cmd_func) (CONN_TYPE * conn, const char *arg, cmd_params_st *params);
int handle_status_cmd(CONN_TYPE * conn, const char *arg, cmd_params_st *params);
int handle_stats_cmd(CONN_TYPE * conn, const char *arg, cmd_params_st *params);
int handle_list_users_cmd(CONN_TYPE * conn, const char *arg, cmd_params_st *params);
int handle_list_iroutes_cmd(CONN_TYPE * conn, const char *arg, cmd_params_st *params);
int handle_list_banned_ips_cmd(CONN_TYPE * conn, const char *arg, cmd_params_st *params);

67
src/occtl/unix.c
View File

@@ -208,7 +208,7 @@ int handle_status_cmd(struct unix_ctx *ctx, const char *arg, cmd_params_st *para
print_start_block(stdout, params);
if (NO_JSON(params))
printf("OpenConnect SSL VPN server\n");
printf("Note: the printed statistics are not real-time\n");
ret = send_cmd(ctx, CTL_CMD_STATUS, NULL, NULL, NULL, &raw);
if (ret < 0) {
@@ -221,74 +221,15 @@ int handle_status_cmd(struct unix_ctx *ctx, const char *arg, cmd_params_st *para
print_single_value(stdout, params, "Status", rep->status != 0 ? "online" : "error", 1);
if (rep->status) {
print_single_value_int(stdout, params, "Server PID", rep->pid, 1);
print_single_value_int(stdout, params, "Sec-mod PID", rep->sec_mod_pid, 0);
t = rep->start_time;
tm = localtime(&t);
print_time_ival7(buf, time(0), t);
strftime(str_since, sizeof(str_since), DATE_TIME_FMT, tm);
print_single_value_ex(stdout, params, "Up since", str_since, buf, 1);
print_single_value_int(stdout, params, "Clients", rep->active_clients, 1);
if (params->debug) {
print_single_value_int(stdout, params, "Sec-mod client entries", rep->secmod_client_entries, 1);
print_single_value_int(stdout, params, "TLS DB entries", rep->stored_tls_sessions, 1);
}
print_single_value_int(stdout, params, "IPs in ban list", rep->banned_ips, 1);
}
print_end_block(stdout, params, 0);
status_rep__free_unpacked(rep, &pa);
ret = 0;
goto cleanup;
error_status:
print_single_value(stdout, params, "Status", "offline", 0);
print_end_block(stdout, params, 0);
ret = 1;
cleanup:
free_reply(&raw);
return ret;
}
int handle_stats_cmd(struct unix_ctx *ctx, const char *arg, cmd_params_st *params)
{
int ret;
struct cmd_reply_st raw;
StatusRep *rep;
char str_since[64];
char buf[MAX_TMPSTR_SIZE];
time_t t;
struct tm *tm;
PROTOBUF_ALLOCATOR(pa, ctx);
init_reply(&raw);
print_start_block(stdout, params);
if (NO_JSON(params))
printf("Note: the printed statistics are not real-time\n");
ret = send_cmd(ctx, CTL_CMD_STATUS, NULL, NULL, NULL, &raw);
if (ret < 0) {
goto error_status;
}
rep = status_rep__unpack(&pa, raw.data_size, raw.data);
if (rep == NULL)
goto error_status;
if (rep->status) {
print_separator(stdout, params);
if (NO_JSON(params))
printf("General info:\n");
print_single_value_int(stdout, params, "Server PID", rep->pid, 1);
print_single_value_int(stdout, params, "Sec-mod PID", rep->sec_mod_pid, 0);
t = rep->start_time;
tm = localtime(&t);
print_time_ival7(buf, time(0), t);