X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/f1f5b976db3897edbae8e02e0cfa2972aeb3cbed..3b8df1d7d8e8e73c3ed2705f39723e54ccf59b68:/ppp.c

diff --git a/ppp.c b/ppp.c
index 80dce17..fe9c7be 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.56 2005/05/10 09:47:23 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.61 2005/05/13 09:23:00 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -150,7 +150,6 @@ void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 	{
 		LOG(1, s, t, "Unexpected CHAP message\n");
 		STAT(tunnel_rx_errors);
-		sessionshutdown(s, "Unexpected CHAP message.", 3, 0);
 		return;
 	}
 
@@ -355,7 +354,33 @@ 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);
+
+		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)
@@ -524,7 +549,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 	{
 		int x = l - 4;
 		uint8_t *o = (p + 4);
-		int authtype = 0;
+		int authtype = -1;
 
 		LOG(3, s, t, "LCP: ConfigNak (%d bytes)...\n", l);
 		if (config->debug > 3) dumplcp(p, l);
@@ -543,7 +568,7 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 					break;
 
 				case 3: // Authentication-Protocol
-					if (authtype)
+					if (authtype > 0)
 						break;
 
 					{
@@ -567,21 +592,23 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 						}
 					}
 
-					if (!authtype)
-					{
-						sessionshutdown(s, "Unsupported authentication.", 3, 0);
-						return;
-					}
-
 					break;
 
 				default:
 				    	LOG(2, s, t, "    Remote NAKed LCP type %u?\n", type);
 					break;
 			}
+			x -= length;
+			o += length;
 		}
 
 		if (!authtype)
+		{
+			sessionshutdown(s, "Unsupported authentication.", 3, 0);
+			return;
+		}
+
+		if (authtype == -1)
 			authtype = config->radius_authprefer;
 
 		sendlcp(t, s, authtype);
@@ -1301,7 +1328,7 @@ void sendlcp(tunnelidt t, sessionidt s, int authtype)
 		return;
 
 	LOG(4, s, t, "Sending LCP ConfigReq for %s\n",
-	    config->radius_authprefer == AUTHCHAP ? "CHAP" : "PAP");
+	    authtype == AUTHCHAP ? "CHAP" : "PAP");
 
 	if (!session[s].mru)
 		session[s].mru = DEFAULT_MRU;