Split DHCPv4 dictionaries to pair attributes/values with their RFCs (#4387)

diff --git a/share/dictionary/dhcpv4/dictionary b/share/dictionary/dhcpv4/dictionary
index efaf2e8d7596e9a29787838f3e29149941744c63..7535d6e4ee8a9473d0ddb710ce7f9c54038b1324 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary
+++ b/share/dictionary/dhcpv4/dictionary
@@ -23,6 +23,21 @@ $INCLUDE dictionary.freeradius.internal
 
 # Fixme should be broken out into separate RFCs
 $INCLUDE dictionary.rfc2131
+$INCLUDE dictionary.rfc4280
+$INCLUDE dictionary.rfc4578
+$INCLUDE dictionary.rfc4776
+$INCLUDE dictionary.rfc4833
+$INCLUDE dictionary.rfc5071
+$INCLUDE dictionary.rfc5192
+$INCLUDE dictionary.rfc5223
+$INCLUDE dictionary.rfc5417
+$INCLUDE dictionary.rfc5678
+$INCLUDE dictionary.rfc5969
+$INCLUDE dictionary.rfc5986
+$INCLUDE dictionary.rfc6011
+$INCLUDE dictionary.rfc6153
+$INCLUDE dictionary.rfc6656
+$INCLUDE dictionary.rfc6926
 $INCLUDE dictionary.rfc8925
 
 $INCLUDE dictionary.adsl_forum

diff --git a/share/dictionary/dhcpv4/dictionary.rfc2131 b/share/dictionary/dhcpv4/dictionary.rfc2131
index f09b68ac86c09a731418a0342b461198104a0f53..0570f93907804a34b005070740da75241c247ddb 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary.rfc2131
+++ b/share/dictionary/dhcpv4/dictionary.rfc2131
@@ -181,10 +181,6 @@ ATTRIBUTE  NDS-Tree-Name                           86      octets
 # Novell Directory Services
 ATTRIBUTE      NDS-Context                             87      octets
 
-# RFC 4280 - Broadcast and Multicast Control Servers
-ATTRIBUTE      BCMS-Server-IPv4-FQDN                   88      octets # really dns_label array
-ATTRIBUTE      BCMS-Server-IPv4-Address                89      ipaddr array
-
 # Authentication
 ATTRIBUTE      Authentication                          90      octets
 
@@ -203,13 +199,6 @@ ATTRIBUTE  UUID/GUID                               97      octets
 # Open Group's User Authentication
 ATTRIBUTE      User-Auth                               98      octets
 
-# RFC 4776 - Option for Civic Addresses Configuration Information
-ATTRIBUTE      GeoConf-Civic                           99      octets
-
-# RFC 4833 - Timezone Options for DHCP
-ATTRIBUTE      Timezone-Posix                          100     string
-ATTRIBUTE      Timezone-Database                       101     string
-
 # NetInfo Parent-Server Address
 ATTRIBUTE      Netinfo-Address                         112     octets
 # NetInfo Parent-Server Tag
@@ -245,91 +234,17 @@ ATTRIBUTE V-I-Vendor-Specific                     125     vsa
 #ATTRIBUTE     Etherboot                               128     ether
 # (for IP Phone software load)
 
-# RFC 4578 - Options for the Intel Preboot eXecution Environment
-ATTRIBUTE      TFTP-Server-IP-Address                  128     octets
-ATTRIBUTE      Call-Server-IP-address                  129     octets
-ATTRIBUTE      Ethernet-Interface                      130     octets
-ATTRIBUTE      Vendor-Discrimination-Str               130     octets
-ATTRIBUTE      Remote-Stats-Svr-IP-Address             131     octets
-ATTRIBUTE      IEEE-802dot1P-VLAN-ID                   132     octets
-ATTRIBUTE      IEEE-802dot1Q-L2-Priority               133     octets
-ATTRIBUTE      Diffserv-Code-Point                     134     octets
-ATTRIBUTE      HTTP-Proxy                              135     octets
-
-# RFC 5192 - PANA Authentication Agent
-ATTRIBUTE      PANA-Agent                              136     ipaddr array
-
-# RFC 5223 - Discovering Location-to-Service Translation (LoST)
-ATTRIBUTE      LoST-Server                             137     octets
-
-# RFC 5417 - CAPWAP Access Controller DHCP Option
-ATTRIBUTE      CAPWAP-AC-IPv4-Address                  138     ipaddr array
-
-# RFC 5678 - Options for IEEE 802.21 Mobility Services (MoS)
-ATTRIBUTE      MoS-IPv4-Address                        139     tlv
-ATTRIBUTE      MoS-IPv4-Address-IS                     .1      ipaddr array
-ATTRIBUTE      MoS-IPv4-Address-CS                     .2      ipaddr array
-ATTRIBUTE      MoS-IPv4-Address-ES                     .3      ipaddr array
-
-ATTRIBUTE      MoS-IPv4-FQDN                           140     tlv
-ATTRIBUTE      MoS-IPv4-FQDN-IS                        .1      octets # really dns_label array
-ATTRIBUTE      MoS-IPv4-FQDN-CS                        .2      octets # really dns_label array
-ATTRIBUTE      MoS-IPv4-FQDN-ES                        .3      octets # really dns_label array
-
-# RFC 6011 - SIP UA Configuration Service Domains
-ATTRIBUTE      SIP-UA-Configuration-Service-Domains    141     string
-
-# RFC 6153 - Access Network Discovery and Selection Function (ANDSF)
-ATTRIBUTE      ANDSF-IPv4-Address                      142     ipaddr array
-ATTRIBUTE      ANDSF-IPv6-Address                      143     ipv6addr array
-
 # 144 - 149 unused
 
 ATTRIBUTE      TFTP-Server-IPv4-Address                150     ipaddr array
 
-# RFC 6926 - Bulk Lease Query
-ATTRIBUTE      Query-Status-Code                       151     octets
-ATTRIBUTE      Query-Server-Base-Time                  152     date
-ATTRIBUTE      Query-Start-Time-Of-State               153     integer
-ATTRIBUTE      Query-Start-Time                        154     date
-ATTRIBUTE      Query-End-Time                          155     date
-ATTRIBUTE      State                                   156     byte
-
-VALUE  State                           Available               1
-VALUE  State                           Active                  2
-VALUE  State                           Expired                 3
-VALUE  State                           Released                4
-VALUE  State                           Abandoned               5
-VALUE  State                           Reset                   6
-VALUE  State                           Remote                  7
-VALUE  State                           Transitioning           8
-
-ATTRIBUTE      Data-Source                             157     byte
-
 # RFC draft-ietf-pcp-13
 ATTRIBUTE      PCP-IPv4-Server-Address                 158     octets  # Complex format (not just ipaddr array)
 
 # RFC 3942 - 159-174 - Unassigned
 # RFC 3942 - 178-207 - Unassigned
-
-# RFC 5071 - PXELINUX
-ATTRIBUTE      PXELINUX-Magic                          208     octets
-ATTRIBUTE      Packet-Format                           209     string
-ATTRIBUTE      Path-Prefix                             210     string
-ATTRIBUTE      Reboot-Time                             211     date
-
-# RFC 5969 - IPv6 Rapid Deployment on IPv4 Infrastructures (6rd)
-ATTRIBUTE      6RD                                     212     octets
-
-# RFC 5986 - Discovering the Local Location Information Server (LIS)
-ATTRIBUTE      Access-Network-Domain-Name              213     string # really one dns_label
-
 # RFC 3942 - 214-219 - Unassigned
 
-# RFC 6656 - Subnet Allocation Option
-ATTRIBUTE      Virtual-Subnet-Allocation               220     octets  # Complex format not just tlv
-ATTRIBUTE      Virtual-Subnet-Selection                221     octets  # Complex format not just tlv
-
 # RFC 3942 - 224-253 - Site Specific
 ATTRIBUTE      Site-specific-0                         224     octets
 ATTRIBUTE      Site-specific-1                         225     octets

diff --git a/share/dictionary/dhcpv4/dictionary.rfc4280 b/share/dictionary/dhcpv4/dictionary.rfc4280
new file mode 100644 (file)
index 0000000..3610d5f
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc4280
@@ -0,0 +1,15 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC4280 - Dynamic Host Configuration Protocol (DHCP) Options for
+#            Broadcast and Multicast Control Servers
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      BCMS-Server-IPv4-FQDN                   88      octets # really dns_label array
+ATTRIBUTE      BCMS-Server-IPv4-Address                89      ipaddr array

diff --git a/share/dictionary/dhcpv4/dictionary.rfc4578 b/share/dictionary/dhcpv4/dictionary.rfc4578
new file mode 100644 (file)
index 0000000..2885a0c
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc4578
@@ -0,0 +1,22 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC4578 - Dynamic Host Configuration Protocol (DHCP) Options
+#            for the Intel Preboot eXecution Environment (PXE)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      TFTP-Server-IP-Address                  128     octets
+ATTRIBUTE      Call-Server-IP-address                  129     octets
+ATTRIBUTE      Ethernet-Interface                      130     octets
+ATTRIBUTE      Vendor-Discrimination-Str               130     octets
+ATTRIBUTE      Remote-Stats-Svr-IP-Address             131     octets
+ATTRIBUTE      IEEE-802dot1P-VLAN-ID                   132     octets
+ATTRIBUTE      IEEE-802dot1Q-L2-Priority               133     octets
+ATTRIBUTE      Diffserv-Code-Point                     134     octets
+ATTRIBUTE      HTTP-Proxy                              135     octets

diff --git a/share/dictionary/dhcpv4/dictionary.rfc4776 b/share/dictionary/dhcpv4/dictionary.rfc4776
new file mode 100644 (file)
index 0000000..55485c4
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc4776
@@ -0,0 +1,14 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC4776 - Dynamic Host Configuration Protocol (DHCPv4 and DHCPv6)
+#            Option for Civic Addresses Configuration Information
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      GeoConf-Civic                           99      octets

diff --git a/share/dictionary/dhcpv4/dictionary.rfc4833 b/share/dictionary/dhcpv4/dictionary.rfc4833
new file mode 100644 (file)
index 0000000..801a9e1
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc4833
@@ -0,0 +1,14 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC4833 - Timezone Options for DHCP
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Timezone-Posix                          100     string
+ATTRIBUTE      Timezone-Database                       101     string

diff --git a/share/dictionary/dhcpv4/dictionary.rfc5071 b/share/dictionary/dhcpv4/dictionary.rfc5071
new file mode 100644 (file)
index 0000000..d1bb928
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc5071
@@ -0,0 +1,16 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC5071 - Dynamic Host Configuration Protocol Options Used by PXELINUX
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      PXELINUX-Magic                          208     octets
+ATTRIBUTE      Packet-Format                           209     string
+ATTRIBUTE      Path-Prefix                             210     string
+ATTRIBUTE      Reboot-Time                             211     date

diff --git a/share/dictionary/dhcpv4/dictionary.rfc5192 b/share/dictionary/dhcpv4/dictionary.rfc5192
new file mode 100644 (file)
index 0000000..502ee53
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc5192
@@ -0,0 +1,14 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC5192 - DHCP Options for Protocol for Carrying Authentication for
+#            Network Access (PANA) Authentication Agents.
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      PANA-Agent                              136     ipaddr array

diff --git a/share/dictionary/dhcpv4/dictionary.rfc5223 b/share/dictionary/dhcpv4/dictionary.rfc5223
new file mode 100644 (file)
index 0000000..2d48a6d
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc5223
@@ -0,0 +1,14 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC5223 - Discovering Location-to-Service Translation (LoST) Servers
+#            Using the Dynamic Host Configuration Protocol (DHCP).
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      LoST-Server                             137     octets

diff --git a/share/dictionary/dhcpv4/dictionary.rfc5417 b/share/dictionary/dhcpv4/dictionary.rfc5417
new file mode 100644 (file)
index 0000000..05d3ae1
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc5417
@@ -0,0 +1,14 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC5417 - Control And Provisioning of Wireless Access Points (CAPWAP)
+#            Access Controller DHCP Option
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      CAPWAP-AC-IPv4-Address                  138     ipaddr array

diff --git a/share/dictionary/dhcpv4/dictionary.rfc5678 b/share/dictionary/dhcpv4/dictionary.rfc5678
new file mode 100644 (file)
index 0000000..8f7e85a
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc5678
@@ -0,0 +1,22 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC5678 - Dynamic Host Configuration Protocol (DHCPv4 and DHCPv6)
+#            Options for IEEE 802.21 Mobility Services (MoS) Discovery
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      MoS-IPv4-Address                        139     tlv
+ATTRIBUTE      MoS-IPv4-Address-IS                     .1      ipaddr array
+ATTRIBUTE      MoS-IPv4-Address-CS                     .2      ipaddr array
+ATTRIBUTE      MoS-IPv4-Address-ES                     .3      ipaddr array
+
+ATTRIBUTE      MoS-IPv4-FQDN                           140     tlv
+ATTRIBUTE      MoS-IPv4-FQDN-IS                        .1      octets # really dns_label array
+ATTRIBUTE      MoS-IPv4-FQDN-CS                        .2      octets # really dns_label array
+ATTRIBUTE      MoS-IPv4-FQDN-ES                        .3      octets # really dns_label array

diff --git a/share/dictionary/dhcpv4/dictionary.rfc5969 b/share/dictionary/dhcpv4/dictionary.rfc5969
new file mode 100644 (file)
index 0000000..14accac
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc5969
@@ -0,0 +1,14 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC5969 - IPv6 Rapid Deployment on IPv4 Infrastructures (6rd) --
+#            Protocol Specification
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      6RD                                     212     octets

diff --git a/share/dictionary/dhcpv4/dictionary.rfc5986 b/share/dictionary/dhcpv4/dictionary.rfc5986
new file mode 100644 (file)
index 0000000..9f5fc13
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc5986
@@ -0,0 +1,13 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC5986 - Discovering the Local Location Information Server (LIS)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Access-Network-Domain-Name              213     string # really one dns_label

diff --git a/share/dictionary/dhcpv4/dictionary.rfc6011 b/share/dictionary/dhcpv4/dictionary.rfc6011
new file mode 100644 (file)
index 0000000..b9973b1
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc6011
@@ -0,0 +1,14 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC6011 - Generalized MPLS (GMPLS) Protocol Extensions for Multi-Layer
+#            and Multi-Region Networks (MLN/MRN)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      SIP-UA-Configuration-Service-Domains    141     string

diff --git a/share/dictionary/dhcpv4/dictionary.rfc6153 b/share/dictionary/dhcpv4/dictionary.rfc6153
new file mode 100644 (file)
index 0000000..07cf6b2
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc6153
@@ -0,0 +1,15 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC6153 - DHCPv4 and DHCPv6 Options for Access Network Discovery and
+#            Selection Function (ANDSF) Discovery
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      ANDSF-IPv4-Address                      142     ipaddr array
+ATTRIBUTE      ANDSF-IPv6-Address                      143     ipv6addr array

diff --git a/share/dictionary/dhcpv4/dictionary.rfc6656 b/share/dictionary/dhcpv4/dictionary.rfc6656
new file mode 100644 (file)
index 0000000..e811204
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc6656
@@ -0,0 +1,14 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC6656 - Description of Cisco Systems' Subnet Allocation Option for DHCPv4
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Virtual-Subnet-Allocation               220     octets  # Complex format not just tlv
+ATTRIBUTE      Virtual-Subnet-Selection                221     octets  # Complex format not just tlv

diff --git a/share/dictionary/dhcpv4/dictionary.rfc6926 b/share/dictionary/dhcpv4/dictionary.rfc6926
new file mode 100644 (file)
index 0000000..b4d5f04
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc6926
@@ -0,0 +1,29 @@
+# -*- text -*-
+# Copyright (C) 2021 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$
+##############################################################################
+#
+#  RFC6926 - DHCPv4 Bulk Leasequery
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Query-Status-Code                       151     octets
+ATTRIBUTE      Query-Server-Base-Time                  152     date
+ATTRIBUTE      Query-Start-Time-Of-State               153     integer
+ATTRIBUTE      Query-Start-Time                        154     date
+ATTRIBUTE      Query-End-Time                          155     date
+ATTRIBUTE      State                                   156     byte
+
+VALUE  State                           Available               1
+VALUE  State                           Active                  2
+VALUE  State                           Expired                 3
+VALUE  State                           Released                4
+VALUE  State                           Abandoned               5
+VALUE  State                           Reset                   6
+VALUE  State                           Remote                  7
+VALUE  State                           Transitioning           8
+
+ATTRIBUTE      Data-Source                             157     byte