From: Arran Cudbard-Bell Date: Tue, 3 Aug 2021 21:49:45 +0000 (-0600) Subject: s/maximum/max/ X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a4c03fb3e39a837eaef0a6656a6118cc9190a7c9;p=thirdparty%2Ffreeradius-server.git s/maximum/max/ --- diff --git a/doc/antora/modules/raddb/pages/sites-available/detail.adoc b/doc/antora/modules/raddb/pages/sites-available/detail.adoc index fce7825e894..ce8c5b4aefd 100644 --- a/doc/antora/modules/raddb/pages/sites-available/detail.adoc +++ b/doc/antora/modules/raddb/pages/sites-available/detail.adoc @@ -249,7 +249,7 @@ server detail { max_entry_size = 65536 retransmit = yes limit { - maximum_outstanding = 1 + max_outstanding = 1 initial_rtx_time = 1 max_rtx_time = 30 max_rtx_count = 6 diff --git a/raddb/sites-available/detail b/raddb/sites-available/detail index 117ffbd715b..6d7bf0cb92b 100644 --- a/raddb/sites-available/detail +++ b/raddb/sites-available/detail @@ -179,7 +179,7 @@ server detail { # into the server core. # # Useful values: 1..256 - maximum_outstanding = 1 + max_outstanding = 1 # # Initial retransmit time: 1..60 diff --git a/src/listen/detail/proto_detail_work.c b/src/listen/detail/proto_detail_work.c index f9b71e852ed..f341eb6e52e 100644 --- a/src/listen/detail/proto_detail_work.c +++ b/src/listen/detail/proto_detail_work.c @@ -78,7 +78,7 @@ static CONF_PARSER limit_config[] = { * ...again same as v2 and v3. */ { FR_CONF_OFFSET("max_rtx_duration", FR_TYPE_TIME_DELTA, proto_detail_work_t, retry_config.mrd), .dflt = STRINGIFY(0) }, - { FR_CONF_OFFSET("maximum_outstanding", FR_TYPE_UINT32, proto_detail_work_t, max_outstanding), .dflt = STRINGIFY(1) }, + { FR_CONF_OFFSET("max_outstanding", FR_TYPE_UINT16, proto_detail_work_t, max_outstanding), .dflt = STRINGIFY(1) }, CONF_PARSER_TERMINATOR }; @@ -874,8 +874,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *cs) FR_TIME_DELTA_BOUND_CHECK("limit.max_rtx_timer", inst->retry_config.mrt, <=, fr_time_delta_from_sec(30)); } - FR_INTEGER_BOUND_CHECK("limit.maximum_outstanding", inst->max_outstanding, >=, 1); - FR_INTEGER_BOUND_CHECK("limit.maximum_outstanding", inst->max_outstanding, <=, 256); + FR_INTEGER_BOUND_CHECK("limit.max_outstanding", inst->max_outstanding, >=, 1); return 0; }