diff options
| -rw-r--r-- | accel-pppd/accel-ppp.conf | 3 | ||||
| -rw-r--r-- | accel-pppd/accel-ppp.conf.5 | 12 | ||||
| -rw-r--r-- | accel-pppd/ctrl/l2tp/l2tp.c | 29 |
3 files changed, 39 insertions, 5 deletions
diff --git a/accel-pppd/accel-ppp.conf b/accel-pppd/accel-ppp.conf index e7daf62f..f399361d 100644 --- a/accel-pppd/accel-ppp.conf +++ b/accel-pppd/accel-ppp.conf @@ -82,7 +82,8 @@ verbose=1 #dictionary=/usr/local/share/accel-ppp/l2tp/dictionary #hello-interval=60 #timeout=60 -#rtimeout=5 +#rtimeout=1 +#rtimeout-cap=16 #retransmit=5 #recv-window=16 #host-name=accel-ppp diff --git a/accel-pppd/accel-ppp.conf.5 b/accel-pppd/accel-ppp.conf.5 index 9cabadab..1b626ca8 100644 --- a/accel-pppd/accel-ppp.conf.5 +++ b/accel-pppd/accel-ppp.conf.5 @@ -488,6 +488,18 @@ Specifies timeout (in seconds) to wait peer completes tunnel and session negotia .TP .BI "rtimeout=" n Specifies timeout (in seconds) to wait message acknowledge, if elapsed message retransmition will be performed. +Timeout is multiplied by two after each retransmission. So if +.BR rtimeout " is set to 1, first retransmission will occur after one second," +second retransmission two seconds later, third one four seconds later, and so +on, until a reply is received or the +.BR retransmit " value is reached. Default value is 1." +.TP +.BI "rtimeout-cap=" n +Set the maximum interval between retransmissions. The exponential backoff +.RB "interval used by " rtimeout " will never grow above " rtimeout-cap . +.BR rtimeout-cap " must be higher than " rtimeout " and, according to RFC 2661, +must be no less than 8 (though accel-ppp doesn't enforce this rule). +Default value is 16. .TP .BI "retransmit=" n Specifies maximum number of message retransmission, if exceeds connection will be terminated. diff --git a/accel-pppd/ctrl/l2tp/l2tp.c b/accel-pppd/ctrl/l2tp/l2tp.c index 2c8c90a7..b80595fc 100644 --- a/accel-pppd/ctrl/l2tp/l2tp.c +++ b/accel-pppd/ctrl/l2tp/l2tp.c @@ -69,7 +69,9 @@ #define DEFAULT_RECV_WINDOW 16 #define DEFAULT_PPP_MAX_MTU 1420 +#define DEFAULT_RTIMEOUT 1 #define DEFAULT_RTIMEOUT_CAP 16 +#define DEFAULT_RETRANSMIT 5 int conf_verbose = 0; int conf_hide_avps = 0; @@ -79,8 +81,9 @@ static int conf_ppp_max_mtu = DEFAULT_PPP_MAX_MTU; static int conf_port = L2TP_PORT; static int conf_ephemeral_ports = 0; static int conf_timeout = 60; -static int conf_rtimeout = 5; -static int conf_retransmit = 5; +static int conf_rtimeout = DEFAULT_RTIMEOUT; +static int conf_rtimeout_cap = DEFAULT_RTIMEOUT_CAP; +static int conf_retransmit = DEFAULT_RETRANSMIT; static int conf_hello_interval = 60; static int conf_dir300_quirk = 0; static const char *conf_host_name = "accel-ppp"; @@ -145,6 +148,7 @@ struct l2tp_conn_t struct triton_timer_t hello_timer; int rtimeout; int rtimeout_cap; + int max_retransmit; struct sockaddr_in peer_addr; struct sockaddr_in host_addr; @@ -1686,7 +1690,8 @@ static struct l2tp_conn_t *l2tp_tunnel_alloc(const struct sockaddr_in *peer, conn->hello_timer.period = conf_hello_interval * 1000; conn->rtimeout = conf_rtimeout * 1000; - conn->rtimeout_cap = DEFAULT_RTIMEOUT_CAP * 1000; + conn->rtimeout_cap = conf_rtimeout_cap * 1000; + conn->max_retransmit = conf_retransmit; conn->sessions = NULL; conn->sess_count = 0; @@ -2026,7 +2031,7 @@ static void l2tp_rtimeout(struct triton_timer_t *tm) pack = list_first_entry(&conn->rtms_queue, typeof(*pack), entry); - if (++conn->retransmit > conf_retransmit) { + if (++conn->retransmit > conn->max_retransmit) { log_tunnel(log_warn, conn, "no acknowledgement from peer after %i retransmissions," " deleting tunnel\n", conn->retransmit - 1); @@ -4745,10 +4750,26 @@ static void load_config(void) opt = conf_get_opt("l2tp", "rtimeout"); if (opt && atoi(opt) > 0) conf_rtimeout = atoi(opt); + else + conf_rtimeout = DEFAULT_RTIMEOUT; + + opt = conf_get_opt("l2tp", "rtimeout-cap"); + if (opt && atoi(opt) > 0) + conf_rtimeout_cap = atoi(opt); + else + conf_rtimeout_cap = DEFAULT_RTIMEOUT_CAP; + if (conf_rtimeout_cap < conf_rtimeout) { + log_warn("l2tp: rtimeout-cap (%i) is smaller than rtimeout (%i)," + " resetting rtimeout-cap to %i\n", + conf_rtimeout_cap, conf_rtimeout, conf_rtimeout); + conf_rtimeout_cap = conf_rtimeout; + } opt = conf_get_opt("l2tp", "retransmit"); if (opt && atoi(opt) > 0) conf_retransmit = atoi(opt); + else + conf_retransmit = DEFAULT_RETRANSMIT; opt = conf_get_opt("l2tp", "recv-window"); if (opt && atoi(opt) > 0 && atoi(opt) <= RECV_WINDOW_SIZE_MAX) |