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

- Renegotiate MRU - Yuri

Browse source 
- Take LCP ConfigReq length from the packet length field - Yuri
This commit is contained in:
David Parrish 2004-09-23 04:01:36 +00:00
parent 5e9fdf2e5f
commit c81a5e3363
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Changes
View file

@ -3,6 +3,10 @@
- l2tpns-chap-response.patch from Robert Clark - l2tpns-chap-response.patch from Robert Clark
- merge l2tpns-config-hostname.patch from Robert Clark - merge l2tpns-config-hostname.patch from Robert Clark
- l2tpns-dont-timeshift-unidirectional-traffic.patch from Robert Clark - Dump accounting data if cin OR cout is non-zero - l2tpns-dont-timeshift-unidirectional-traffic.patch from Robert Clark - Dump accounting data if cin OR cout is non-zero
- Don't write accounting files if no accounting dir is set - Yuri
- Fix checking for mmap success
- Renegotiate MRU - Yuri
- Take LCP ConfigReq length from the packet length field - Yuri
* Thu Sep 02 2004 David Parrish <david@dparrish.com> 2.0.2 * Thu Sep 02 2004 David Parrish <david@dparrish.com> 2.0.2
- Combined LCP patches from Iain and Yuri. This should allow Windows 2k/XP - Combined LCP patches from Iain and Yuri. This should allow Windows 2k/XP

9
ppp.c
View file

@ -1,6 +1,6 @@
// L2TPNS PPP Stuff // L2TPNS PPP Stuff
char const *cvs_id_ppp = "$Id: ppp.c,v 1.15 2004-09-19 23:19:23 fred_nerk Exp $"; char const *cvs_id_ppp = "$Id: ppp.c,v 1.16 2004-09-23 04:01:36 fred_nerk Exp $";
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -328,6 +328,7 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
} }
else if (*p == ConfigReq) else if (*p == ConfigReq)
{ {
l = ntohs(*(u16 *)(p + 2));
signed int x = l - 4; signed int x = l - 4;
u8 *o = (p + 4); u8 *o = (p + 4);
@ -411,8 +412,8 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
{ {
// Send back a ConfigAck // Send back a ConfigAck
log(3, session[s].ip, s, t, "ConfigReq accepted, sending as Ack\n"); log(3, session[s].ip, s, t, "ConfigReq accepted, sending as Ack\n");
// for win2k L2TP clientis and LCP renegotiation of alive session // for win2k L2TP clients and LCP renegotiation of alive session
if (magicno || l == 4) initlcp(t, s); if (magicno || l == 4 || (session[s].mru && l == 8)) initlcp(t, s);
q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP); q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
if (!q) if (!q)
{ {
@ -821,7 +822,7 @@ u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtyp
*(u16 *) (b + 2) = htons(tunnel[t].far); // tunnel *(u16 *) (b + 2) = htons(tunnel[t].far); // tunnel
*(u16 *) (b + 4) = htons(session[s].far); // session *(u16 *) (b + 4) = htons(session[s].far); // session
b += 6; b += 6;
if (mtype && !(session[s].l2tp_flags & SESSIONACFC)) if (mtype == PPPLCP || !(session[s].l2tp_flags & SESSIONACFC))
{ {
*(u16 *) b = htons(0xFF03); // HDLC header *(u16 *) b = htons(0xFF03); // HDLC header
b += 2; b += 2;