more Requested-IP-Address to DHCP-Requested-IP-Address

diff --git a/doc/antora/modules/raddb/pages/mods-available/redis_ippool.adoc b/doc/antora/modules/raddb/pages/mods-available/redis_ippool.adoc
index a383d68421dc65b3eaaa7cf886312bb1dbdc3fe6..468763b407d163a76e251ed07994fe2af54b587a 100644 (file)
--- a/doc/antora/modules/raddb/pages/mods-available/redis_ippool.adoc
+++ b/doc/antora/modules/raddb/pages/mods-available/redis_ippool.adoc
@@ -123,7 +123,7 @@ redis_ippool {
 #      wait_timeout = 2
 #      gateway = &NAS-Identifier
        device = &DHCP-Client-Hardware-Address
-       requested_address = "%{%{Requested-IP-Address}:-%{DHCP-Client-IP-Address}}"
+       requested_address = "%{%{DHCP-Requested-IP-Address}:-%{DHCP-Client-IP-Address}}"
 #      ipv4_integer = yes
        allocated_address_attr = &reply.DHCP-Your-IP-Address
        range_attr = &reply.IP-Pool.Range

diff --git a/raddb/mods-available/redis_ippool b/raddb/mods-available/redis_ippool
index f5f26c34e15ae52fffa13b738fc00db7f7bdd5b3..007cab875f1694d44bb84d5ba7d20cf82207126f 100644 (file)
--- a/raddb/mods-available/redis_ippool
+++ b/raddb/mods-available/redis_ippool
@@ -102,7 +102,7 @@ redis_ippool {
        #
        #  requested_address:: The IP address being renewed or released.
        #
-       requested_address = "%{%{Requested-IP-Address}:-%{DHCP-Client-IP-Address}}"
+       requested_address = "%{%{DHCP-Requested-IP-Address}:-%{DHCP-Client-IP-Address}}"
 
        #
        #  ipv4_integer:: Whether IPv4 addresses should be cast to integers, for renew operations.

diff --git a/raddb/mods-available/sqlippool b/raddb/mods-available/sqlippool
index 3e5902a9ecff38bd169ea3932221be3661cfa9fc..48ce9ceb73976eff4ff583f469ef0acb692b2522 100644 (file)
--- a/raddb/mods-available/sqlippool
+++ b/raddb/mods-available/sqlippool
@@ -112,11 +112,11 @@ sqlippool {
        #  For RADIUS the requested_address will almost always be `%{radius.Framed-IP-Address}`.
        #
        #  For DHCPv4 the requested_address will almost always be
-       #  `%{%{dhcpv4.Requested-IP-Address}:-%{dhcpv4.DHCP-Client-IP-Address}}`.
+       #  `%{%{dhcpv4.DHCP-Requested-IP-Address}:-%{dhcpv4.DHCP-Client-IP-Address}}`.
        #
        requested_address = "%{radius.Framed-IP-Address}"
 
-#      requested_address = "%{%{dhcpv4.Requested-IP-Address}:-%{dhcpv4.DHCP-Client-IP-Address}}"
+#      requested_address = "%{%{dhcpv4.DHCP-Requested-IP-Address}:-%{dhcpv4.DHCP-Client-IP-Address}}"
 
        #
        #  gateway:: The device controlling access to the network or relaying

diff --git a/raddb/sites-available/dhcp b/raddb/sites-available/dhcp
index dc0205fa0bdaf804c4ae8b3a9618d0e7212af686..21c8341353023620588f60d58519b2b6683ba42d 100644 (file)
--- a/raddb/sites-available/dhcp
+++ b/raddb/sites-available/dhcp
@@ -225,7 +225,7 @@ recv Request {
 
        if (ok) {
                update reply {
-                       &DHCP-Your-IP-Address := "%{%{request.Requested-IP-Address}:-{request.DHCP-Client-IP-Address}}"
+                       &DHCP-Your-IP-Address := "%{%{request.DHCP-Requested-IP-Address}:-{request.DHCP-Client-IP-Address}}"
                }
        }
 

diff --git a/share/dictionary/dhcpv4/dictionary.rfc2131 b/share/dictionary/dhcpv4/dictionary.rfc2131
index f1d3dc85a60b6566dadc4bd0487e0ad1362a8c63..57e9a06103a5d93ee0b72e954a8e78d4790e68ba 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary.rfc2131
+++ b/share/dictionary/dhcpv4/dictionary.rfc2131
@@ -415,7 +415,7 @@ VALUE       DHCP-Parameter-Request-List     DHCP-NETBIOS-Node-Type  46
 VALUE  DHCP-Parameter-Request-List     DHCP-NETBIOS            47
 VALUE  DHCP-Parameter-Request-List     DHCP-X-Window-Font-Server 48
 VALUE  DHCP-Parameter-Request-List     DHCP-X-Window-Display-Mgr 49
-VALUE  DHCP-Parameter-Request-List     Requested-IP-Address 50
+VALUE  DHCP-Parameter-Request-List     DHCP-Requested-IP-Address 50
 VALUE  DHCP-Parameter-Request-List     DHCP-IP-Address-Lease-Time 51
 VALUE  DHCP-Parameter-Request-List     DHCP-Overload           52
 VALUE  DHCP-Parameter-Request-List     DHCP-Message-Type       53

diff --git a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
index 7e17c1965e92ca94fbfb8ffd5ae32d34a2ff416c..36989b5cd9b76f4421455f53029abf635445f5ff 100644 (file)
--- a/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
+++ b/src/modules/rlm_redis_ippool/rlm_redis_ippool.c
@@ -119,7 +119,7 @@ static CONF_PARSER module_config[] = {
        { FR_CONF_OFFSET("wait_num", FR_TYPE_UINT32, rlm_redis_ippool_t, wait_num) },
        { FR_CONF_OFFSET("wait_timeout", FR_TYPE_TIME_DELTA, rlm_redis_ippool_t, wait_timeout) },
 
-       { FR_CONF_OFFSET("requested_address", FR_TYPE_TMPL | FR_TYPE_REQUIRED, rlm_redis_ippool_t, requested_address), .dflt = "%{%{Requested-IP-Address}:-%{DHCP-Client-IP-Address}}", .quote = T_DOUBLE_QUOTED_STRING },
+       { FR_CONF_OFFSET("requested_address", FR_TYPE_TMPL | FR_TYPE_REQUIRED, rlm_redis_ippool_t, requested_address), .dflt = "%{%{DHCP-Requested-IP-Address}:-%{DHCP-Client-IP-Address}}", .quote = T_DOUBLE_QUOTED_STRING },
        { FR_CONF_DEPRECATED("ip_address", FR_TYPE_TMPL | FR_TYPE_REQUIRED, rlm_redis_ippool_t, NULL) },
 
        { FR_CONF_OFFSET("allocated_address_attr", FR_TYPE_TMPL | FR_TYPE_ATTRIBUTE | FR_TYPE_REQUIRED, rlm_redis_ippool_t, allocated_address_attr), .dflt = "&reply.DHCP-Your-IP-Address", .quote = T_BARE_WORD },