X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/469f01fe4970ad5d809f4db51b99be5e95345b24..bcc4b6a3bbb8642f6adfc1a4017b878dad1aa06d:/ppp.c

diff --git a/ppp.c b/ppp.c
index 4de5ba7..25e6f8a 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.47 2005/04/27 13:53:17 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.64 2005/06/24 08:34:53 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -24,6 +24,7 @@ extern time_t time_now;
 extern configt *config;
 
 static void initccp(tunnelidt t, sessionidt s);
+static uint8_t *add_lcp_auth(uint8_t *b, int size, int authtype);
 
 // Process PAP messages
 void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
@@ -40,7 +41,7 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 		LOG(1, s, t, "Short PAP %u bytes\n", l);
 		STAT(tunnel_rx_errors);
 		sessionshutdown(s, "Short PAP packet.", 3, 0);
-		return ;
+		return;
 	}
 
 	if ((hl = ntohs(*(uint16_t *) (p + 2))) > l)
@@ -48,7 +49,7 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 		LOG(1, s, t, "Length mismatch PAP %u/%u\n", hl, l);
 		STAT(tunnel_rx_errors);
 		sessionshutdown(s, "PAP length mismatch.", 3, 0);
-		return ;
+		return;
 	}
 	l = hl;
 
@@ -57,7 +58,7 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 		LOG(1, s, t, "Unexpected PAP code %d\n", *p);
 		STAT(tunnel_rx_errors);
 		sessionshutdown(s, "Unexpected PAP code.", 3, 0);
-		return ;
+		return;
 	}
 
 	{
@@ -77,7 +78,7 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 		}
 		LOG(3, s, t, "PAP login %s/%s\n", user, pass);
 	}
