From a06c41c335789d7c3154422d3f60481e26feb1b0 Mon Sep 17 00:00:00 2001 From: Kozlov Dmitry Date: Wed, 25 May 2011 16:39:10 +0400 Subject: radius: fix incorrect reading acct-timeout option --- accel-pppd/radius/acct.c | 2 +- accel-pppd/radius/radius.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/accel-pppd/radius/acct.c b/accel-pppd/radius/acct.c index 01e73af..2c12d2a 100644 --- a/accel-pppd/radius/acct.c +++ b/accel-pppd/radius/acct.c @@ -176,7 +176,7 @@ static void rad_acct_interim_update(struct triton_timer_t *t) rad_req_send(rpd->acct_req, conf_interim_verbose); __sync_add_and_fetch(&stat_interim_sent, 1); if (conf_acct_timeout) { - rpd->acct_req->timeout.period = conf_timeout * 1000; + rpd->acct_req->timeout.period = conf_acct_timeout * 1000; triton_timer_add(rpd->ppp->ctrl->ctx, &rpd->acct_req->timeout, 0); } } diff --git a/accel-pppd/radius/radius.c b/accel-pppd/radius/radius.c index edf3120..1900e0f 100644 --- a/accel-pppd/radius/radius.c +++ b/accel-pppd/radius/radius.c @@ -25,7 +25,7 @@ int conf_max_try = 3; int conf_timeout = 3; -int conf_acct_timeout = 600; +int conf_acct_timeout = 3; char *conf_nas_identifier; in_addr_t conf_nas_ip_address; in_addr_t conf_gw_ip_address; @@ -460,7 +460,7 @@ static int load_config(void) conf_timeout = atoi(opt); opt = conf_get_opt("radius", "acct-timeout"); - if (opt && atoi(opt) > 0) + if (opt && atoi(opt) >= 0) conf_acct_timeout = atoi(opt); opt = conf_get_opt("radius", "verbose"); -- cgit v1.2.3