Merge branch 'fix-user-json' into 'master'

fix(occtl): correct key for Limit TX in JSON output

See merge request openconnect/ocserv!363
This commit is contained in:
Dimitri Papadopoulos Orfanos
2023-08-15 17:51:02 +00:00
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -3,6 +3,7 @@
- No longer require to set device name per vhost (#480)
- nuttcp tests were replaced with iperf3 that is available
in more environments
- occtl: fix duplicate key in `occtl --json show users` output
* Version 1.2.0 (released 2023-07-11)
+1 -1
View File
@@ -1160,7 +1160,7 @@ int common_info_cmd(UserListRep * args, FILE *out, cmd_params_st *params)
bytes2human(args->user[i]->rx_per_sec, buf1, sizeof(buf1), "/sec");
bytes2human(args->user[i]->tx_per_sec, buf2, sizeof(buf2), "/sec");
print_pair_value(out, params, "Limit RX", buf1, "TX", buf2, 1);
print_pair_value(out, params, "Limit RX", buf1, "Limit TX", buf2, 1);
} else if (args->user[i]->tx_per_sec > 0) {
bytes2human(args->user[i]->tx_per_sec, buf1, sizeof(buf1), "/sec");
print_single_value(out, params, "Limit TX", buf1, 1);