X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/d80d528b9a13dc15c58b3098a221f2ad5bf203c7..d908e3348f2f824e798e43a90fb89b2dfe981e2b:/ppp.c

diff --git a/ppp.c b/ppp.c
index cb1b1f8..6cdeb35 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.53 2005-05-08 06:28:12 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.57 2005-05-10 09:57:19 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -355,7 +355,34 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 
 	if (*p == ConfigAck)
 	{
-		LOG(3, s, t, "LCP: Discarding ConfigAck\n");
+		int x = l - 4;
+		uint8_t *o = (p + 4);
+		int authtype = 0;
+
+		LOG(3, s, t, "LCP: ConfigAck (%d bytes)...\n", l);
+		if (config->debug > 3) dumplcp(p, l);
+
+		while (x > 2)
+		{
+			int type = o[0];
+			int length = o[1];
+
+			if (length == 0 || type == 0 || x < length) break;
+			switch (type)
+			{
+				case 3: // Authentication-Protocol
+					{
+						int proto = ntohs(*(uint16_t *)(o + 2));
+						if (proto == PPPCHAP && *(o + 4) == 5)
+							sendchap(t, s);
+					}
+
+					break;
+			}
+			x -= length;
+			o += length;
+		}
+
 		session[s].flags |= SF_LCP_ACKED;
 	}
 	else if (*p == ConfigReq)
@@ -405,7 +432,6 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 					*q++ = 6;
 					memset(q, 0, 4); // asyncmap 0
 					q += 4;
-					*((uint16_t *) (response + 2)) = htons(q - response); // LCP header length
 					break;
 
 				case 3: // Authentication-Protocol
@@ -466,7 +492,6 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 							q = a;
 						}
 
-						*((uint16_t *) (response + 2)) = htons(q - response); // LCP header length
 						break;
 					}
 					break;
@@ -498,22 +523,26 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 
 					memcpy(q, o, length);
 					q += length;
-					*((uint16_t *) (response + 2)) = htons(q - response); // LCP header length
 			}
 			x -= length;
 			o += length;
 		}
 
-		if (!response)
+		if (response)
 		{
-			// Send back a ConfigAck
-			q = response = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
-			if (!q) return;
-			*q = ConfigAck;
+			l = q - response; // LCP packet length
+			*((uint16_t *) (response + 2)) = htons(l); // update header
+		}
+		else
+		{
+			// Send packet back as ConfigAck
+			response = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
+			if (!response) return;
+			*response = ConfigAck;
 		}
 
 		LOG(3, s, t, "Sending %s\n", ppp_lcp_type(*response));
-		tunnelsend(b, l + (q - b), t);
+		tunnelsend(b, l + response - b, t);
 
 		if (!(session[s].flags & SF_LCP_ACKED))
 			sendlcp(t, s, config->radius_authprefer);
@@ -1308,6 +1337,8 @@ void sendlcp(tunnelidt t, sessionidt s, int authtype)
 	*l++ = ConfigReq;
 	*l++ = (time_now % 255) + 1; // ID
 
+	l += 2; //Save space for length
+
 	*l++ = 1; *l++ = 4; // Maximum-Receive-Unit (length 4)
 	*(uint16_t *) l = htons(session[s].mru); l += 2;