X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/e528336407f2809593d400cd70a666c943c2861f..1e198ac0e264ba4c9ab1abfc6892b40e92bf72e3:/l2tpns.c?ds=sidebyside

diff --git a/l2tpns.c b/l2tpns.c
index 4a91a3f..3a7d851 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.123 2005/08/12 08:35:16 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.129 2005/09/12 05:16:42 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -135,6 +135,7 @@ config_descriptt config_values[] = {
 	CONFIG("packet_limit", max_packets, INT),
 	CONFIG("cluster_address", cluster_address, IPv4),
 	CONFIG("cluster_interface", cluster_interface, STRING),
+	CONFIG("cluster_mcast_ttl", cluster_mcast_ttl, INT),
 	CONFIG("cluster_hb_interval", cluster_hb_interval, INT),
 	CONFIG("cluster_hb_timeout", cluster_hb_timeout, INT),
  	CONFIG("cluster_master_min_adv", cluster_master_min_adv, INT),
@@ -1580,7 +1581,7 @@ void sessionshutdown(sessionidt s, char *reason, int result, int error)
 
 void sendipcp(sessionidt s, tunnelidt t)
 {
-	uint8_t buf[MAXCONTROL];
+	uint8_t buf[MAXETHER];
 	uint8_t *q;
 
 	CSTAT(sendipcp);
@@ -1592,7 +1593,7 @@ void sendipcp(sessionidt s, tunnelidt t)
 		session[s].unique_id = last_id;
 	}
 
-	q = makeppp(buf,sizeof(buf), 0, 0, s, t, PPPIPCP);
+	q = makeppp(buf, sizeof(buf), 0, 0, s, t, PPPIPCP);
 	if (!q) return;
 
 	*q = ConfigReq;
@@ -1609,13 +1610,13 @@ void sendipcp(sessionidt s, tunnelidt t)
 
 void sendipv6cp(sessionidt s, tunnelidt t)
 {
-	uint8_t buf[MAXCONTROL];
+	uint8_t buf[MAXETHER];
 	uint8_t *q;
 
 	CSTAT(sendipv6cp);
 	LOG(3, s, t, "IPV6CP: send ConfigReq\n");
 
-	q = makeppp(buf,sizeof(buf), 0, 0, s, t, PPPIPV6CP);
+	q = makeppp(buf, sizeof(buf), 0, 0, s, t, PPPIPV6CP);
 	if (!q) return;
 
 	*q = ConfigReq;
@@ -1826,6 +1827,11 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 		return;
 	}
 	l -= (p - buf);
+
+	// used to time out old tunnels
+	if (t && tunnel[t].state == TUNNELOPEN)
+		tunnel[t].lastrec = time_now;
+
 	if (*buf & 0x80)
 	{                          // control
 		uint16_t message = 0xFFFF;	// message type
@@ -1913,9 +1919,6 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 			return;
 		}
 
-		// This is used to time out old tunnels
-		tunnel[t].lastrec = time_now;
-
 		// check sequence of this message
 		{
 			int skip = tunnel[t].window; // track how many in-window packets are still in queue
@@ -2294,7 +2297,7 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 						controlt *c = controlnew(2); // sending SCCRP
 						control16(c, 2, version, 1); // protocol version
 						control32(c, 3, 3, 1); // framing
-						controls(c, 7, tunnel[t].hostname, 1); // host name (TBA)
+						controls(c, 7, hostname, 1); // host name
 						if (chapresponse) controlb(c, 13, chapresponse, 16, 1); // Challenge response
 						control16(c, 9, t, 1); // assigned tunnel
 						controladd(c, 0, t); // send the resply
@@ -2378,15 +2381,16 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr)
 					if (amagic == 0) amagic = time_now;
 					session[s].magic = amagic; // set magic number
 					session[s].l2tp_flags = aflags; // set flags received
+					session[s].mru = DEFAULT_MRU;
 					controlnull(t); // ack
 
 					// start LCP
-					sendlcp(s, t, config->radius_authprefer);
 					sess_local[s].lcp.restart = time_now + config->ppp_restart_time;
 					sess_local[s].lcp.conf_sent = 1;
 					sess_local[s].lcp.nak_sent = 0;
 					sess_local[s].lcp_authtype = config->radius_authprefer;
 					session[s].ppp.lcp = RequestSent;
+					sendlcp(s, t);
 
 					break;
 				case 14:      // CDN
@@ -2644,7 +2648,7 @@ static void regular_cleanups(double period)
 			}
 		}
 		// Send hello
-		if (tunnel[t].state == TUNNELOPEN && tunnel[t].lastrec < TIME + 600)
+		if (tunnel[t].state == TUNNELOPEN && (time_now - tunnel[t].lastrec) > 60)
 		{
 			controlt *c = controlnew(6); // sending HELLO
 			controladd(c, 0, t); // send the message
@@ -2717,7 +2721,7 @@ static void regular_cleanups(double period)
 					LOG(3, s, session[s].tunnel, "No ACK for LCP ConfigReq... resending\n");
 					sess_local[s].lcp.restart = time_now + config->ppp_restart_time;
 					sess_local[s].lcp.conf_sent++;
-					sendlcp(s, session[s].tunnel, sess_local[s].lcp_authtype);
+					sendlcp(s, session[s].tunnel);
 					change_state(s, lcp, next_state);
 				}
 				else
@@ -2832,7 +2836,7 @@ static void regular_cleanups(double period)
 		// No data in ECHO_TIMEOUT seconds, send LCP ECHO
 		if (session[s].ppp.phase >= Establish && (time_now - session[s].last_packet >= ECHO_TIMEOUT))
 		{
-			uint8_t b[MAXCONTROL] = {0};
+			uint8_t b[MAXETHER];
 
 			uint8_t *q = makeppp(b, sizeof(b), 0, 0, s, session[s].tunnel, PPPLCP);
 			if (!q) continue;
@@ -3468,6 +3472,7 @@ static void initdata(int optdebug, char *optconfig)
 	config->debug = optdebug;
 	config->num_tbfs = MAXTBFS;
 	config->rl_rate = 28; // 28kbps
+	config->cluster_mcast_ttl = 1;
  	config->cluster_master_min_adv = 1;
 	config->ppp_restart_time = 3;
 	config->ppp_max_configure = 10;