X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/a415c8e5f6d283c1b9582b4c52d9deab4f72d672..f9e4ccb5e99a52043e095ca990a268e07ac605aa:/ppp.c?ds=sidebyside

diff --git a/ppp.c b/ppp.c
index d48c044..e3a2c74 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.45 2005-03-10 03:31:25 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.48 2005-05-05 10:02:08 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -39,6 +39,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 ;
 	}
 
@@ -46,6 +47,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 ;
 	}
 	l = hl;
@@ -54,6 +56,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 ;
 	}
 
@@ -74,7 +77,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];
@@ -102,11 +105,12 @@ void processpap(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 		}
 		LOG(3, s, t, "Fallback response to PAP (%s)\n", (session[s].ip) ? "ACK" : "NAK");
 		tunnelsend(b, 5 + (p - b), t); // send it
+		sessionshutdown(s, "PAP authentication failed.", 3, 0);
 	}
 	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 };
@@ -140,7 +144,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");
@@ -488,11 +492,11 @@ void processlcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 		q = makeppp(b, sizeof(b),  p, l, t, s, PPPLCP);
 		if (!q) return;
 		tunnelsend(b, l + (q - b), t); // send it
-		sessionshutdown(s, "Remote end closed connection.");
+		sessionshutdown(s, "Remote end closed connection.", 3, 0);
 	}
 	else if (*p == TerminateAck)
 	{
-		sessionshutdown(s, "Connection closed.");
+		sessionshutdown(s, "Connection closed.", 3, 0);
 	}
 	else if (*p == ProtocolRej)
 	{
@@ -588,7 +592,7 @@ void processipcp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 	if (*p == ConfigAck)
 	{
 		// happy with our IPCP
-		uint16_t r = session[s].radius;
+		uint16_t r = sess_local[s].radius;
 		if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden)
 		{
 			if (!r)
@@ -1076,11 +1080,11 @@ void processccp(tunnelidt t, sessionidt s, uint8_t *p, uint16_t l)
 	tunnelsend(b, l + (q - b), t); // send it
 }
 
-// send a CHAP PP packet
+// send a CHAP challenge
 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;
 
 	CSTAT(sendchap);
@@ -1105,7 +1109,7 @@ void sendchap(tunnelidt t, sessionidt s)
 	radius[r].retry = backoff(radius[r].try++);
 	if (radius[r].try > 5)
 	{
-		sessionshutdown(s, "Timeout CHAP");
+		sessionshutdown(s, "CHAP timeout.", 3, 0);
 		STAT(tunnel_tx_errors);
 		return ;
 	}
@@ -1114,7 +1118,7 @@ void sendchap(tunnelidt t, sessionidt s)
 
 	*q = 1;					// challenge
 	q[1] = radius[r].id;			// ID
-	q[4] = 16;				// length
+	q[4] = 16;				// value size (size of challenge)
 	memcpy(q + 5, radius[r].auth, 16);	// challenge
 	strcpy(q + 21, hostname);		// our name
 	*(uint16_t *) (q + 2) = htons(strlen(hostname) + 21); // length