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

occtl show status: produce machine-readable output for json

Browse Source 
This adds additional variables to include machine-readable output
in json form.

Resolves: #271

Signed-off-by: Stefan Bühler <stbuehler@web.de>
This commit is contained in:
Stefan Bühler
2020-03-25 14:45:27 +01:00
committed by Nikos Mavrogiannopoulos
parent 07948320ad
commit 0e6a791a40
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/occtl/unix.c
View File

@@ -242,6 +242,10 @@ int handle_status_cmd(struct unix_ctx *ctx, const char *arg, cmd_params_st *para
strftime(str_since, sizeof(str_since), DATE_TIME_FMT, tm);
print_single_value_ex(stdout, params, "Up since", str_since, buf, 1);
if (HAVE_JSON(params)) {
print_single_value_int(stdout, params, "raw_up_since", rep->start_time, 1);
print_single_value_int(stdout, params, "uptime", ((long)time(0)) - ((long)rep->start_time), 1);
}
print_single_value_int(stdout, params, "Active sessions", rep->active_clients, 1);
print_single_value_int(stdout, params, "Total sessions", rep->total_sessions_closed, 1);
print_single_value_int(stdout, params, "Total authentication failures", rep->total_auth_failures, 1);
@@ -262,6 +266,8 @@ int handle_status_cmd(struct unix_ctx *ctx, const char *arg, cmd_params_st *para
strftime(str_since, sizeof(str_since), DATE_TIME_FMT, tm);
print_single_value_ex(stdout, params, "Last stats reset", str_since, buf, 1);
if (HAVE_JSON(params))
print_single_value_int(stdout, params, "raw_last_stats_reset", rep->last_reset, 1);
}
print_single_value_int(stdout, params, "Sessions handled", rep->sessions_closed, 1);
@@ -272,15 +278,23 @@ int handle_status_cmd(struct unix_ctx *ctx, const char *arg, cmd_params_st *para
print_time_ival7(buf, rep->avg_auth_time, 0);
print_single_value(stdout, params, "Average auth time", buf, 1);
if (HAVE_JSON(params))
print_single_value_int(stdout, params, "raw_avg_auth_time", rep->avg_auth_time, 1);
print_time_ival7(buf, rep->max_auth_time, 0);
print_single_value(stdout, params, "Max auth time", buf, 1);
if (HAVE_JSON(params))
print_single_value_int(stdout, params, "raw_max_auth_time", rep->max_auth_time, 1);
print_time_ival7(buf, rep->avg_session_mins*60, 0);
print_single_value(stdout, params, "Average session time", buf, 1);
if (HAVE_JSON(params))
print_single_value_int(stdout, params, "raw_avg_session_time", rep->avg_session_mins*60, 1);
print_time_ival7(buf, rep->max_session_mins*60, 0);
print_single_value(stdout, params, "Max session time", buf, 1);
if (HAVE_JSON(params))
print_single_value_int(stdout, params, "raw_max_session_time", rep->max_session_mins*60, 1);
if (rep->min_mtu > 0)
print_single_value_int(stdout, params, "Min MTU", rep->min_mtu, 1);
@@ -289,8 +303,12 @@ int handle_status_cmd(struct unix_ctx *ctx, const char *arg, cmd_params_st *para
bytes2human(rep->kbytes_in*1000, buf, sizeof(buf), "");
print_single_value(stdout, params, "RX", buf, 1);
if (HAVE_JSON(params))
print_single_value_int(stdout, params, "raw_rx", rep->kbytes_in*1000, 1);
bytes2human(rep->kbytes_out*1000, buf, sizeof(buf), "");
print_single_value(stdout, params, "TX", buf, 0);
print_single_value(stdout, params, "TX", buf, 1);
if (HAVE_JSON(params))
print_single_value_int(stdout, params, "raw_tx", rep->kbytes_out*1000, 0);
}
print_end_block(stdout, params, 0);