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

occtl: renamed cookie to session

Browse Source 
That reflects more close the actual use of the printed identifier.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
This commit is contained in:
Nikos Mavrogiannopoulos
2017-01-29 23:10:49 +01:00
parent 4bbf5129ee
commit c59cf15052
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/occtl/occtl.c
View File

@@ -65,10 +65,10 @@ static const commands_st commands[] = {
"Prints all the known IP addresses which have points", 1, 1),
ENTRY("show iroutes", NULL, handle_list_iroutes_cmd,
"Prints the routes provided by users of the server", 1, 1),
ENTRY("show cookies all", NULL, handle_list_all_cookies_cmd,
"Prints all the cookies", 1, 1),
ENTRY("show cookies valid", NULL, handle_list_valid_cookies_cmd,
"Prints all the valid for reconnection cookies", 1, 1),
ENTRY("show sessions all", NULL, handle_list_all_cookies_cmd,
"Prints all the session IDs", 1, 1),
ENTRY("show sessions valid", NULL, handle_list_valid_cookies_cmd,
"Prints all the valid for reconnection sessions", 1, 1),
ENTRY("show user", "[NAME]", handle_show_user_cmd,
"Prints information on the specified user", 1, 1),
ENTRY("show id", "[ID]", handle_show_id_cmd,
@@ -84,6 +84,10 @@ static const commands_st commands[] = {
/* hidden options */
ENTRY("?", NULL, handle_help_cmd, "Prints this help", -1, 0),
ENTRY("quit", NULL, handle_exit_cmd, "Exits this application", -1, 0),
ENTRY("show cookies all", NULL, handle_list_all_cookies_cmd,
"Alias for show sessions all", -1, 1),
ENTRY("show cookies valid", NULL, handle_list_valid_cookies_cmd,
"Alias for show sessions valid", -1, 1),
{NULL, 0, NULL, NULL}
};

10
src/occtl/unix.c
View File

@@ -650,7 +650,7 @@ void cookie_list(struct unix_ctx *ctx, SecmListCookiesReplyMsg *rep, FILE *out,
/* add header */
if (i == 0) {
fprintf(out, "%6s %8s %8s %14s %24s %8s %8s\n",
"cookie", "user", "group", "ip", "user agent", "updated", "status");
"session", "user", "group", "ip", "user agent", "updated", "status");
}
t = rep->cookies[i]->last_modified;
@@ -1033,8 +1033,8 @@ int common_info_cmd(UserListRep * args, FILE *out, cmd_params_st *params)
print_single_value_ex(out, params, "Connected at", str_since, tmpbuf, 1);
if (HAVE_JSON(params))
print_single_value(out, params, "Full cookie", shorten(args->user[i]->safe_id.data, args->user[i]->safe_id.len, 0), 1);
print_single_value(out, params, "Cookie", shorten(args->user[i]->safe_id.data, args->user[i]->safe_id.len, 1), 1);
print_single_value(out, params, "Full session", shorten(args->user[i]->safe_id.data, args->user[i]->safe_id.len, 0), 1);
print_single_value(out, params, "Session", shorten(args->user[i]->safe_id.data, args->user[i]->safe_id.len, 1), 1);
print_single_value(out, params, "TLS ciphersuite", args->user[i]->tls_ciphersuite, 1);
print_single_value(out, params, "DTLS cipher", args->user[i]->dtls_ciphersuite, 1);
@@ -1151,8 +1151,8 @@ int cookie_info_cmd(SecmListCookiesReplyMsg * args, FILE *out, cmd_params_st *pa
print_single_value(out, params, "Last Modified", str_since, 1);
print_single_value(out, params, "Full cookie", shorten(args->cookies[i]->safe_id.data, args->cookies[i]->safe_id.len, 0), 1);
print_single_value(out, params, "Cookie", shorten(args->cookies[i]->safe_id.data, args->cookies[i]->safe_id.len, 1), 1);
print_single_value(out, params, "Full session", shorten(args->cookies[i]->safe_id.data, args->cookies[i]->safe_id.len, 0), 1);
print_single_value(out, params, "Session", shorten(args->cookies[i]->safe_id.data, args->cookies[i]->safe_id.len, 1), 1);
print_end_block(out, params, i<(args->n_cookies-1)?1:0);