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

Merge branch 'fix-json-output-issues' into 'master'

Browse Source 
Fix invalid JSON output in occtl commands

Closes #661 and #669

See merge request openconnect/ocserv!463
This commit is contained in:
Dimitri Papadopoulos Orfanos
2025-12-06 10:54:28 +01:00
parent 0949bfd0db 59c67fb160
commit 6a65e3acdd
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@@ -5,6 +5,8 @@
- Fixed "unexpected URL" errors for Cisco AnyConnect clients
- Fixed the 'ping-leases' option, which was broken since version 1.1.1
- Fixed 'iroute' option processing to handle multiple routes (#625)
- occtl: fix invalid JSON output in `occtl -j show iroutes` (#661)
- occtl: fix regression with trailing commas in `occtl -j show sessions` (#669)
* Version 1.3.0 (released 2024-05-05)
- Switch to https://github.com/nodejs/llhttp from http-parser.

12
src/occtl/unix.c
View File

@@ -1016,7 +1016,7 @@ int handle_list_iroutes_cmd(struct unix_ctx *ctx, const char *arg,
vpn_ip, rep->user[i]->iroutes[j]);
}
} else {
print_start_block(out, params);
print_array_block(out, params);
for (i = 0; i < rep->n_user; i++) {
const char *username, *vpn_ip;
@@ -1027,6 +1027,7 @@ int handle_list_iroutes_cmd(struct unix_ctx *ctx, const char *arg,
vpn_ip = get_ip(rep->user[i]->local_ip,
rep->user[i]->local_ip6);
print_start_block(out, params);
print_single_value_int(out, params, "ID",
rep->user[i]->id, 1);
print_single_value(out, params, "Username", username,
@@ -1038,10 +1039,11 @@ int handle_list_iroutes_cmd(struct unix_ctx *ctx, const char *arg,
print_single_value(out, params, "IP", vpn_ip, 1);
print_list_entries(out, params, "iRoutes",
rep->user[i]->iroutes,
rep->user[i]->n_iroutes, 1);
print_single_value(out, params, "IP", vpn_ip, 0);
rep->user[i]->n_iroutes, 0);
print_end_block(out, params,
i < (rep->n_user - 1) ? 1 : 0);
}
print_end_block(out, params, 0);
print_end_array_block(out, params);
}
ret = 0;
@@ -1546,7 +1548,7 @@ static int session_info_cmd(void *ctx, SecmListCookiesReplyMsg *args, FILE *out,
args->cookies[i]->tls_auth_ok,
1);
print_single_value_int(out, params, "in_use",
args->cookies[i]->in_use, 1);
args->cookies[i]->in_use, 0);
} else {
/* old names for compatibility */
print_pair_value(