X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/b2bd9655946aa73a31b5e5d9baf417cd38938cd8..8ba3da90adb77aa5f2915d72923b774a0d2fd1ae:/l2tpns.c

diff --git a/l2tpns.c b/l2tpns.c
index 6287c3e..804e1ad 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.154 2005/12/20 04:57:16 bodea Exp $";
+char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.156 2006/02/17 13:27:07 bodea Exp $";
 
 #include <arpa/inet.h>
 #include <assert.h>
@@ -3301,9 +3301,17 @@ static void mainloop(void)
 					break;
 
 				case FD_TYPE_RADIUS: // RADIUS response
-					s = recv(radfds[d->index], buf, sizeof(buf), 0);
+					alen = sizeof(addr);
+					s = recvfrom(radfds[d->index], buf, sizeof(buf), MSG_WAITALL, (void *) &addr, &alen);
 					if (s >= 0 && config->cluster_iam_master)
-						processrad(buf, s, d->index);
+					{
+						if (addr.sin_addr.s_addr == config->radiusserver[0] ||
+						    addr.sin_addr.s_addr == config->radiusserver[1])
+							processrad(buf, s, d->index);
+						else
+							LOG(3, 0, 0, "Dropping RADIUS packet from unknown source %s\n",
+								fmtaddr(addr.sin_addr.s_addr, 0));
+					}
 
 					n--;
 					break;
@@ -3949,7 +3957,7 @@ static void initippool()
 		else
 		{
 			// It's a single ip address
-			add_to_ip_pool(inet_addr(pool), 0);
+			add_to_ip_pool(ntohl(inet_addr(pool)), 0);
 		}
 	}
 	fclose(f);