Fixup ADSL forum attributes

diff --git a/doc/antora/modules/howto/pages/modules/sqlippool/index.adoc b/doc/antora/modules/howto/pages/modules/sqlippool/index.adoc
index f0526c79ac2c0f2074c88cf34d92acb083db5d66..701db305d1b6fd7955bb15c08f8ac7a7d545120c 100644 (file)
--- a/doc/antora/modules/howto/pages/modules/sqlippool/index.adoc
+++ b/doc/antora/modules/howto/pages/modules/sqlippool/index.adoc
@@ -1101,7 +1101,7 @@ In many fixed-line configurations a unique identifier for a device may be the
 `NAS-Port` or `NAS-Port-Id`. In other scenarios identifiers based on the NAS
 port may be shared by several devices and are unsuitable for uniquely
 identifying devices. In some cases a circuit-specific identifier such as
-`ADSL-Agent-Circuit-Id` may be present.
+`Vendor-Specific.ADSL-Forum.Agent-Circuit-ID` may be present.
 
 CAUTION: However, a circuit-specific identifier is unsuitable if there are
 multiple hosts on the circuit with which you issue individual addresses (for
@@ -1113,7 +1113,7 @@ The `Calling-Station-Id` attribute may contain host specific information (such
 as a hardware address). You should consider the provenance of the data and
 whether you trust it, e.g. does it report a MAC address that is under an
 untrusted user's control.  Sometimes a combination of attributes including one
-that you trust (such as "%{ADSL-Agent-Circuit-Id}:%{Calling-Station-Id}") may
+that you trust (such as "%{Vendor-Specific.ADSL-Forum.Agent-Circuit-ID}:%{Calling-Station-Id}") may
 be appropriate.
 
 The `pool_key` is used to issue indexed lookups into the `radippool` table so for

diff --git a/raddb/mods-available/redis_ippool b/raddb/mods-available/redis_ippool
index 4531104296557c0136e0a0fd7d4a33e7ec6c6bde..81782e6e550703ce80916870a7b2085ba642d11c 100644 (file)
--- a/raddb/mods-available/redis_ippool
+++ b/raddb/mods-available/redis_ippool
@@ -94,10 +94,10 @@ redis_ippool {
        #  On a hostile network it SHOULD include a component that you trust,
        #  arranged such that the overall key cannot be spoofed by manipulation
        #  of the user-controlled data. For example you might determine that
-       #  ADSL-Agent-Circuit-Id is trusted but that Calling-Station-Id is
+       #  Vendor-Specific.ADSL-Forum.Agent-Circuit-ID is trusted but that Calling-Station-Id is
        #  formatted as a user-controlled MAC address:
        #
-#      owner = "%{ADSL-Agent-Circuit-Id} %{Calling-Station-Id}"
+#      owner = "%{Vendor-Specific.ADSL-Forum.Agent-Circuit-ID} %{Calling-Station-Id}"
 
        #
        #  requested_address:: The IP address being renewed or released.

diff --git a/raddb/mods-available/sqlippool b/raddb/mods-available/sqlippool
index 0e7a259282088840315d1fbe9dd99c538ae955ac..159a36a64e6005d5062a67fca4c5b546df0a8302 100644 (file)
--- a/raddb/mods-available/sqlippool
+++ b/raddb/mods-available/sqlippool
@@ -88,7 +88,7 @@ sqlippool {
        #  manipulation of the user-controlled data (i.e. the mac or identifier)
        #  provided by the user's device.
        #
-       #  For example it might be that the value `ADSL-Agent-Circuit-Id` is
+       #  For example it might be that the value `Vendor-Specific.ADSL-Forum.Agent-Circuit-ID` is
        #  considered trusted as it's set by a controlled device at the edge of
        #  the network.  Calling-Station-Id however, is usually provided by
        #  the user's device so may be spoofed.
@@ -98,11 +98,11 @@ sqlippool {
        #  that it contains both the trusted and untrusted attributes, or if
        #  the trusted attribute is sufficiently stable and unique, only the
        #  trusted attribute.
-       #  One example would be `%{ADSL-Agent-Circuit-Id}.%{Calling-Station-Id}`.`
+       #  One example would be `%{Vendor-Specific.ADSL-Forum.Agent-Circuit-ID}.%{Calling-Station-Id}`.`
        #
        owner = "%{radius.Calling-Station-ID}"
 
-#       owner = "%{radius.ADSL-Agent-Circuit-Id}.%{radius.Calling-Station-Id}"
+#       owner = "%{radius.Vendor-Specific.ADSL-Forum.Agent-Circuit-ID}.%{radius.Calling-Station-Id}"
 
 #      owner = "%{%{dhcpv4.DHCP-Client-Identifier}:-%{dhcpv4.DHCP-Client-Hardware-Address}}"
 

diff --git a/share/dictionary/radius/dictionary.rfc4679 b/share/dictionary/radius/dictionary.rfc4679
index c7f1d6757d0adade6fdf24c33ba81bb96da650a1..02ae47ce84323217d6abc747cc5af7b7d1b91714 100644 (file)
--- a/share/dictionary/radius/dictionary.rfc4679
+++ b/share/dictionary/radius/dictionary.rfc4679
@@ -13,18 +13,12 @@ VENDOR              ADSL-Forum                      3561
 
 BEGIN-VENDOR   ADSL-Forum
 
-#
-#  Glue attribute to allow decoding of ADSL-Form vendor specific
-#  DHCP options.
-#
-ATTRIBUTE      ADSL-Forum-DHCP-Vendor-Specific         0       tlv
-
 #
 #  The first two attributes are prefixed with "ADSL-" because of
 #  conflicting names in dictionary.redback.
 #
-ATTRIBUTE      ADSL-Agent-Circuit-Id                   1       octets
-ATTRIBUTE      ADSL-Agent-Remote-Id                    2       octets
+ATTRIBUTE      Agent-Circuit-Id                        1       octets
+ATTRIBUTE      Agent-Remote-Id                         2       octets
 ATTRIBUTE      Actual-Data-Rate-Upstream               129     integer
 ATTRIBUTE      Actual-Data-Rate-Downstream             130     integer
 ATTRIBUTE      Minimum-Data-Rate-Upstream              131     integer