diff options
| -rw-r--r-- | radsecproxy.c | 16 | ||||
| -rw-r--r-- | radsecproxy.conf.5 | 6 | ||||
| -rw-r--r-- | radsecproxy.h | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/radsecproxy.c b/radsecproxy.c index 55c0bb4..52962af 100644 --- a/radsecproxy.c +++ b/radsecproxy.c @@ -2282,7 +2282,7 @@ void *clientwr(void *arg) { rq->expiry.tv_sec = now.tv_sec + (*rq->buf == RAD_Status_Server || server->conf->type == 'T' - ? server->conf->retrydelay * (server->conf->retrycount + 1) : server->conf->retrydelay); + ? server->conf->retryinterval * (server->conf->retrycount + 1) : server->conf->retryinterval); if (!timeout.tv_sec || rq->expiry.tv_sec < timeout.tv_sec) timeout.tv_sec = rq->expiry.tv_sec; rq->tries++; @@ -3014,7 +3014,7 @@ void confclient_cb(struct gconffile **cf, char *block, char *opt, char *val) { void confserver_cb(struct gconffile **cf, char *block, char *opt, char *val) { char *type = NULL, *tls = NULL, *matchcertattr = NULL, *rewrite = NULL; - long int retrydelay = LONG_MIN, retrycount = LONG_MIN; + long int retryinterval = LONG_MIN, retrycount = LONG_MIN; struct clsrvconf *conf; debug(DBG_DBG, "confserver_cb called for %s", block); @@ -3034,7 +3034,7 @@ void confserver_cb(struct gconffile **cf, char *block, char *opt, char *val) { "MatchCertificateAttribute", CONF_STR, &matchcertattr, "rewrite", CONF_STR, &rewrite, "StatusServer", CONF_BLN, &conf->statusserver, - "RetryDelay", CONF_LINT, &retrydelay, + "RetryInterval", CONF_LINT, &retryinterval, "RetryCount", CONF_LINT, &retrycount, "CertificateNameCheck", CONF_BLN, &conf->certnamecheck, NULL @@ -3067,12 +3067,12 @@ void confserver_cb(struct gconffile **cf, char *block, char *opt, char *val) { if (matchcertattr) free(matchcertattr); - if (retrydelay != LONG_MIN) { - if (retrydelay < 1 || retrydelay > 60) - debugx(1, DBG_ERR, "error in block %s, value of option RetryDelay is %d, must be 1-60", block, retrydelay); - conf->retrydelay = (uint8_t)retrydelay; + if (retryinterval != LONG_MIN) { + if (retryinterval < 1 || retryinterval > 60) + debugx(1, DBG_ERR, "error in block %s, value of option RetryInterval is %d, must be 1-60", block, retryinterval); + conf->retryinterval = (uint8_t)retryinterval; } else - conf->retrydelay = REQUEST_RETRY_DELAY; + conf->retryinterval = REQUEST_RETRY_INTERVAL; if (retrycount != LONG_MIN) { if (retrycount < 0 || retrycount > 10) diff --git a/radsecproxy.conf.5 b/radsecproxy.conf.5 index 01ebc5a..6d538da 100644 --- a/radsecproxy.conf.5 +++ b/radsecproxy.conf.5 @@ -252,7 +252,7 @@ block is only used as a descriptive name for the administrator. The allowed options in a server block are \fBhost\fR, \fBport\fR, \fBtype\fR, \fBsecret\fR, \fBtls\fR, \fBcertificatenamecheck\fR, \fBmatchcertificateattribute\fR, \fBrewrite\fR, \fBstatusserver\fR, -\fBretrycount\fR and \fBretrydelay\fR. +\fBretrycount\fR and \fBretryinterval\fR. We already discussed the \fBhost\fR option. The \fBport\fR option allows you to specify which port number the server uses. @@ -268,9 +268,9 @@ when not specified, is \fBoff\fR. If statusserver is enabled, the proxy will during idle periods send regular status-server messages to the server to verify that it is alive. This should only be enabled if the server supports it. .sp -The options \fBretrycount\fR and \fBretrydelay\fR can be used to specify how +The options \fBretrycount\fR and \fBretryinterval\fR can be used to specify how many times the proxy should retry sending a request and how long it should -wait between each retry. The defaults are 2 retries and a delay of 5s. +wait between each retry. The defaults are 2 retries and an interval of 5s. .SH "REALM BLOCK" When the proxy receives an \fBAccess Request\fR it needs to figure out to which diff --git a/radsecproxy.h b/radsecproxy.h index 0f42ffe..33d8dcb 100644 --- a/radsecproxy.h +++ b/radsecproxy.h @@ -15,7 +15,7 @@ #define DEFAULT_TLS_SECRET "mysecret" #define DEFAULT_UDP_PORT "1812" #define DEFAULT_TLS_PORT "2083" -#define REQUEST_RETRY_DELAY 5 +#define REQUEST_RETRY_INTERVAL 5 #define REQUEST_RETRY_COUNT 2 #define MAX_CERT_DEPTH 5 #define STATUS_SERVER_PERIOD 25 @@ -86,7 +86,7 @@ struct clsrvconf { regex_t *rewriteattrregex; char *rewriteattrreplacement; uint8_t statusserver; - uint8_t retrydelay; + uint8_t retryinterval; uint8_t retrycount; uint8_t certnamecheck; SSL_CTX *ssl_ctx; |