X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/abbc5c5fcef36f53fe0367d4f0877c1f3c05ff90..6f73a1b071bc286a9482d37c580452188e26ac37:/ppp.c

diff --git a/ppp.c b/ppp.c
index 236e3a7..c2c3379 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.13 2004-08-26 04:44:26 fred_nerk Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.17 2004-10-29 04:01:53 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -328,6 +328,7 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 	}
 	else if (*p == ConfigReq)
 	{
+		l =  ntohs(*(u16 *)(p + 2));
 		signed int x = l - 4;
 		u8 *o = (p + 4);
 
@@ -411,8 +412,8 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 		{
 			// Send back a ConfigAck
 			log(3, session[s].ip, s, t, "ConfigReq accepted, sending as Ack\n");
-			// for  win2k L2TP clientis  and LCP renegotiation of alive session 
-			if (magicno || l == 4) initlcp(t, s);
+			// for win2k L2TP clients and LCP renegotiation of alive session
+			if (magicno || l == 4 || (session[s].mru && l == 8)) initlcp(t, s);
 			q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
 			if (!q)
 			{
@@ -512,7 +513,8 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 	{
 		// happy with our IPCP
 		u16 r = session[s].radius;
-		if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden) {
+		if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden)
+		{
 			if (!r)
 				r = radiusnew(s);
 			if (r)
@@ -636,7 +638,6 @@ void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l)
 {
 	ipt ip;
 
-
 	CSTAT(call_processipin);
 
 	log_hex(5, "IP", p, l);
@@ -676,7 +677,7 @@ void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l)
 
 	if (session[s].snoop_ip && session[s].snoop_port)
 	{
-		// Snooping this session, send it to ASIO
+		// Snooping this session
 		snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port);
 	}
 	STAT(tun_tx_packets);
@@ -730,7 +731,7 @@ void processccp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 	log_hex(5, "CCP", p, l);
 	if (l < 2 || (*p != ConfigReq && *p != TerminateReq))
 	{
-		log(1, 0, s, t, "Unexpecetd CCP request code %d\n", *p);
+		log(1, 0, s, t, "Unexpected CCP request code %d\n", *p);
 		STAT(tunnel_rx_errors);
 		return ;
 	}
@@ -814,7 +815,6 @@ void sendchap(tunnelidt t, sessionidt s)
 // returns start of PPP frame
 u8 *makeppp(u8 * b, int size, u8 * p, int l, tunnelidt t, sessionidt s, u16 mtype)
 {
-
 	if (size < 12)
 		return NULL;	// Need more space than this!!
 
@@ -822,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 + 4) = htons(session[s].far); // session
 	b += 6;
-	if (mtype && !(session[s].l2tp_flags & SESSIONACFC))
+	if (mtype == PPPLCP || !(session[s].l2tp_flags & SESSIONACFC))
 	{
 		*(u16 *) b = htons(0xFF03); // HDLC header
 		b += 2;