X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/174de2c0d7c678252af2b9522f8e2073ab4d7ac3..8f970b69377305292619130364fb834e7a7f815d:/ppp.c

diff --git a/ppp.c b/ppp.c
index fd89d91..f70bdf2 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.101 2006/06/03 08:16:46 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.103 2007/01/25 12:36:48 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -373,7 +373,7 @@ void lcp_open(sessionidt s, tunnelidt t)
 			session[s].ip = session[first_ses].ip;
 			session[s].dns1 = session[first_ses].dns1;
 			session[s].dns2 = session[first_ses].dns2;
-			session[s].timeout = session[first_ses].timeout;
+			session[s].session_timeout = session[first_ses].session_timeout;
 			ipcp_open(s, t);
 		}
 		else
@@ -1703,17 +1703,13 @@ void processipin(sessionidt s, tunnelidt t, uint8_t *p, uint16_t l)
 	*(uint32_t *) p = htonl(PKTIP);
 	l += 4;
 
-	// Are we throttled and a slave?
-	if (session[s].tbf_in && !config->cluster_iam_master) {
-		// Pass it to the master for handling.
-		master_throttle_packet(session[s].tbf_in, p, l);
-		return;
-	}
-
-	// Are we throttled and a master??
-	if (session[s].tbf_in && config->cluster_iam_master) {
-		// Actually handle the throttled packets.
-		tbf_queue_packet(session[s].tbf_in, p, 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;
 	}