X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/c5e4c2cfc092317c1e3ceb0f654f880f6a8573f4..e98737a1683046b634692bd9e5406e53b89a65c9:/ppp.c

diff --git a/ppp.c b/ppp.c
index cf9122d..3136d30 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,5 +1,5 @@
 // L2TPNS PPP Stuff
-// $Id: ppp.c,v 1.1 2003-12-16 07:07:39 fred_nerk Exp $
+// $Id: ppp.c,v 1.4 2004-05-24 04:26:01 fred_nerk Exp $
 
 #include <stdio.h>
 #include <string.h>
@@ -11,16 +11,15 @@
 #include "plugin.h"
 #include "util.h"
 
-extern char debug;
 extern tunnelt *tunnel;
 extern sessiont *session;
 extern radiust *radius;
-extern u16 tapmac[3];
 extern int tapfd;
 extern char hostname[1000];
 extern struct Tstats *_statistics;
 extern unsigned long eth_tx;
 extern time_t time_now;
+extern struct configt *config;
 
 // Process PAP messages
 void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l)
@@ -77,7 +76,7 @@ void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l)
 		p[4] = 0;               // no message
 		if (session[s].ip)
 		{
-		    log(3, session[s].ip, s, t, "%d Already an IP allocated: %s (%d)\n", getpid(), inet_toa(htonl(session[s].ip)), session[s].ip);
+		    log(3, session[s].ip, s, t, "%d Already an IP allocated: %s (%d)\n", getpid(), inet_toa(htonl(session[s].ip)), session[s].ip_pool_index);
 		}
 		else
 		{
@@ -88,7 +87,7 @@ void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l)
 	}
 	else
 	{                          // set up RADIUS request
-		u8 r = session[s].radius;
+		u16 r = session[s].radius;
 
 		// Run PRE_AUTH plugins
 		struct param_pre_auth packet = { &tunnel[t], &session[s], strdup(user), strdup(pass), PPPPAP, 1 };
@@ -101,8 +100,8 @@ void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l)
 			return;
 		}
 
-		strncpy(session[s].user, packet.username, sizeof(session[s].user));
-		strncpy(radius[r].pass, packet.password, sizeof(radius[r].pass));
+		strncpy(session[s].user, packet.username, sizeof(session[s].user) - 1);
+		strncpy(radius[r].pass, packet.password, sizeof(radius[r].pass) - 1);
 
 		free(packet.username);
 		free(packet.password);
@@ -116,7 +115,7 @@ void processpap(tunnelidt t, sessionidt s, u8 * p, u16 l)
 // Process CHAP messages
 void processchap(tunnelidt t, sessionidt s, u8 * p, u16 l)
 {
-	u8 r;
+	u16 r;
 	u16 len;
 
 #ifdef STAT_CALLS
@@ -180,7 +179,7 @@ void processchap(tunnelidt t, sessionidt s, u8 * p, u16 l)
 			return;
 		}
 
-		strncpy(session[s].user, packet.username, sizeof(session[s].user));
+		strncpy(session[s].user, packet.username, sizeof(session[s].user) - 1);
 		memcpy(radius[r].pass, packet.password, 16);
 
 		free(packet.username);
@@ -188,8 +187,8 @@ void processchap(tunnelidt t, sessionidt s, u8 * p, u16 l)
 	}
 
 	radius[r].chap = 1;
-	radiussend(r, RADIUSAUTH);
 	log(3, 0, s, t, "CHAP login %s\n", session[s].user);
+	radiussend(r, RADIUSAUTH);
 }
 
 char *ppp_lcp_types[] = {
@@ -408,7 +407,7 @@ void processlcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 		*p = EchoReply;      // reply
 		*(u32 *) (p + 4) = htonl(session[s].magic); // our magic number
 		q = makeppp(b, p, l, t, s, PPPLCP);
-		log(3, session[s].ip, s, t, "LCP: Received EchoReq. Sending EchoReply\n");
+		log(5, session[s].ip, s, t, "LCP: Received EchoReq. Sending EchoReply\n");
 		tunnelsend(b, l + (q - b), t); // send it
 	}
 	else if (*p == EchoReply)
@@ -438,7 +437,7 @@ void processipcp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 	}
 	if (*p == ConfigAck)
 	{                          // happy with our IPCP
-		u8 r = session[s].radius;
+		u16 r = session[s].radius;
 		if ((!r || radius[r].state == RADIUSIPCP) && !session[s].walled_garden)
 			if (!r)
 				r = radiusnew(s);
@@ -552,6 +551,7 @@ void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l)
 	}
 
 	session[s].cin += l;
+	session[s].total_cin += l;
 	session[s].pin++;
 	eth_tx += l;
 
@@ -560,12 +560,6 @@ void processipin(tunnelidt t, sessionidt s, u8 * p, u16 l)
 	*(u32 *)p = htonl(0x00000800);
 	l += 4;
 
-	// Plugin hook
-	{
-		struct param_packet_rx packet = { &tunnel[t], &session[s], p, l };
-		run_plugins(PLUGIN_PACKET_TX, &packet);
-	}
-
 	// send to ethernet
 	if (write(tapfd, p, l) < 0)
 	{
@@ -622,7 +616,7 @@ void processccp(tunnelidt t, sessionidt s, u8 * p, u16 l)
 void sendchap(tunnelidt t, sessionidt s)
 {
 	u8 b[MAXCONTROL];
-	u8 r = session[s].radius;
+	u16 r = session[s].radius;
 	u8 *q;
 #ifdef STAT_CALLS
 	STAT(call_sendchap);