From: bodea Date: Thu, 20 Jan 2011 12:48:40 +0000 (+0000) Subject: Apply patch from Geoffrey D. Bennett to fix retry of control packets. X-Git-Tag: upstream/2.2.1^2 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/46d1fa17df93a23dd0021119bebe0d1ef9546348?ds=inline;hp=-c Apply patch from Geoffrey D. Bennett to fix retry of control packets. --- 46d1fa17df93a23dd0021119bebe0d1ef9546348 diff --git a/Changes b/Changes index 0740ab8..aad8483 100644 --- a/Changes +++ b/Changes @@ -1,7 +1,8 @@ -* Thu Mar 25 2010 Brendan O'Dea 2.2.x +* Thu Jan 20 2011 Brendan O'Dea 2.2.x - Apply MLPPP patch from Muhammad Tayseer Alquoatli. - Apply patch from Michael O to avoid sending multiple CDNs. - Apply patch from Cyril Elkaim to fix an issue with MacOS. +- Apply patch from Geoffrey D. Bennett to fix retry of control packets. * Mon Dec 18 2006 Brendan O'Dea 2.2.0 - Only poll clifd if successfully bound. diff --git a/l2tpns.c b/l2tpns.c index 72876be..8fdcb53 100644 --- a/l2tpns.c +++ b/l2tpns.c @@ -4,7 +4,7 @@ // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // vim: sw=8 ts=8 -char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.175 2010/03/25 05:24:23 bodea Exp $"; +char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.176 2011/01/20 12:48:40 bodea Exp $"; #include #include @@ -3033,7 +3033,7 @@ static void regular_cleanups(double period) if (tunnel[t].retry <= TIME) { controlt *c = tunnel[t].controls; - uint8_t w = tunnel[t].window; + uint16_t w = tunnel[t].window; tunnel[t].try++; // another try if (tunnel[t].try > 5) tunnelkill(t, "Timeout on control message"); // game over