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

Merge branch 'minor' into 'master'

Browse Source 
cosmetic fixes for rx/tx per sec limit

See merge request openconnect/ocserv!214
This commit is contained in:
Nikos Mavrogiannopoulos
2020-09-16 12:17:06 +00:00
parent f1c093f8a8 c47911a7d0
commit 8f6ff20f66
6 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/sample.config
View File

@@ -594,7 +594,7 @@ no-route = 192.168.5.0/255.255.255.0
# per group. Each file name on these directories must match the username
# or the groupname.
# The options allowed in the configuration files are dns, nbns,
# ipv?-network, ipv4-netmask, rx/tx-per-sec, iroute, route, no-route,
# ipv?-network, ipv4-netmask, rx/tx-data-per-sec, iroute, route, no-route,
# explicit-ipv4, explicit-ipv6, net-priority, deny-roaming, no-udp,
# keepalive, dpd, mobile-dpd, max-same-clients, tunnel-all-dns,
# restrict-user-to-routes, cgroup, stats-report-time,

2
src/main-ctl-unix.c
View File

@@ -425,10 +425,12 @@ static int append_user_info(method_ctx *ctx,
tmp = ctmp->config->rx_per_sec;
tmp *= 1000;
rep->has_rx_per_sec = ctmp->config->has_rx_per_sec;
rep->rx_per_sec = tmp;
tmp = ctmp->config->tx_per_sec;
tmp *= 1000;
rep->has_tx_per_sec = ctmp->config->has_tx_per_sec;
rep->tx_per_sec = tmp;
rep->dpd = ctmp->config->dpd;

2
tests/data/kerberos.config
View File

@@ -253,7 +253,7 @@ route = fc13:71:ea31:4b4e::/64
# per group. Each file name on these directories must match the username
# or the groupname.
# The options allowed in the configuration files are dns, nbns,
# ipv?-network, ipv4-netmask, ipv6-prefix, rx/tx-per-sec, iroute, route,
# ipv?-network, ipv4-netmask, ipv6-prefix, rx/tx-data-per-sec, iroute, route,
# net-priority and cgroup.
#
# Note that the 'iroute' option allows one to add routes on the server

2
tests/data/radius-group.config
View File

@@ -258,7 +258,7 @@ route = fc13:71:ea31:4b4e::/64
# per group. Each file name on these directories must match the username
# or the groupname.
# The options allowed in the configuration files are dns, nbns,
# ipv?-network, ipv4-netmask, ipv6-prefix, rx/tx-per-sec, iroute, route,
# ipv?-network, ipv4-netmask, ipv6-prefix, rx/tx-data-per-sec, iroute, route,
# net-priority and cgroup.
#
# Note that the 'iroute' option allows one to add routes on the server

2
tests/data/radius-otp.config
View File

@@ -275,7 +275,7 @@ route = fc13:71:ea31:4b4e::/64
# per group. Each file name on these directories must match the username
# or the groupname.
# The options allowed in the configuration files are dns, nbns,
# ipv?-network, ipv4-netmask, ipv6-prefix, rx/tx-per-sec, iroute, route,
# ipv?-network, ipv4-netmask, ipv6-prefix, rx/tx-data-per-sec, iroute, route,
# net-priority and cgroup.
#
# Note that the 'iroute' option allows one to add routes on the server

2
tests/data/radius.config
View File

@@ -254,7 +254,7 @@ route = fc13:71:ea31:4b4e::/64
# per group. Each file name on these directories must match the username
# or the groupname.
# The options allowed in the configuration files are dns, nbns,
# ipv?-network, ipv4-netmask, ipv6-prefix, rx/tx-per-sec, iroute, route,
# ipv?-network, ipv4-netmask, ipv6-prefix, rx/tx-data-per-sec, iroute, route,
# net-priority and cgroup.
#
# Note that the 'iroute' option allows one to add routes on the server