X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/2d66b44732405bb788287bed726de637a20df68f..5151ca40547c87612360f4115a9e17837f64d2b6:/l2tpns.c?ds=sidebyside

diff --git a/l2tpns.c b/l2tpns.c
index ab9aded..3c90f6a 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -4,7 +4,7 @@
 // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced
 // vim: sw=8 ts=8
 
-char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.147 2005-11-14 08:38:02 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.152 2005-12-14 02:19:15 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -96,9 +96,9 @@ uint32_t eth_tx = 0;
 static uint32_t ip_pool_size = 1;	// Size of the pool of addresses used for dynamic address allocation.
 time_t time_now = 0;			// Current time in seconds since epoch.
 static char time_now_string[64] = {0};	// Current time as a string.
-int time_changed = 0;			// time_now changed
+static int time_changed = 0;		// time_now changed
 char main_quit = 0;			// True if we're in the process of exiting.
-char main_reload = 0;			// Re-load pending
+static char main_reload = 0;		// Re-load pending
 linked_list *loaded_plugins;
 linked_list *plugins[MAX_PLUGIN_TYPES];
 
@@ -554,6 +554,13 @@ static void inittun(void)
 		LOG(0, 0, 0, "Error setting tun queue length: %s\n", strerror(errno));
 		exit(1);
 	}
+	/* set MTU to modem MRU + 4 (tun header) */
+	ifr.ifr_mtu = MRU + 4;
+	if (ioctl(ifrfd, SIOCSIFMTU, (void *) &ifr) < 0)
+	{
+		LOG(0, 0, 0, "Error setting tun MTU: %s\n", strerror(errno));
+		exit(1);
+	}
 	ifr.ifr_flags = IFF_UP;
 	if (ioctl(ifrfd, SIOCSIFFLAGS, (void *) &ifr) < 0)
 	{
@@ -933,18 +940,14 @@ void tunnelsend(uint8_t * buf, uint16_t l, tunnelidt t)
 
 	if (!t)
 	{
-		static int backtrace_count = 0;
 		LOG(0, 0, t, "tunnelsend called with 0 as tunnel id\n");
 		STAT(tunnel_tx_errors);
-		log_backtrace(backtrace_count, 5)
 		return;
 	}
 
 	if (!tunnel[t].ip)
 	{
-		static int backtrace_count = 0;
 		LOG(1, 0, t, "Error sending data out tunnel: no remote endpoint (tunnel not set up)\n");
-		log_backtrace(backtrace_count, 5)
 		STAT(tunnel_tx_errors);
 		return;
 	}
@@ -1043,7 +1046,7 @@ void adjust_tcp_mss(sessionidt s, tunnelidt t, uint8_t *buf, int len, uint8_t *t
 	sum = orig + (~MSS & 0xffff);
 	sum += ntohs(*(uint16_t *) (tcp + 16));
 	sum = (sum & 0xffff) + (sum >> 16);
-	*(uint16_t *) (tcp + 16) = htons(sum);
+	*(uint16_t *) (tcp + 16) = htons(sum + (sum >> 16));
 }
 
 // process outgoing (to tunnel) IP
@@ -1170,7 +1173,8 @@ static void processipout(uint8_t *buf, int len)
 			master_throttle_packet(sp->tbf_out, data, size);
 		return;
 	}
-	else if (sp->walled_garden && !config->cluster_iam_master)
+
+	if (sp->walled_garden && !config->cluster_iam_master)
 	{
 		// We are walled-gardening this
 		master_garden_packet(s, data, size);
@@ -2607,29 +2611,9 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 		}
 		else if (session[s].ppp.lcp == Opened)
 		{
-			uint8_t buf[MAXETHER];
-			uint8_t *q;
-			int mru = session[s].mru;
-			if (mru > sizeof(buf)) mru = sizeof(buf);
-
-			l += 6;
-			if (l > mru) l = mru;
-
-			q = makeppp(buf, sizeof(buf), 0, 0, s, t, PPPLCP);
-			if (!q) return;
-
-			*q = ProtocolRej;
-			*(q + 1) = ++sess_local[s].lcp_ident;
-			*(uint16_t *)(q + 2) = htons(l);
-			*(uint16_t *)(q + 4) = htons(proto);
-			memcpy(q + 6, p, l - 6);
-
-			if (proto == PPPIPV6CP)
-				LOG(3, s, t, "LCP: send ProtocolRej (IPV6CP: not configured)\n");
-			else
-				LOG(2, s, t, "LCP: sent ProtocolRej (0x%04X: unsupported)\n", proto);
-
-			tunnelsend(buf, l + (q - buf), t);
+			session[s].last_packet = time_now;
+			if (!config->cluster_iam_master) { master_forward_packet(buf, len, addr->sin_addr.s_addr, addr->sin_port); return; }
+			protoreject(s, t, p, l, proto);
 		}
 		else
 		{
@@ -5350,10 +5334,9 @@ int ip_filter(uint8_t *buf, int len, uint8_t filter)
 
 		if (frag_offset)
 		{
-			// non-fragmented deny rules are skipped if containing L4 matches
-			if (!rule->frag &&
-			    (rule->src_ports.op || rule->dst_ports.op || rule->tcp_flag_op) &&
-			    rule->action == FILTER_ACTION_DENY)
+			// layer 4 deny rules are skipped
+			if (rule->action == FILTER_ACTION_DENY &&
+			    (rule->src_ports.op || rule->dst_ports.op || rule->tcp_flag_op))
 				continue;
 		}
 		else