X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/89fc6e54f0cc3655244a755b33563e9cd28612dc..659ed315c228a3dfdffec62934f924decf211aa2:/l2tpns.c?ds=sidebyside

diff --git a/l2tpns.c b/l2tpns.c
index bd255a3..50ff43f 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.110 2005/06/14 03:36:23 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.112 2005/06/24 07:05:04 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -2024,8 +2024,6 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
 						continue;
 					}
 
-					LOG(4, s, t, "Hidden AVP\n");
-
 					// Unhide the AVP
 					unhide_value(b, n, mtype, session[s].random_vector, session[s].random_vector_length);
 
@@ -2046,7 +2044,9 @@ void processudp(uint8_t * buf, int len, struct sockaddr_in *addr)
 					n = orig_len;
 				}
 
-				LOG(4, s, t, "   AVP %d (%s) len %d\n", mtype, avp_name(mtype), n);
+				LOG(4, s, t, "   AVP %d (%s) len %d%s%s\n", mtype, avp_name(mtype), n,
+					flags & 0x40 ? ", hidden" : "", flags & 0x80 ? ", mandatory" : "");
+
 				switch (mtype)
 				{
 				case 0:     // message type
@@ -2717,7 +2717,8 @@ static void regular_cleanups(double period)
 			continue;
 		}
 
-		if (session[s].ip && !(session[s].flags & SF_IPCP_ACKED))
+		if (session[s].ip && !(session[s].flags & SF_IPCP_ACKED)
+		    && !(sess_local[s].radius && radius[sess_local[s].radius].state == RADIUSIPCP))
 		{
 			// IPCP has not completed yet. Resend
 			LOG(3, s, session[s].tunnel, "No ACK for initial IPCP ConfigReq... resending\n");
@@ -2833,7 +2834,8 @@ static void regular_cleanups(double period)
 		    && !sess_local[s].radius // RADIUS already in progress
 		    && time_now - sess_local[s].last_interim >= config->radius_interim)
 		{
-			if (!(r = radiusnew(s)))
+		    	int rad = radiusnew(s);
+			if (!rad)
 			{
 				LOG(1, s, session[s].tunnel, "No free RADIUS sessions for Interim message\n");
 				STAT(radius_overflow);
@@ -2843,7 +2845,7 @@ static void regular_cleanups(double period)
 			LOG(3, s, session[s].tunnel, "Sending RADIUS Interim for %s (%u)\n",
 				session[s].user, session[s].unique_id);
 
-			radiussend(r, RADIUSINTERIM);
+			radiussend(rad, RADIUSINTERIM);
 			sess_local[s].last_interim = time_now;
 			s_actions++;
 		}
@@ -5011,11 +5013,11 @@ static void unhide_value(uint8_t *value, size_t len, uint16_t type, uint8_t *vec
 	uint8_t digest[16];
 	uint8_t *last;
 	size_t d = 0;
+	uint16_t m = htons(type);
 
 	// Compute initial pad
 	MD5Init(&ctx);
-	MD5Update(&ctx, (uint8_t) (type >> 8) & 0xff, 1);
-	MD5Update(&ctx, (uint8_t)  type       & 0xff, 1);
+	MD5Update(&ctx, (unsigned char *) &m, 2);
 	MD5Update(&ctx, config->l2tpsecret, strlen(config->l2tpsecret));
 	MD5Update(&ctx, vector, vec_len);
 	MD5Final(digest, &ctx);