From: Arran Cudbard-Bell Date: Wed, 4 Mar 2020 22:34:23 +0000 (-0600) Subject: We use "max" everywhere else X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc44f057032cd20d8892be015ff3eaebd43fdc17;p=thirdparty%2Ffreeradius-server.git We use "max" everywhere else --- diff --git a/doc/antora/modules/raddb/pages/mods-available/radius.adoc b/doc/antora/modules/raddb/pages/mods-available/radius.adoc index 5f9ca994fbf..10fa14d4dd4 100644 --- a/doc/antora/modules/raddb/pages/mods-available/radius.adoc +++ b/doc/antora/modules/raddb/pages/mods-available/radius.adoc @@ -378,7 +378,7 @@ Value should be `1..5`. -maximum_retransmission_time:: The maximum time between retransmissions. +max_retransmission_time:: The maximum time between retransmissions. Value should be `5..30` @@ -393,14 +393,14 @@ i.e. if any one of the limits is hit, the retransmission stops. -maximum_retransmission_count:: How many times the module will send the packet +max_retransmission_count:: How many times the module will send the packet before giving up. Value should be `1..20` _(0 == retransmit forever)_ -maximum_retransmission_duration:: The total length of time the module will +max_retransmission_duration:: The total length of time the module will try to retransmit the packet. Value should be `5..60` @@ -411,8 +411,8 @@ Value should be `5..60` i.e. If you want `retransmit forever`, you should set: - maximum_retransmission_time = 0 - maximum_retransmission_count = 0 + max_retransmission_time = 0 + max_retransmission_count = 0 @@ -487,33 +487,33 @@ radius { } Access-Request { initial_retransmission_time = 2 - maximum_retransmission_time = 16 - maximum_retransmission_count = 2 - maximum_retransmission_duration = 30 + max_retransmission_time = 16 + max_retransmission_count = 2 + max_retransmission_duration = 30 } Accounting-Request { initial_retransmission_time = 2 - maximum_retransmission_time = 16 - maximum_retransmission_count = 5 - maximum_retransmission_duration = 30 + max_retransmission_time = 16 + max_retransmission_count = 5 + max_retransmission_duration = 30 } Coa-Request { initial_retransmission_time = 2 - maximum_retransmission_time = 16 - maximum_retransmission_count = 5 - maximum_retransmission_duration = 30 + max_retransmission_time = 16 + max_retransmission_count = 5 + max_retransmission_duration = 30 } Disconnect-Request { initial_retransmission_time = 2 - maximum_retransmission_time = 16 - maximum_retransmission_count = 5 - maximum_retransmission_duration = 30 + max_retransmission_time = 16 + max_retransmission_count = 5 + max_retransmission_duration = 30 } Status-Server { initial_retransmission_time = 2 - maximum_retransmission_time = 16 - maximum_retransmission_count = 5 - maximum_retransmission_duration = 30 + max_retransmission_time = 16 + max_retransmission_count = 5 + max_retransmission_duration = 30 } } ``` diff --git a/doc/antora/modules/raddb/pages/sites-available/detail.adoc b/doc/antora/modules/raddb/pages/sites-available/detail.adoc index 58b832f7de5..680256177ee 100644 --- a/doc/antora/modules/raddb/pages/sites-available/detail.adoc +++ b/doc/antora/modules/raddb/pages/sites-available/detail.adoc @@ -266,9 +266,9 @@ server detail { limit { maximum_outstanding = 1 initial_retransmission_time = 1 - maximum_retransmission_time = 30 - maximum_retransmission_count = 6 - maximum_retransmission_duration = 40 + max_retransmission_time = 30 + max_retransmission_count = 6 + max_retransmission_duration = 40 } } } diff --git a/raddb/mods-available/radius b/raddb/mods-available/radius index 9987feee75e..ef6fbdde0f4 100644 --- a/raddb/mods-available/radius +++ b/raddb/mods-available/radius @@ -434,11 +434,11 @@ radius { initial_retransmission_time = 2 # - # maximum_retransmission_time:: The maximum time between retransmissions. + # max_retransmission_time:: The maximum time between retransmissions. # # Value should be `5..30` # - maximum_retransmission_time = 16 + max_retransmission_time = 16 # # [NOTE] @@ -450,20 +450,20 @@ radius { # # - # maximum_retransmission_count:: How many times the module will send the packet + # max_retransmission_count:: How many times the module will send the packet # before giving up. # # Value should be `1..20` _(0 == retransmit forever)_ # - maximum_retransmission_count = 2 + max_retransmission_count = 2 # - # maximum_retransmission_duration:: The total length of time the module will + # max_retransmission_duration:: The total length of time the module will # try to retransmit the packet. # # Value should be `5..60` # - maximum_retransmission_duration = 30 + max_retransmission_duration = 30 } # @@ -471,14 +471,14 @@ radius { # # i.e. If you want `retransmit forever`, you should set: # - # maximum_retransmission_time = 0 - # maximum_retransmission_count = 0 + # max_retransmission_time = 0 + # max_retransmission_count = 0 # Accounting-Request { initial_retransmission_time = 2 - maximum_retransmission_time = 16 - maximum_retransmission_count = 5 - maximum_retransmission_duration = 30 + max_retransmission_time = 16 + max_retransmission_count = 5 + max_retransmission_duration = 30 } # @@ -486,9 +486,9 @@ radius { # Coa-Request { initial_retransmission_time = 2 - maximum_retransmission_time = 16 - maximum_retransmission_count = 5 - maximum_retransmission_duration = 30 + max_retransmission_time = 16 + max_retransmission_count = 5 + max_retransmission_duration = 30 } # @@ -496,9 +496,9 @@ radius { # Disconnect-Request { initial_retransmission_time = 2 - maximum_retransmission_time = 16 - maximum_retransmission_count = 5 - maximum_retransmission_duration = 30 + max_retransmission_time = 16 + max_retransmission_count = 5 + max_retransmission_duration = 30 } # @@ -511,8 +511,8 @@ radius { # Status-Server { initial_retransmission_time = 2 - maximum_retransmission_time = 5 - maximum_retransmission_count = 5 - maximum_retransmission_duration = 30 + max_retransmission_time = 5 + max_retransmission_count = 5 + max_retransmission_duration = 30 } } diff --git a/raddb/sites-available/detail b/raddb/sites-available/detail index c2bf376260c..a946f16f399 100644 --- a/raddb/sites-available/detail +++ b/raddb/sites-available/detail @@ -199,7 +199,7 @@ server detail { # # The maximum time between retransmissions. # - maximum_retransmission_time = 30 + max_retransmission_time = 30 # # The following are maximums that *all* apply. @@ -215,7 +215,7 @@ server detail { # # A special value of "0" means "retransmit forever". # - maximum_retransmission_count = 6 + max_retransmission_count = 6 # # Maximum Retransmit Duration: 0..600 @@ -225,7 +225,7 @@ server detail { # # A special value of "0" means "retransmit forever". # - maximum_retransmission_duration = 40 + max_retransmission_duration = 40 } } } diff --git a/src/modules/proto_detail/proto_detail_work.c b/src/modules/proto_detail/proto_detail_work.c index 3e834c1dd02..5047c30ed7d 100644 --- a/src/modules/proto_detail/proto_detail_work.c +++ b/src/modules/proto_detail/proto_detail_work.c @@ -73,16 +73,16 @@ typedef struct { static CONF_PARSER limit_config[] = { { FR_CONF_OFFSET("initial_retransmission_time", FR_TYPE_UINT32, proto_detail_work_t, irt), .dflt = STRINGIFY(2) }, - { FR_CONF_OFFSET("maximum_retransmission_time", FR_TYPE_UINT32, proto_detail_work_t, mrt), .dflt = STRINGIFY(16) }, + { FR_CONF_OFFSET("max_retransmission_time", FR_TYPE_UINT32, proto_detail_work_t, mrt), .dflt = STRINGIFY(16) }, /* * Retransmit indefinitely, as v2 and v3 did. */ - { FR_CONF_OFFSET("maximum_retransmission_count", FR_TYPE_UINT32, proto_detail_work_t, mrc), .dflt = STRINGIFY(0) }, + { FR_CONF_OFFSET("max_retransmission_count", FR_TYPE_UINT32, proto_detail_work_t, mrc), .dflt = STRINGIFY(0) }, /* * ...again same as v2 and v3. */ - { FR_CONF_OFFSET("maximum_retransmission_duration", FR_TYPE_UINT32, proto_detail_work_t, mrd), .dflt = STRINGIFY(0) }, + { FR_CONF_OFFSET("max_retransmission_duration", FR_TYPE_UINT32, proto_detail_work_t, mrd), .dflt = STRINGIFY(0) }, { FR_CONF_OFFSET("maximum_outstanding", FR_TYPE_UINT32, proto_detail_work_t, max_outstanding), .dflt = STRINGIFY(1) }, CONF_PARSER_TERMINATOR }; @@ -893,13 +893,13 @@ static int mod_bootstrap(void *instance, CONF_SECTION *cs) * If you need more than this, just set it to * "0", and check Packet-Transmit-Count manually. */ - FR_INTEGER_BOUND_CHECK("limit.maximum_retransmission_count", inst->mrc, <=, 20); - FR_INTEGER_BOUND_CHECK("limit.maximum_retransmission_duration", inst->mrd, <=, 600); + FR_INTEGER_BOUND_CHECK("limit.max_retransmission_count", inst->mrc, <=, 20); + FR_INTEGER_BOUND_CHECK("limit.max_retransmission_duration", inst->mrd, <=, 600); /* * This is a reasonable value. */ - FR_INTEGER_BOUND_CHECK("limit.maximum_retransmission_timer", inst->mrt, <=, 30); + FR_INTEGER_BOUND_CHECK("limit.max_retransmission_timer", inst->mrt, <=, 30); } FR_INTEGER_BOUND_CHECK("limit.maximum_outstanding", inst->max_outstanding, >=, 1); diff --git a/src/modules/rlm_radius/rlm_radius.c b/src/modules/rlm_radius/rlm_radius.c index 1e9e5f6db97..13b7504413c 100644 --- a/src/modules/rlm_radius/rlm_radius.c +++ b/src/modules/rlm_radius/rlm_radius.c @@ -58,41 +58,41 @@ static CONF_PARSER const status_check_update_config[] = { */ static CONF_PARSER auth_config[] = { { FR_CONF_OFFSET("initial_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_ACCESS_REQUEST].irt), .dflt = STRINGIFY(2) }, - { FR_CONF_OFFSET("maximum_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_ACCESS_REQUEST].mrt), .dflt = STRINGIFY(16) }, - { FR_CONF_OFFSET("maximum_retransmission_count", FR_TYPE_UINT32, rlm_radius_t, retry[FR_CODE_ACCESS_REQUEST].mrc), .dflt = STRINGIFY(5) }, - { FR_CONF_OFFSET("maximum_retransmission_duration", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_ACCESS_REQUEST].mrd), .dflt = STRINGIFY(30) }, + { FR_CONF_OFFSET("max_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_ACCESS_REQUEST].mrt), .dflt = STRINGIFY(16) }, + { FR_CONF_OFFSET("max_retransmission_count", FR_TYPE_UINT32, rlm_radius_t, retry[FR_CODE_ACCESS_REQUEST].mrc), .dflt = STRINGIFY(5) }, + { FR_CONF_OFFSET("max_retransmission_duration", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_ACCESS_REQUEST].mrd), .dflt = STRINGIFY(30) }, CONF_PARSER_TERMINATOR }; static CONF_PARSER acct_config[] = { { FR_CONF_OFFSET("initial_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_ACCOUNTING_REQUEST].irt), .dflt = STRINGIFY(2) }, - { FR_CONF_OFFSET("maximum_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_ACCOUNTING_REQUEST].mrt), .dflt = STRINGIFY(5) }, - { FR_CONF_OFFSET("maximum_retransmission_count", FR_TYPE_UINT32, rlm_radius_t, retry[FR_CODE_ACCOUNTING_REQUEST].mrc), .dflt = STRINGIFY(1) }, - { FR_CONF_OFFSET("maximum_retransmission_duration", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_ACCOUNTING_REQUEST].mrd), .dflt = STRINGIFY(30) }, + { FR_CONF_OFFSET("max_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_ACCOUNTING_REQUEST].mrt), .dflt = STRINGIFY(5) }, + { FR_CONF_OFFSET("max_retransmission_count", FR_TYPE_UINT32, rlm_radius_t, retry[FR_CODE_ACCOUNTING_REQUEST].mrc), .dflt = STRINGIFY(1) }, + { FR_CONF_OFFSET("max_retransmission_duration", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_ACCOUNTING_REQUEST].mrd), .dflt = STRINGIFY(30) }, CONF_PARSER_TERMINATOR }; static CONF_PARSER status_config[] = { { FR_CONF_OFFSET("initial_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_STATUS_SERVER].irt), .dflt = STRINGIFY(2) }, - { FR_CONF_OFFSET("maximum_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_STATUS_SERVER].mrt), .dflt = STRINGIFY(5) }, - { FR_CONF_OFFSET("maximum_retransmission_count", FR_TYPE_UINT32, rlm_radius_t, retry[FR_CODE_STATUS_SERVER].mrc), .dflt = STRINGIFY(5) }, - { FR_CONF_OFFSET("maximum_retransmission_duration", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_STATUS_SERVER].mrd), .dflt = STRINGIFY(30) }, + { FR_CONF_OFFSET("max_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_STATUS_SERVER].mrt), .dflt = STRINGIFY(5) }, + { FR_CONF_OFFSET("max_retransmission_count", FR_TYPE_UINT32, rlm_radius_t, retry[FR_CODE_STATUS_SERVER].mrc), .dflt = STRINGIFY(5) }, + { FR_CONF_OFFSET("max_retransmission_duration", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_STATUS_SERVER].mrd), .dflt = STRINGIFY(30) }, CONF_PARSER_TERMINATOR }; static CONF_PARSER coa_config[] = { { FR_CONF_OFFSET("initial_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_COA_REQUEST].irt), .dflt = STRINGIFY(2) }, - { FR_CONF_OFFSET("maximum_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_COA_REQUEST].mrt), .dflt = STRINGIFY(16) }, - { FR_CONF_OFFSET("maximum_retransmission_count", FR_TYPE_UINT32, rlm_radius_t, retry[FR_CODE_COA_REQUEST].mrc), .dflt = STRINGIFY(5) }, - { FR_CONF_OFFSET("maximum_retransmission_duration", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_COA_REQUEST].mrd), .dflt = STRINGIFY(30) }, + { FR_CONF_OFFSET("max_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_COA_REQUEST].mrt), .dflt = STRINGIFY(16) }, + { FR_CONF_OFFSET("max_retransmission_count", FR_TYPE_UINT32, rlm_radius_t, retry[FR_CODE_COA_REQUEST].mrc), .dflt = STRINGIFY(5) }, + { FR_CONF_OFFSET("max_retransmission_duration", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_COA_REQUEST].mrd), .dflt = STRINGIFY(30) }, CONF_PARSER_TERMINATOR }; static CONF_PARSER disconnect_config[] = { { FR_CONF_OFFSET("initial_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_DISCONNECT_REQUEST].irt), .dflt = STRINGIFY(2) }, - { FR_CONF_OFFSET("maximum_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_DISCONNECT_REQUEST].mrt), .dflt = STRINGIFY(16) }, - { FR_CONF_OFFSET("maximum_retransmission_count", FR_TYPE_UINT32, rlm_radius_t, retry[FR_CODE_DISCONNECT_REQUEST].mrc), .dflt = STRINGIFY(5) }, - { FR_CONF_OFFSET("maximum_retransmission_duration", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_DISCONNECT_REQUEST].mrd), .dflt = STRINGIFY(30) }, + { FR_CONF_OFFSET("max_retransmission_time", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_DISCONNECT_REQUEST].mrt), .dflt = STRINGIFY(16) }, + { FR_CONF_OFFSET("max_retransmission_count", FR_TYPE_UINT32, rlm_radius_t, retry[FR_CODE_DISCONNECT_REQUEST].mrc), .dflt = STRINGIFY(5) }, + { FR_CONF_OFFSET("max_retransmission_duration", FR_TYPE_TIME_DELTA, rlm_radius_t, retry[FR_CODE_DISCONNECT_REQUEST].mrd), .dflt = STRINGIFY(30) }, CONF_PARSER_TERMINATOR }; @@ -663,14 +663,14 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) */ if (inst->allowed[FR_CODE_ACCESS_REQUEST]) { FR_TIME_DELTA_BOUND_CHECK("Access-Request.initial_retransmission_time", inst->retry[FR_CODE_ACCESS_REQUEST].irt, >=, fr_time_delta_from_sec(1)); - FR_TIME_DELTA_BOUND_CHECK("Access-Request.maximum_retransmission_time", inst->retry[FR_CODE_ACCESS_REQUEST].mrt, >=, fr_time_delta_from_sec(5)); - FR_INTEGER_BOUND_CHECK("Access-Request.maximum_retransmission_count", inst->retry[FR_CODE_ACCESS_REQUEST].mrc, >=, 1); - FR_TIME_DELTA_BOUND_CHECK("Access-Request.maximum_retransmission_duration", inst->retry[FR_CODE_ACCESS_REQUEST].mrd, >=, fr_time_delta_from_sec(5)); + FR_TIME_DELTA_BOUND_CHECK("Access-Request.max_retransmission_time", inst->retry[FR_CODE_ACCESS_REQUEST].mrt, >=, fr_time_delta_from_sec(5)); + FR_INTEGER_BOUND_CHECK("Access-Request.max_retransmission_count", inst->retry[FR_CODE_ACCESS_REQUEST].mrc, >=, 1); + FR_TIME_DELTA_BOUND_CHECK("Access-Request.max_retransmission_duration", inst->retry[FR_CODE_ACCESS_REQUEST].mrd, >=, fr_time_delta_from_sec(5)); FR_TIME_DELTA_BOUND_CHECK("Access-Request.initial_retransmission_time", inst->retry[FR_CODE_ACCESS_REQUEST].irt, <=, fr_time_delta_from_sec(3)); - FR_TIME_DELTA_BOUND_CHECK("Access-Request.maximum_retransmission_time", inst->retry[FR_CODE_ACCESS_REQUEST].mrt, <=, fr_time_delta_from_sec(30)); - FR_INTEGER_BOUND_CHECK("Access-Request.maximum_retransmission_count", inst->retry[FR_CODE_ACCESS_REQUEST].mrc, <=, 10); - FR_TIME_DELTA_BOUND_CHECK("Access-Request.maximum_retransmission_duration", inst->retry[FR_CODE_ACCESS_REQUEST].mrd, <=, fr_time_delta_from_sec(30)); + FR_TIME_DELTA_BOUND_CHECK("Access-Request.max_retransmission_time", inst->retry[FR_CODE_ACCESS_REQUEST].mrt, <=, fr_time_delta_from_sec(30)); + FR_INTEGER_BOUND_CHECK("Access-Request.max_retransmission_count", inst->retry[FR_CODE_ACCESS_REQUEST].mrc, <=, 10); + FR_TIME_DELTA_BOUND_CHECK("Access-Request.max_retransmission_duration", inst->retry[FR_CODE_ACCESS_REQUEST].mrd, <=, fr_time_delta_from_sec(30)); } /* @@ -683,15 +683,15 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) if (inst->allowed[FR_CODE_ACCOUNTING_REQUEST]) { FR_TIME_DELTA_BOUND_CHECK("Accounting-Request.initial_retransmission_time", inst->retry[FR_CODE_ACCOUNTING_REQUEST].irt, >=, fr_time_delta_from_sec(1)); #if 0 - FR_TIME_DELTA_BOUND_CHECK("Accounting-Request.maximum_retransmission_time", inst->retry[FR_CODE_ACCOUNTING_REQUEST].mrt, >=, fr_time_delta_from_sec(5)); - FR_INTEGER_BOUND_CHECK("Accounting-Request.maximum_retransmission_count", inst->retry[FR_CODE_ACCOUNTING_REQUEST].mrc, >=, 0); - FR_TIME_DELTA_BOUND_CHECK("Accounting-Request.maximum_retransmission_duration", inst->retry[FR_CODE_ACCOUNTING_REQUEST].mrd, >=, fr_time_delta_from_sec(0)); + FR_TIME_DELTA_BOUND_CHECK("Accounting-Request.max_retransmission_time", inst->retry[FR_CODE_ACCOUNTING_REQUEST].mrt, >=, fr_time_delta_from_sec(5)); + FR_INTEGER_BOUND_CHECK("Accounting-Request.max_retransmission_count", inst->retry[FR_CODE_ACCOUNTING_REQUEST].mrc, >=, 0); + FR_TIME_DELTA_BOUND_CHECK("Accounting-Request.max_retransmission_duration", inst->retry[FR_CODE_ACCOUNTING_REQUEST].mrd, >=, fr_time_delta_from_sec(0)); #endif FR_TIME_DELTA_BOUND_CHECK("Accounting-Request.initial_retransmission_time", inst->retry[FR_CODE_ACCOUNTING_REQUEST].irt, <=, fr_time_delta_from_sec(3)); - FR_TIME_DELTA_BOUND_CHECK("Accounting-Request.maximum_retransmission_time", inst->retry[FR_CODE_ACCOUNTING_REQUEST].mrt, <=, fr_time_delta_from_sec(30)); - FR_INTEGER_BOUND_CHECK("Accounting-Request.maximum_retransmission_count", inst->retry[FR_CODE_ACCOUNTING_REQUEST].mrc, <=, 10); - FR_TIME_DELTA_BOUND_CHECK("Accounting-Request.maximum_retransmission_duration", inst->retry[FR_CODE_ACCOUNTING_REQUEST].mrd, <=, fr_time_delta_from_sec(30)); + FR_TIME_DELTA_BOUND_CHECK("Accounting-Request.max_retransmission_time", inst->retry[FR_CODE_ACCOUNTING_REQUEST].mrt, <=, fr_time_delta_from_sec(30)); + FR_INTEGER_BOUND_CHECK("Accounting-Request.max_retransmission_count", inst->retry[FR_CODE_ACCOUNTING_REQUEST].mrc, <=, 10); + FR_TIME_DELTA_BOUND_CHECK("Accounting-Request.max_retransmission_duration", inst->retry[FR_CODE_ACCOUNTING_REQUEST].mrd, <=, fr_time_delta_from_sec(30)); } /* @@ -699,14 +699,14 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) */ if (inst->allowed[FR_CODE_STATUS_SERVER]) { FR_TIME_DELTA_BOUND_CHECK("Status-Server.initial_retransmission_time", inst->retry[FR_CODE_STATUS_SERVER].irt, >=, fr_time_delta_from_sec(1)); - FR_TIME_DELTA_BOUND_CHECK("Status-Server.maximum_retransmission_time", inst->retry[FR_CODE_STATUS_SERVER].mrt, >=, fr_time_delta_from_sec(5)); - FR_INTEGER_BOUND_CHECK("Status-Server.maximum_retransmission_count", inst->retry[FR_CODE_STATUS_SERVER].mrc, >=, 1); - FR_TIME_DELTA_BOUND_CHECK("Status-Server.maximum_retransmission_duration", inst->retry[FR_CODE_STATUS_SERVER].mrd, >=, fr_time_delta_from_sec(5)); + FR_TIME_DELTA_BOUND_CHECK("Status-Server.max_retransmission_time", inst->retry[FR_CODE_STATUS_SERVER].mrt, >=, fr_time_delta_from_sec(5)); + FR_INTEGER_BOUND_CHECK("Status-Server.max_retransmission_count", inst->retry[FR_CODE_STATUS_SERVER].mrc, >=, 1); + FR_TIME_DELTA_BOUND_CHECK("Status-Server.max_retransmission_duration", inst->retry[FR_CODE_STATUS_SERVER].mrd, >=, fr_time_delta_from_sec(5)); FR_TIME_DELTA_BOUND_CHECK("Status-Server.initial_retransmission_time", inst->retry[FR_CODE_STATUS_SERVER].irt, <=, fr_time_delta_from_sec(3)); - FR_TIME_DELTA_BOUND_CHECK("Status-Server.maximum_retransmission_time", inst->retry[FR_CODE_STATUS_SERVER].mrt, <=, fr_time_delta_from_sec(30)); - FR_INTEGER_BOUND_CHECK("Status-Server.maximum_retransmission_count", inst->retry[FR_CODE_STATUS_SERVER].mrc, <=, 10); - FR_TIME_DELTA_BOUND_CHECK("Status-Server.maximum_retransmission_duration", inst->retry[FR_CODE_STATUS_SERVER].mrd, <=, fr_time_delta_from_sec(30)); + FR_TIME_DELTA_BOUND_CHECK("Status-Server.max_retransmission_time", inst->retry[FR_CODE_STATUS_SERVER].mrt, <=, fr_time_delta_from_sec(30)); + FR_INTEGER_BOUND_CHECK("Status-Server.max_retransmission_count", inst->retry[FR_CODE_STATUS_SERVER].mrc, <=, 10); + FR_TIME_DELTA_BOUND_CHECK("Status-Server.max_retransmission_duration", inst->retry[FR_CODE_STATUS_SERVER].mrd, <=, fr_time_delta_from_sec(30)); } /* @@ -714,14 +714,14 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) */ if (inst->allowed[FR_CODE_COA_REQUEST]) { FR_TIME_DELTA_BOUND_CHECK("CoA-Request.initial_retransmission_time", inst->retry[FR_CODE_COA_REQUEST].irt, >=, fr_time_delta_from_sec(1)); - FR_TIME_DELTA_BOUND_CHECK("CoA-Request.maximum_retransmission_time", inst->retry[FR_CODE_COA_REQUEST].mrt, >=, fr_time_delta_from_sec(5)); - FR_INTEGER_BOUND_CHECK("CoA-Request.maximum_retransmission_count", inst->retry[FR_CODE_COA_REQUEST].mrc, >=, 1); - FR_TIME_DELTA_BOUND_CHECK("CoA-Request.maximum_retransmission_duration", inst->retry[FR_CODE_COA_REQUEST].mrd, >=, fr_time_delta_from_sec(5)); + FR_TIME_DELTA_BOUND_CHECK("CoA-Request.max_retransmission_time", inst->retry[FR_CODE_COA_REQUEST].mrt, >=, fr_time_delta_from_sec(5)); + FR_INTEGER_BOUND_CHECK("CoA-Request.max_retransmission_count", inst->retry[FR_CODE_COA_REQUEST].mrc, >=, 1); + FR_TIME_DELTA_BOUND_CHECK("CoA-Request.max_retransmission_duration", inst->retry[FR_CODE_COA_REQUEST].mrd, >=, fr_time_delta_from_sec(5)); FR_TIME_DELTA_BOUND_CHECK("CoA-Request.initial_retransmission_time", inst->retry[FR_CODE_COA_REQUEST].irt, <=, fr_time_delta_from_sec(3)); - FR_TIME_DELTA_BOUND_CHECK("CoA-Request.maximum_retransmission_time", inst->retry[FR_CODE_COA_REQUEST].mrt, <=, fr_time_delta_from_sec(60)); - FR_INTEGER_BOUND_CHECK("CoA-Request.maximum_retransmission_count", inst->retry[FR_CODE_COA_REQUEST].mrc, <=, 10); - FR_TIME_DELTA_BOUND_CHECK("CoA-Request.maximum_retransmission_duration", inst->retry[FR_CODE_COA_REQUEST].mrd, <=, fr_time_delta_from_sec(30)); + FR_TIME_DELTA_BOUND_CHECK("CoA-Request.max_retransmission_time", inst->retry[FR_CODE_COA_REQUEST].mrt, <=, fr_time_delta_from_sec(60)); + FR_INTEGER_BOUND_CHECK("CoA-Request.max_retransmission_count", inst->retry[FR_CODE_COA_REQUEST].mrc, <=, 10); + FR_TIME_DELTA_BOUND_CHECK("CoA-Request.max_retransmission_duration", inst->retry[FR_CODE_COA_REQUEST].mrd, <=, fr_time_delta_from_sec(30)); } /* @@ -729,14 +729,14 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf) */ if (inst->allowed[FR_CODE_DISCONNECT_REQUEST]) { FR_TIME_DELTA_BOUND_CHECK("Disconnect-Request.initial_retransmission_time", inst->retry[FR_CODE_DISCONNECT_REQUEST].irt, >=, fr_time_delta_from_sec(1)); - FR_TIME_DELTA_BOUND_CHECK("Disconnect-Request.maximum_retransmission_time", inst->retry[FR_CODE_DISCONNECT_REQUEST].mrt, >=, fr_time_delta_from_sec(5)); - FR_INTEGER_BOUND_CHECK("Disconnect-Request.maximum_retransmission_count", inst->retry[FR_CODE_DISCONNECT_REQUEST].mrc, >=, 1); - FR_TIME_DELTA_BOUND_CHECK("Disconnect-Request.maximum_retransmission_duration", inst->retry[FR_CODE_DISCONNECT_REQUEST].mrd, >=, fr_time_delta_from_sec(5)); + FR_TIME_DELTA_BOUND_CHECK("Disconnect-Request.max_retransmission_time", inst->retry[FR_CODE_DISCONNECT_REQUEST].mrt, >=, fr_time_delta_from_sec(5)); + FR_INTEGER_BOUND_CHECK("Disconnect-Request.max_retransmission_count", inst->retry[FR_CODE_DISCONNECT_REQUEST].mrc, >=, 1); + FR_TIME_DELTA_BOUND_CHECK("Disconnect-Request.max_retransmission_duration", inst->retry[FR_CODE_DISCONNECT_REQUEST].mrd, >=, fr_time_delta_from_sec(5)); FR_TIME_DELTA_BOUND_CHECK("Disconnect-Request.initial_retransmission_time", inst->retry[FR_CODE_DISCONNECT_REQUEST].irt, <=, fr_time_delta_from_sec(3)); - FR_TIME_DELTA_BOUND_CHECK("Disconnect-Request.maximum_retransmission_time", inst->retry[FR_CODE_DISCONNECT_REQUEST].mrt, <=, fr_time_delta_from_sec(30)); - FR_INTEGER_BOUND_CHECK("Disconnect-Request.maximum_retransmission_count", inst->retry[FR_CODE_DISCONNECT_REQUEST].mrc, <=, 10); - FR_TIME_DELTA_BOUND_CHECK("Disconnect-Request.maximum_retransmission_duration", inst->retry[FR_CODE_DISCONNECT_REQUEST].mrd, <=, fr_time_delta_from_sec(30)); + FR_TIME_DELTA_BOUND_CHECK("Disconnect-Request.max_retransmission_time", inst->retry[FR_CODE_DISCONNECT_REQUEST].mrt, <=, fr_time_delta_from_sec(30)); + FR_INTEGER_BOUND_CHECK("Disconnect-Request.max_retransmission_count", inst->retry[FR_CODE_DISCONNECT_REQUEST].mrc, <=, 10); + FR_TIME_DELTA_BOUND_CHECK("Disconnect-Request.max_retransmission_duration", inst->retry[FR_CODE_DISCONNECT_REQUEST].mrd, <=, fr_time_delta_from_sec(30)); } setup_io_submodule: diff --git a/src/modules/rlm_radius/test_plan.adoc b/src/modules/rlm_radius/test_plan.adoc index 417121edc00..a733c3463e8 100644 --- a/src/modules/rlm_radius/test_plan.adoc +++ b/src/modules/rlm_radius/test_plan.adoc @@ -131,7 +131,7 @@ Note:: You may need to increase `max_request_time` in radius.conf to 60 seconds * Set packet loss rate on network link to be 100% * Send a <> ** Verify that after `.initial_retransmission_time` (default 2 seconds) the packet is resent. -** Verify that packets are resent at increasing intervals until `.maximum_retransmission_count` +** Verify that packets are resent at increasing intervals until `.max_retransmission_count` is reached. ** After 10 seconds, verify that the connection is marked as "inactive", and a message is emitted indicating that the connection has entered zombie state.