diff options
| -rw-r--r-- | accel-pppd/accel-ppp.conf | 6 | ||||
| -rw-r--r-- | accel-pppd/accel-ppp.conf.5 | 8 | ||||
| -rw-r--r-- | accel-pppd/ppp/ppp_lcp.c | 12 |
3 files changed, 14 insertions, 12 deletions
diff --git a/accel-pppd/accel-ppp.conf b/accel-pppd/accel-ppp.conf index 282d5de9..b65f41be 100644 --- a/accel-pppd/accel-ppp.conf +++ b/accel-pppd/accel-ppp.conf @@ -48,10 +48,8 @@ ipv6=deny ipv6-intf-id=0:0:0:1 ipv6-peer-intf-id=0:0:0:2 ipv6-accept-peer-intf-id=1 - -[lcp] -echo-interval=30 -echo-failure=3 +lcp-echo-interval=30 +lcp-echo-failure=3 [auth] #any-login=0 diff --git a/accel-pppd/accel-ppp.conf.5 b/accel-pppd/accel-ppp.conf.5 index 1405819b..f294486a 100644 --- a/accel-pppd/accel-ppp.conf.5 +++ b/accel-pppd/accel-ppp.conf.5 @@ -166,16 +166,12 @@ Specify peer interface identifier for IPv6. .BI "ipv6-accept-peer-intf-id=" 0|1 Specify whether to accept peer's interface identifier. .TP -.SH [lcp] -.br -PPP LCP module configuration -.TP -.BI "echo-interval=" n +.BI "lcp-echo-interval=" n If this option is given and greater then 0 then lcp module will send echo-request every .B n seconds. .TP -.BI "echo-failure=" n +.BI "lcp-echo-failure=" n Specifies maximum number of echo-requests may be sent without valid echo-reply, if exceeds connection will be terminated. .TP .SH [dns] diff --git a/accel-pppd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c index 58c21dcc..cc07997a 100644 --- a/accel-pppd/ppp/ppp_lcp.c +++ b/accel-pppd/ppp/ppp_lcp.c @@ -857,11 +857,19 @@ static void load_config(void) char *opt; opt = conf_get_opt("lcp", "echo-interval"); - if (opt && atoi(opt) > 0) + if (opt && atoi(opt) >= 0) conf_echo_interval = atoi(opt); opt = conf_get_opt("lcp", "echo-failure"); - if (opt && atoi(opt) > 0) + if (opt && atoi(opt) >= 0) + conf_echo_failure = atoi(opt); + + opt = conf_get_opt("ppp", "lcp-echo-interval"); + if (opt && atoi(opt) >= 0) + conf_echo_interval = atoi(opt); + + opt = conf_get_opt("ppp", "lcp-echo-failure"); + if (opt && atoi(opt) >= 0) conf_echo_failure = atoi(opt); } |