X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/c1d1c2a8c4f22c3911d392393072327b0e319c5e..dac7fe82bb8d933fb3a68cb9c0256dac6f4470ae:/ppp.c

diff --git a/ppp.c b/ppp.c
index cb39db6..0ffacd3 100644
--- a/ppp.c
+++ b/ppp.c
@@ -5,6 +5,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <sys/socket.h>
+#include <linux/rtnetlink.h>
+
 #include "l2tpns.h"
 #include "constants.h"
 #include "plugin.h"
@@ -1735,7 +1738,7 @@ static void update_sessions_in_stat(sessionidt s, uint16_t l)
 // (i.e. this routine writes to p[-4]).
 void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 {
-	in_addr_t ip;
+	in_addr_t ip, ip_dst;
 
 	CSTAT(processipin);
 
@@ -1749,6 +1752,7 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 	}
 
 	ip = ntohl(*(uint32_t *)(p + 12));
+	ip_dst = *(uint32_t *)(p + 16);
 
 	if (l > MAXETHER)
 	{
@@ -1789,12 +1793,15 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 
 	if (session[s].tbf_in)
 	{
-		// Are we throttling this session?
-		if (config->cluster_iam_master)
-			tbf_queue_packet(session[s].tbf_in, p, l);
-		else
-			master_throttle_packet(session[s].tbf_in, p, l);
-		return;
+		if (!config->no_throttle_local_IP || !sessionbyip(ip_dst))
+		{
+			// Are we throttling this session?
+			if (config->cluster_iam_master)
+				tbf_queue_packet(session[s].tbf_in, p, l);
+			else
+				master_throttle_packet(session[s].tbf_in, p, l);
+			return;
+		}
 	}
 
 	// send to ethernet
@@ -2507,9 +2514,9 @@ void sendchap(sessionidt s, tunnelidt t)
 	q[1] = radius[r].id;			// ID
 	q[4] = 16;				// value size (size of challenge)
 	memcpy(q + 5, radius[r].auth, 16);	// challenge
-	strcpy((char *) q + 21, hostname);	// our name
-	*(uint16_t *) (q + 2) = htons(strlen(hostname) + 21); // length
-	tunnelsend(b, strlen(hostname) + 21 + (q - b), t); // send it
+	strcpy((char *) q + 21, config->multi_n_hostname[tunnel[t].indexudp][0]?config->multi_n_hostname[tunnel[t].indexudp]:hostname);	// our name
+	*(uint16_t *) (q + 2) = htons(strlen(config->multi_n_hostname[tunnel[t].indexudp][0]?config->multi_n_hostname[tunnel[t].indexudp]:hostname) + 21); // length
+	tunnelsend(b, strlen(config->multi_n_hostname[tunnel[t].indexudp][0]?config->multi_n_hostname[tunnel[t].indexudp]:hostname) + 21 + (q - b), t); // send it
 }
 
 // fill in a L2TP message with a PPP frame,