-	if (session[s].ip || !session[s].radius)
+	if (session[s].ip || !sess_local[s].radius)
 	{
 		// respond now, either no RADIUS available or already authenticated
 		uint8_t b[MAXCONTROL];
@@ -110,7 +111,7 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 	else
 	{
 		// set up RADIUS request
-		uint16_t r = session[s].radius;
+		uint16_t r = sess_local[s].radius;
 
 		// Run PRE_AUTH plugins
 		struct param_pre_auth packet = { &tunnel[t], &session[s], strdup(user), strdup(pass), PPPPAP, 1 };
@@ -144,7 +145,7 @@ void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 	CSTAT(processchap);
 
 	LOG_HEX(5, "CHAP", p, l);
-	r = session[s].radius;
+	r = sess_local[s].radius;
 	if (!r)
 	{
 		LOG(1, s, t, "Unexpected CHAP message\n");
@@ -156,14 +157,16 @@ void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 	{
 		LOG(1, s, t, "Short CHAP %u bytes\n", l);
 		STAT(tunnel_rx_errors);
-		return ;
+		sessionshutdown(s, "Short CHAP packet.", 3, 0);
+		return;
 	}
 
 	if ((hl = ntohs(*(uint16_t *) (p + 2))) > l)
 	{
 		LOG(1, s, t, "Length mismatch CHAP %u/%u\n", hl, l);
 		STAT(tunnel_rx_errors);
-		return ;
+		sessionshutdown(s, "CHAP length mismatch.", 3, 0);
+		return;
 	}
 	l = hl;
 
@@ -171,20 +174,23 @@ void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 	{
 		LOG(1, s, t, "Unexpected CHAP response code %d\n", *p);
 		STAT(tunnel_rx_errors);
+		sessionshutdown(s, "CHAP length mismatch.", 3, 0);
 		return;
 	}
 	if (p[1] != radius[r].id)
 	{
 		LOG(1, s, t, "Wrong CHAP response ID %d (should be %d) (%d)\n", p[1], radius[r].id, r);
 		STAT(tunnel_rx_errors);
-		return ;
+		sessionshutdown(s, "Unexpected CHAP response ID.", 3, 0);
+		return;
 	}
 
 	if (l < 5 || p[4] != 16)
 	{
 		LOG(1, s, t, "Bad CHAP response length %d\n", l < 5 ? -1 : p[4]);
 		STAT(tunnel_rx_errors);
-		return ;
+		sessionshutdown(s, "Bad CHAP response length.", 3, 0);
+		return;
 	}
 
 	l -= 5;
@@ -193,7 +199,8 @@ void processchap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 	{
 		LOG(1, s, t, "CHAP user too long %d\n", l - 16);
 		STAT(tunnel_rx_errors);
-		return ;
+		sessionshutdown(s, "CHAP username too long.", 3, 0);
+		return;
 	}
 
 	// Run PRE_AUTH plugins
@@ -279,8 +286,14 @@ static void dumplcp(uint8_t *p, int l)
 				{
 					int proto = ntohs(*(uint16_t *)(o + 2));
 					LOG(4, 0, 0, "   %s 0x%x (%s)\n", lcp_type(type), proto,
-						proto == PPPCHAP ? "CHAP" :
-						proto == PPPPAP  ? "PAP"  : "UNKNOWN");
+						proto == PPPPAP  ? "PAP"  : "UNSUPPORTED");
+				}
+				else if (length == 5)
+				{
+					int proto = ntohs(*(uint16_t *)(o + 2));
+					int algo = *(uint8_t *)(o + 4);
+					LOG(4, 0, 0, "   %s 0x%x 0x%x (%s)\n", lcp_type(type), proto, algo,
+						(proto == PPPCHAP && algo == 5) ? "CHAP MD5"  : "UNSUPPORTED");
 				}
 				else
 					LOG(4, 0, 0, "   %s odd length %d\n", lcp_type(type), length);
@@ -341,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)
@@ -391,24 +430,35 @@ 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
 					{
 						int proto = ntohs(*(uint16_t *)(o + 2));
 						char proto_name[] = "0x0000";
+						uint8_t *a;
+
 						if (proto == PPPPAP)
-							break;
+						{
+							if (config->radius_authtypes & AUTHPAP)
+								break;
 
-						if (response && *response != ConfigNak) // rej already queued
-							break;
+							strcpy(proto_name, "PAP");
+						}
+						else if (proto == PPPCHAP)
+						{
+							if (config->radius_authtypes & AUTHCHAP
+							    && *(o + 4) == 5) // MD5
+								break;
 
-						if (proto == PPPCHAP)
 							strcpy(proto_name, "CHAP");
+						}
 						else
 							sprintf(proto_name, "%#4.4x", proto);
 
+						if (response && *response != ConfigNak) // rej already queued
+							break;
+
 						LOG(2, s, t, "    Remote requesting %s authentication.  Rejecting.\n", proto_name);
 
 						if (!response)
@@ -419,16 +469,28 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 							q += 4;
 						}
 
-						if ((q - b + length) > sizeof(b))
+						a = add_lcp_auth(q, sizeof(b) - (q - b), config->radius_authprefer);
+						if (!a)
 						{
 							LOG(2, s, t, "LCP overflow for %s ConfigNak.\n", proto_name);
 							break;
 						}
 
-						memcpy(q, o, length);
-						*(uint16_t *)(q += 2) = htons(PPPPAP); // NAK -> Use PAP instead
-						q += length;
-						*((uint16_t *) (response + 2)) = htons(q - response);
+						q = a;
+
+						if (config->radius_authtypes != config->radius_authprefer)
+						{
+							a = add_lcp_auth(q, sizeof(b) - (q - b), config->radius_authtypes & ~config->radius_authprefer);
+							if (!a)
+							{
+								LOG(2, s, t, "LCP overflow for %s ConfigNak.\n", proto_name);
+								break;
+							}
+
+							q = a;
+						}
+
+						break;
 					}
 					break;
 
