From: Ruslan Shevchenko <ruslan@shevchenko.kiev.ua>
Date: Tue, 10 May 2011 19:15:26 +0000 (+0300)
Subject: added support of dhcp to rlm_ippool
X-Git-Tag: release_3_0_0_beta0~829
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cb14f8e4243ef36d25b30957bfb88958ef34ed8;p=thirdparty%2Ffreeradius-server.git

added support of dhcp to rlm_ippool
---

diff --git a/src/include/dhcp.h b/src/include/dhcp.h
index 0b36ec0c21c..63ab5e96b71 100644
--- a/src/include/dhcp.h
+++ b/src/include/dhcp.h
@@ -61,6 +61,11 @@ int fr_dhcp_decode(RADIUS_PACKET *packet);
 #define DHCP_BASE_ATTR(x) (x & 0xff)
 #define DHCP_UNPACK_OPTION1(x) (((x) & 0xff00) >> 8)
 
+#define PW_DHCP_MESSAGE_TYPE   (53)
+#define PW_DHCP_YOU_IP_ADDRESS (264)
+#define PW_DHCP_SUBNET_MASK    (1)
+#define PW_DHCP_IP_ADDRESS_LEASE_TIME (51)
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/modules/rlm_ippool/rlm_ippool.c b/src/modules/rlm_ippool/rlm_ippool.c
index 6d811ea8284..bdb8e352cb4 100644
--- a/src/modules/rlm_ippool/rlm_ippool.c
+++ b/src/modules/rlm_ippool/rlm_ippool.c
@@ -64,6 +64,10 @@ RCSID("$Id$")
 #include "config.h"
 #include <ctype.h>
 
+#ifdef WITH_DHCP
+#include <freeradius-devel/dhcp.h>
+#endif
+
 #include "../../include/md5.h"
 
 #include <gdbm.h>
@@ -451,6 +455,12 @@ static int ippool_postauth(void *instance, REQUEST *request)
 	char hex_str[35];
 	char xlat_str[MAX_STRING_LEN];
 	FR_MD5_CTX md5_context;
+#ifdef WITH_DHCP
+        int dhcp = FALSE;
+#endif
+        int attr_ipaddr = PW_FRAMED_IP_ADDRESS;
+        int attr_ipmask = PW_FRAMED_IP_NETMASK;
+        int vendor_ipaddr = 0;
 
 
 	/* quiet the compiler */
@@ -475,6 +485,14 @@ static int ippool_postauth(void *instance, REQUEST *request)
 	if ((vp = pairfind(request->packet->vps, PW_CALLING_STATION_ID, 0)) != NULL)
 		cli = vp->vp_strvalue;
 
+#ifdef WITH_DHCP
+        if (request->listener->type == RAD_LISTEN_DHCP) {
+		dhcp = 1;
+		attr_ipaddr = PW_DHCP_YOUR_IP_ADDRESS;
+		vendor_ipaddr = DHCP_MAGIC_VENDOR;
+		attr_ipmask = PW_DHCP_SUBNET_MASK;
+	}
+#endif
 
 	if (!radius_xlat(xlat_str,MAX_STRING_LEN,data->key, request, NULL)){
 		RDEBUG("xlat on the 'key' directive failed");
@@ -561,15 +579,15 @@ static int ippool_postauth(void *instance, REQUEST *request)
 	pthread_mutex_unlock(&data->op_mutex);
 
 	/*
-	 * If there is a Framed-IP-Address attribute in the reply, check for override
+	 * If there is a Framed-IP-Address (or Dhcp-Your-IP-Address)
+	 * attribute in the reply, check for override
 	 */
-	if (pairfind(request->reply->vps, PW_FRAMED_IP_ADDRESS, 0) != NULL) {
-		RDEBUG("Found Framed-IP-Address attribute in reply attribute list.");
+	if (pairfind(request->reply->vps, attr_ipaddr, vendor_ipaddr) != NULL) {
+		RDEBUG("Found IP address attribute in reply attribute list.");
 		if (data->override)
 		{
-			/* Override supplied Framed-IP-Address */
-			RDEBUG("override is set to yes. Override the existing Framed-IP-Address attribute.");
-			pairdelete(&request->reply->vps, PW_FRAMED_IP_ADDRESS, 0);
+			RDEBUG("Override supplied IP address");
+			pairdelete(&request->reply->vps, attr_ipaddr, vendor_ipaddr);
 		} else {
 			/* Abort */
 			RDEBUG("override is set to no. Return NOOP.");
@@ -729,10 +747,19 @@ static int ippool_postauth(void *instance, REQUEST *request)
 		free(key_datum.dptr);
 		entry.active = 1;
 		entry.timestamp = request->timestamp;
-		if ((vp = pairfind(request->reply->vps, PW_SESSION_TIMEOUT, 0)) != NULL)
+		if ((vp = pairfind(request->reply->vps, PW_SESSION_TIMEOUT, 0)) != NULL) {
 			entry.timeout = (time_t) vp->vp_integer;
-		else
+#ifdef WITH_DHCP
+			if (dhcp) {
+		                vp = radius_paircreate(request, &request->reply->vps,
+						       PW_DHCP_IP_ADDRESS_LEASE_TIME, DHCP_MAGIC_VENDOR, PW_TYPE_INTEGER);
+				vp->vp_integer = entry.timeout;
+				pairdelete(&request->reply->vps, PW_SESSION_TIMEOUT, 0);
+                        }
+#endif
+		} else {
 			entry.timeout = 0;
+		}
 		if (extra)
 			entry.extra = 1;
 		data_datum.dptr = (char *) &entry;
@@ -775,16 +802,16 @@ static int ippool_postauth(void *instance, REQUEST *request)
 
 		RDEBUG("Allocated ip %s to client key: %s",ip_ntoa(str,entry.ipaddr),hex_str);
 		vp = radius_paircreate(request, &request->reply->vps,
-				       PW_FRAMED_IP_ADDRESS, 0, PW_TYPE_IPADDR);
+				       attr_ipaddr, vendor_ipaddr, PW_TYPE_IPADDR);
 		vp->vp_ipaddr = entry.ipaddr;
 
 		/*
 		 *	If there is no Framed-Netmask attribute in the
 		 *	reply, add one
 		 */
-		if (pairfind(request->reply->vps, PW_FRAMED_IP_NETMASK, 0) == NULL) {
+		if (pairfind(request->reply->vps, attr_ipmask, vendor_ipaddr) == NULL) {
 			vp = radius_paircreate(request, &request->reply->vps,
-					       PW_FRAMED_IP_NETMASK, 0,
+					       attr_ipmask, vendor_ipaddr,
 					       PW_TYPE_IPADDR);
 			vp->vp_ipaddr = ntohl(data->netmask);
 		}