X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/344fe615102c3939f44d623a56326b9ae58b4df7..83699acac624ac96dbc6b387ffeab3e4b85ab4bc:/l2tpns.c?ds=sidebyside

diff --git a/l2tpns.c b/l2tpns.c
index f2000f5..f30ada8 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.102 2005-05-12 04:08:45 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.105 2005-05-26 12:17:30 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -131,6 +131,7 @@ config_descriptt config_values[] = {
 	CONFIG("cluster_interface", cluster_interface, STRING),
 	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),
 	CONFIG("ipv6_prefix", ipv6_prefix, IPv6),
 	{ NULL, 0, 0, 0 },
 };
@@ -1566,7 +1567,7 @@ void sendipcp(tunnelidt t, sessionidt s)
 	if (!q) return;
 
 	*q = ConfigReq;
-	q[1] = r << RADIUS_SHIFT;                    // ID, dont care, we only send one type of request
+	q[1] = r >> RADIUS_SHIFT;                    // ID, dont care, we only send one type of request
 	*(uint16_t *) (q + 2) = htons(10);
 	q[4] = 3;
 	q[5] = 6;
@@ -1588,7 +1589,7 @@ void sendipcp(tunnelidt t, sessionidt s)
 		if (!q) return;
 
 		*q = ConfigReq;
-		q[1] = r << RADIUS_SHIFT;		// ID, don't care, we
+		q[1] = r >> RADIUS_SHIFT;		// ID, don't care, we
 							// only send one type
 							// of request
 		*(uint16_t *) (q + 2) = htons(14);
@@ -2305,8 +2306,6 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
 					// TBA
 					break;
 				case 10:      // ICRQ
-					controlt *c;
-
 					if (sessionfree)
 					{
 						uint16_t r;
@@ -2321,7 +2320,7 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
 						// make a RADIUS session
 						if ((r = radiusnew(s)))
 						{
-							c = controlnew(11); // sending ICRP
+							controlt *c = controlnew(11); // sending ICRP
 							session[s].opened = time_now;
 							session[s].tunnel = t;
 							session[s].far = asession;
@@ -2347,9 +2346,11 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
 						LOG(1, 0, t, "No free sessions\n");
 					}
 
-					c = controlnew(14); // CDN
-					control16(c, 1, 4, 1); // temporary lack of resources
-					controladd(c, session[s].tunnel, asession); // send the message
+					{
+						controlt *c = controlnew(14); // CDN
+						control16(c, 1, 4, 1); // temporary lack of resources
+						controladd(c, session[s].tunnel, asession); // send the message
+					}
 					return;
 				case 11:      // ICRP
 					// TBA
@@ -2361,8 +2362,11 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
 					LOG(3, s, t, "Magic %X Flags %X\n", amagic, aflags);
 					controlnull(t); // ack
 					// proxy authentication type is not supported
-					if (authtype && !(config->radius_authtypes & authtype))
-						sendlcp(t, s, config->radius_authprefer);
+					if (!(config->radius_authtypes & authtype))
+						authtype = config->radius_authprefer;
+
+					// start LCP
+					sendlcp(t, s, authtype);
 					break;
 				case 14:      // CDN
 					controlnull(t); // ack
@@ -3196,6 +3200,7 @@ static void initdata(int optdebug, char *optconfig)
 	config->debug = optdebug;
 	config->num_tbfs = MAXTBFS;
 	config->rl_rate = 28; // 28kbps
+ 	config->cluster_master_min_adv = 1;
 	strcpy(config->random_device, RANDOMDEVICE);
 
 	log_stream = stderr;
@@ -4002,7 +4007,7 @@ static void update_config()
 	if (!config->numradiusservers)
 		LOG(0, 0, 0, "No RADIUS servers defined!\n");
 
-	config->num_radfds = 2 << RADIUS_SHIFT;
+	config->num_radfds = 1 << RADIUS_SHIFT;
 
 	// parse radius_authtypes_s
 	config->radius_authtypes = config->radius_authprefer = 0;