@@ -459,31 +521,97 @@ 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)
+		{
+			l = q - response; // LCP packet length
+			*((uint16_t *) (response + 2)) = htons(l); // update header
+		}
+		else
 		{
-			// Send back a ConfigAck
-			q = response = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
-			if (!q) return;
-			*q = ConfigAck;
+			// 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))
-			initlcp(t, s);
+			sendlcp(t, s, config->radius_authprefer);
 	}
 	else if (*p == ConfigNak)
 	{
-		LOG(1, s, t, "Remote end sent a ConfigNak.  Ignoring\n");
+		int x = l - 4;
+		uint8_t *o = (p + 4);
+		int authtype = -1;
+
+		LOG(3, s, t, "LCP: ConfigNak (%d bytes)...\n", l);
 		if (config->debug > 3) dumplcp(p, l);
-		return ;
+
+		while (x > 2)
+		{
+			int type = o[0];
+			int length = o[1];
+
+			if (length == 0 || type == 0 || x < length) break;
+			switch (type)
+			{
+				case 1: // Maximum-Receive-Unit
+					session[s].mru = ntohs(*(uint16_t *)(o + 2));
+					LOG(3, s, t, "    Remote requested MRU of %u\n", session[s].mru);
+					break;
+
+				case 3: // Authentication-Protocol
+					if (authtype > 0)
+						break;
+
+					{
+						int proto = ntohs(*(uint16_t *)(o + 2));
+						if (proto == PPPPAP)
+						{
+							authtype = config->radius_authtypes & AUTHPAP;
+							LOG(3, s, t, "    Remote requested PAP authentication...%sing\n",
+								authtype ? "accept" : "reject");
+						}
+						else if (proto == PPPCHAP && *(o + 4) == 5)
+						{
+							authtype = config->radius_authtypes & AUTHCHAP;
+							LOG(3, s, t, "    Remote requested CHAP authentication...%sing\n",
+								authtype ? "accept" : "reject");
+						}
+						else
+						{
+							LOG(3, s, t, "    Rejecting unsupported authentication %#4x\n",
+								proto);
+						}
+					}
+
+					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);
 	}
 	else if (*p == TerminateReq)
 	{
@@ -542,7 +670,6 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 	{
 		LOG(1, s, t, "Unexpected LCP code %d\n", *p);
 		STAT(tunnel_rx_errors);
-		return ;
 	}
 }
 
@@ -591,22 +718,32 @@ void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 
 	if (*p == ConfigAck)
 	{
+		uint16_t r = sess_local[s].radius;
+
+		// ignore duplicate ACKs
+		if (session[s].flags & SF_IPCP_ACKED)
+			return;
+
 		// happy with our IPCP
-		uint16_t r = session[s].radius;
-		if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden)
-		{
-			if (!r)
-				r = radiusnew(s);
-			if (r)
-				radiussend(r, RADIUSSTART); // send radius start, having got IPCP at last
-		}
 		session[s].flags |= SF_IPCP_ACKED;
 
 		LOG(3, s, t, "IPCP Acked, session is now active\n");
 
-		// clear LCP_ACKED/CCP_ACKED flag for possible fast renegotiaion for routers
+		// clear LCP_ACKED/CCP_ACKED flag for possible fast renegotiation for routers
 		session[s].flags &= ~(SF_LCP_ACKED|SF_CCP_ACKED);
 
+		if (r && session[s].walled_garden)
+		{
+			radiusclear(r, s);
+			return;
+		}
+
+		if (!r)
+			r = radiusnew(s);
+
+		if (r)
+			radiussend(r, RADIUSSTART); // send radius start, having got IPCP at last
+
 		return;
 	}
 	if (*p != ConfigReq)
@@ -888,21 +1025,26 @@ void processipin(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 		return;
 	}
 
+	p += 4;
+	l -= 4;
+
 	if (session[s].snoop_ip && session[s].snoop_port)
 	{
 		// Snooping this session
-		snoop_send_packet(p + 4, l - 4, session[s].snoop_ip, session[s].snoop_port);
+		snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port);
 	}
 
-	session[s].cin += l - 4;
-	session[s].total_cin += l - 4;
-	sess_local[s].cin += l - 4;
-
+	increment_counter(&session[s].cin, &session[s].cin_wrap, l);
+	session[s].cin_delta += l;
 	session[s].pin++;
-	eth_tx += l - 4;
+
+	sess_local[s].cin += l;
+	sess_local[s].pin++;
+
+	eth_tx += l;
 
 	STAT(tun_tx_packets);
-	INC_STAT(tun_tx_bytes, l - 4);
+	INC_STAT(tun_tx_bytes, l);
 }
 
 // process IPv6 packet received
@@ -976,21 +1118,26 @@ void processipv6in(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 		return;
 	}
 
+	p += 4;
+	l -= 4;
+
 	if (session[s].snoop_ip && session[s].snoop_port)
 	{
 		// Snooping this session
-		snoop_send_packet(p + 4, l - 4, session[s].snoop_ip, session[s].snoop_port);
+		snoop_send_packet(p, l, session[s].snoop_ip, session[s].snoop_port);
 	}
 
-	session[s].cin += l - 4;
-	session[s].total_cin += l - 4;
-	sess_local[s].cin += l - 4;
-
+	increment_counter(&session[s].cin, &session[s].cin_wrap, l);
+	session[s].cin_delta += l;
 	session[s].pin++;
-	eth_tx += l - 4;
+
+	sess_local[s].cin += l;
+	sess_local[s].pin++;
+
+	eth_tx += l;
 
 	STAT(tun_tx_packets);
-	INC_STAT(tun_tx_bytes, l - 4);
+	INC_STAT(tun_tx_bytes, l);
 }
 
 //
@@ -1010,19 +1157,24 @@ void send_ipin(sessionidt s, uint8_t *buf, int len)
 		return;
 	}
 
