Update dictionary.erx (#3313)

Refreshed against upstream documentation linked in the comments.

Also attribute ERX-Cos-Shaping-Rate (177) seen on the wire.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 5dc44500830dcde65dedf5f1f5108b62834f6d64..7852f3da79026d7059f018598b2911b10e264f2c 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -26,6 +26,7 @@ FreeRADIUS 3.0.21 Thu 14 Nov 2019 12:00:00 EDT urgency=low
        * Many updates to RPM and jenkins builds from Matthew Newton
        * Added %C (time now in seconds) and %c (microsecond component of now)
          back-ported from the "master" branch.
+       * Update the ERX dictionary.
 
        Bug fixes
        * Various fixes found by PVS-Studio.

diff --git a/share/dictionary.erx b/share/dictionary.erx
index 73296913b59f5790c6d347743d0245c1e5506eae..28542c0690467e88176212bd1a2e7c257eb35c2b 100644 (file)
--- a/share/dictionary.erx
+++ b/share/dictionary.erx
@@ -1,6 +1,7 @@
 # -*- text -*-
-# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+# Copyright (C) 2020 The FreeRADIUS Server project and contributors
 # This work is licensed under CC-BY version 4.0 https://creativecommons.org/licenses/by/4.0
+# Version $Id$
 #
 #      Juniper's (was Unisphere's) broadband RAS
 #      From Terje Krogdahl <tekr@nextra.com>
@@ -228,6 +229,7 @@ ATTRIBUTE   ERX-Service-Activate-Type               173     integer
 ATTRIBUTE      ERX-Client-Profile-Name                 174     string
 ATTRIBUTE      ERX-Redirect-GW-Address                 175     ipaddr
 ATTRIBUTE      ERX-APN-Name                            176     string
+ATTRIBUTE      ERX-Cos-Shaping-Rate                    177     string
 
 ATTRIBUTE      ERX-Service-Volume-Gigawords            179     integer
 ATTRIBUTE      ERX-Update-Service                      180     string
@@ -259,6 +261,30 @@ ATTRIBUTE  ERX-DHCP-Header                         208     octets
 ATTRIBUTE      ERX-DHCPv6-Header                       209     octets
 ATTRIBUTE      ERX-Acct-Request-Reason                 210     integer
 
+ATTRIBUTE      ERX-Inner-Tag-Protocol-Id               211     octets
+ATTRIBUTE      ERX-Routing-Services                    212     integer
+ATTRIBUTE      ERX-Interface-Set-Targeting-Weight      213     integer
+ATTRIBUTE      ERX-Interface-Targeting-Weight          214     integer
+ATTRIBUTE      ERX-Hybrid-Access-DSL-Downstream-Speed  216     integer
+ATTRIBUTE      ERX-Hybrid-Access-LTE-Downstream-Speed  217     integer
+
+ATTRIBUTE      ERX-PON-Access-Type                             219     integer
+ATTRIBUTE      ERX-ONT-ONU-Average-Data-Rate-Downstream        220     integer
+ATTRIBUTE      ERX-ONT-ONU-Peak-Data-Rate-Downstream           221     integer
+ATTRIBUTE      ERX-ONT-ONU-Maximum-Data-Rate-Upstream          222     integer
+ATTRIBUTE      ERX-ONT-ONU-Assured-Data-Rate-Upstream          223     integer
+ATTRIBUTE      ERX-PON-Tree-Maximum-Data-Rate-Upstream         224     integer
+ATTRIBUTE      ERX-PON-Tree-Maximum-Data-Rate-Downstream       225     integer
+
+ATTRIBUTE      ERX-Expected-Throughput-Upstream                226     integer
+ATTRIBUTE      ERX-Expected-Throughput-Downstream              227     integer
+ATTRIBUTE      ERX-Attainable-Expected-Throughput-Upstream     228     integer
+ATTRIBUTE      ERX-Attainable-Expected-Throughput-Downstream   229     integer
+ATTRIBUTE      ERX-Gamma-Data-Rate-Upstream                    230     integer
+ATTRIBUTE      ERX-Gamma-Data-Rate-Downstream                  231     integer
+ATTRIBUTE      ERX-Attainable-Gamma-Data-Rate-Upstream         232     integer
+ATTRIBUTE      ERX-Attainable-Gamma-Data-Rate-Downstream       233     integer
+
 #
 #  Values      Attribute               Name                    Number
 #
@@ -393,4 +419,15 @@ VALUE      ERX-Acct-Request-Reason         Line-Speed-Change       256
 VALUE  ERX-Acct-Request-Reason         Address-Assignment-Change 512
 VALUE  ERX-Acct-Request-Reason         CoA-Complete            1024
 
+VALUE  ERX-Routing-Services            disabled                0
+VALUE  ERX-Routing-Services            enabled                 1
+
+VALUE  ERX-PON-Access-Type             Other                   0
+VALUE  ERX-PON-Access-Type             GPON                    1
+VALUE  ERX-PON-Access-Type             XG-PON1                 2
+VALUE  ERX-PON-Access-Type             TWDM-PON                3
+VALUE  ERX-PON-Access-Type             XGS-PON                 4
+VALUE  ERX-PON-Access-Type             WDM-PON                 5
+VALUE  ERX-PON-Access-Type             UNKNOWN                 7
+
 END-VENDOR     ERX