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: pretty print expiration time in bans

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2015-02-26 21:07:51 +01:00
parent e64528c9f1
commit 6e9b202aa8
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/occtl-time.c
View File

@@ -31,9 +31,9 @@
#define _(x) x
/* compact 7 char format for time intervals (belongs in libproc?) */
void print_time_ival7(time_t t, FILE * fout)
void print_time_ival7(time_t t1, time_t t2, FILE * fout)
{
t = time(0) - t;
time_t t = t1 - t2;
if ((long)t < (long)0) {
/* system clock changed? */

8
src/occtl-unix.c
View File

@@ -570,7 +570,7 @@ int handle_list_users_cmd(struct unix_ctx *ctx, const char *arg)
fprintf(out, "%8d %8s %8s %14s %14s %6s ",
(int)rep->user[i]->id, username, groupname, rep->user[i]->ip, vpn_ip, rep->user[i]->tun);
print_time_ival7(t, out);
print_time_ival7(time(0), t, out);
dtls_ciphersuite = rep->user[i]->dtls_ciphersuite;
if (dtls_ciphersuite != NULL && dtls_ciphersuite[0] != 0) {
@@ -652,8 +652,10 @@ int handle_list_banned_cmd(struct unix_ctx *ctx, const char *arg, unsigned point
"IP", "score", "expires");
}
fprintf(out, "%14s %14u %30s\n",
fprintf(out, "%14s %14u %30s (",
rep->info[i]->ip, (unsigned)rep->info[i]->score, str_since);
print_time_ival7(t, time(0), out);
fputs(")\n", out);
} else {
if (i == 0) {
fprintf(out, "%14s %14s\n",
@@ -794,7 +796,7 @@ int common_info_cmd(UserListRep * args)
fprintf(out, "\tHostname: %s\n", args->user[i]->hostname);
fprintf(out, "\tConnected at: %s (", str_since);
print_time_ival7(t, out);
print_time_ival7(time(0), t, out);
fprintf(out, ")\n");
fprintf(out, "\tTLS ciphersuite: %s\n", args->user[i]->tls_ciphersuite);

2
src/occtl.h
View File

@@ -16,7 +16,7 @@
FILE* pager_start(void);
void pager_stop(FILE* fp);
void print_time_ival7(time_t t, FILE * fout);
void print_time_ival7(time_t t1, time_t t2, FILE * fout);
void print_iface_stats(const char *iface, time_t since, FILE * out);
void