+	buf += 4;
+	len -= 4;
+
 	if (session[s].snoop_ip && session[s].snoop_port)
 	{
 		// Snooping this session
-		snoop_send_packet(buf + 4, len - 4, session[s].snoop_ip, session[s].snoop_port);
+		snoop_send_packet(buf, len, session[s].snoop_ip, session[s].snoop_port);
 	}
 
 	// Increment packet counters
-	session[s].cin += len - 4;
-	session[s].total_cin += len - 4;
-	sess_local[s].cin += len - 4;
-
+	increment_counter(&session[s].cin, &session[s].cin_wrap, len);
+	session[s].cin_delta += len;
 	session[s].pin++;
-	eth_tx += len - 4;
+
+	sess_local[s].cin += len;
+	sess_local[s].pin++;
+
+	eth_tx += len;
 
 	STAT(tun_tx_packets);
 	INC_STAT(tun_tx_bytes, len - 4);
@@ -1084,9 +1236,8 @@ void processccp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 void sendchap(tunnelidt t, sessionidt s)
 {
 	uint8_t b[MAXCONTROL];
-	uint16_t r = session[s].radius;
+	uint16_t r = sess_local[s].radius;
 	uint8_t *q;
-	uint8_t *l;
 
 	CSTAT(sendchap);
 
@@ -1099,8 +1250,6 @@ void sendchap(tunnelidt t, sessionidt s)
 
 	LOG(1, s, t, "Send CHAP challenge\n");
 
-	// new challenge
-	random_data(radius[r].auth, sizeof(radius[r].auth));
 	radius[r].chap = 1;		// CHAP not PAP
 	radius[r].id++;
 	if (radius[r].state != RADIUSCHAP)
@@ -1170,27 +1319,64 @@ uint8_t *makeppp(uint8_t *b, int size, uint8_t *p, int l, tunnelidt t, sessionid
 	return b;
 }
 
-// Send initial LCP ConfigReq for PAP, set magic no.
-void initlcp(tunnelidt t, sessionidt s)
+static uint8_t *add_lcp_auth(uint8_t *b, int size, int authtype)
 {
-	char b[500], *q;
+	if ((authtype == AUTHCHAP && size < 5) || size < 4)
+		return 0;
+
+	*b++ = 3; // Authentication-Protocol
+	if (authtype == AUTHCHAP)
+	{
+		*b++ = 5; // length
+		*(uint16_t *) b = htons(PPPCHAP); b += 2;
+		*b++ = 5; // MD5
+	}
+	else if (authtype == AUTHPAP)
+	{
+		*b++ = 4; // length
+		*(uint16_t *) b = htons(PPPPAP); b += 2;
+	}
+	else
+	{
+		LOG(0, 0, 0, "add_lcp_auth called with unsupported auth type %d\n", authtype);
+	}
+
+	return b;
+}
+
+// Send initial LCP ConfigReq for MRU, authentication type and magic no
+void sendlcp(tunnelidt t, sessionidt s, int authtype)
+{
+	char b[500], *q, *l;
 
 	if (!(q = makeppp(b, sizeof(b), NULL, 0, t, s, PPPLCP)))
 		return;
 
-	LOG(4, s, t, "Sending LCP ConfigReq for PAP\n");
-	*q = ConfigReq;
-	*(uint8_t *)(q + 1) = (time_now % 255) + 1; // ID
-	*(uint16_t *)(q + 2) = htons(14); // Length
-	*(uint8_t *)(q + 4) = 5;
-	*(uint8_t *)(q + 5) = 6;
-	*(uint32_t *)(q + 6) = htonl(session[s].magic);
-	*(uint8_t *)(q + 10) = 3;
-	*(uint8_t *)(q + 11) = 4;
-	*(uint16_t *)(q + 12) = htons(PPPPAP); // PAP
-
-	LOG_HEX(5, "PPPLCP", q, 14);
-	tunnelsend(b, (q - b) + 14, t);
+	LOG(4, s, t, "Sending LCP ConfigReq for %s\n",
+	    authtype == AUTHCHAP ? "CHAP" : "PAP");
+
+	if (!session[s].mru)
+		session[s].mru = DEFAULT_MRU;
+
+	l = q;
+	*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;
+
+	l = add_lcp_auth(l, sizeof(b) - (l - b), authtype);
+
+	*l++ = 5; *l++ = 6; // Magic-Number (length 6)
+	*(uint32_t *) l = htonl(session[s].magic);
+	l += 4;
+
+	*(uint16_t *)(q + 2) = htons(l - q); // Length
+
+	LOG_HEX(5, "PPPLCP", q, l - q);
+	tunnelsend(b, (l - b), t);
 }
 
 // Send CCP request for no compression