welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply patch from Geoffrey D. Bennett to fix retry of control packets.

Browse source
This commit is contained in:
Brendan O'Dea 2011-01-20 12:48:40 +00:00
parent 352f0ba607
commit e934c096dd
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Changes
View file

@ -1,7 +1,8 @@
* Thu Mar 25 2010 Brendan O'Dea <bod@optus.net> 2.2.x * Thu Jan 20 2011 Brendan O'Dea <bod@optus.net> 2.2.x
- Apply MLPPP patch from Muhammad Tayseer Alquoatli. - Apply MLPPP patch from Muhammad Tayseer Alquoatli.
- Apply patch from Michael O to avoid sending multiple CDNs. - Apply patch from Michael O to avoid sending multiple CDNs.
- Apply patch from Cyril Elkaim to fix an issue with MacOS. - 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 <bod@optus.net> 2.2.0 * Mon Dec 18 2006 Brendan O'Dea <bod@optus.net> 2.2.0
- Only poll clifd if successfully bound. - Only poll clifd if successfully bound.

4
l2tpns.c
View file

@ -4,7 +4,7 @@
// Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
// vim: sw=8 ts=8 // 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 <arpa/inet.h> #include <arpa/inet.h>
#include <assert.h> #include <assert.h>
@ -3033,7 +3033,7 @@ static void regular_cleanups(double period)
if (tunnel[t].retry <= TIME) if (tunnel[t].retry <= TIME)
{ {
controlt *c = tunnel[t].controls; controlt *c = tunnel[t].controls;
uint8_t w = tunnel[t].window; uint16_t w = tunnel[t].window;
tunnel[t].try++; // another try tunnel[t].try++; // another try
if (tunnel[t].try > 5) if (tunnel[t].try > 5)
tunnelkill(t, "Timeout on control message"); // game over tunnelkill(t, "Timeout on control message"); // game over