clean up and rearrange

diff --git a/share/dictionary/dhcpv4/dictionary b/share/dictionary/dhcpv4/dictionary
index 6d5ae6287a8b19eac003f2a4940c0eded568467c..e1875bb35f02085bec6f15e52b74b37057b0baf5 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary
+++ b/share/dictionary/dhcpv4/dictionary
@@ -23,8 +23,10 @@ $INCLUDE dictionary.freeradius.internal
 
 # Fixme should be broken out into separate RFCs
 $INCLUDE dictionary.rfc2131
+$INCLUDE dictionary.rfc2241
 $INCLUDE dictionary.rfc2610
 $INCLUDE dictionary.rfc3004
+$INCLUDE dictionary.rfc3397
 $INCLUDE dictionary.rfc3442
 $INCLUDE dictionary.rfc4280
 $INCLUDE dictionary.rfc4578

diff --git a/share/dictionary/dhcpv4/dictionary.rfc2131 b/share/dictionary/dhcpv4/dictionary.rfc2131
index 19fe7de4abcc1b0dfdee09a08c2947b5dd38251b..97aea872b0e88ce2f21cd72457a03d1faf4f7602 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary.rfc2131
+++ b/share/dictionary/dhcpv4/dictionary.rfc2131
@@ -42,7 +42,7 @@ ATTRIBUTE     Hostname                                12      string
 # Size of boot file in 512 uint8
 ATTRIBUTE      Boot-File-Size                          13      uint16
 # Client to dump and name
-ATTRIBUTE      Merit-Dump-File                         14      octets
+ATTRIBUTE      Merit-Dump-File                         14      string
 ATTRIBUTE      Domain-Name                             15      string
 ATTRIBUTE      Swap-Server                             16      ipaddr
 # Path name for root disk
@@ -53,7 +53,7 @@ ATTRIBUTE     Source-Route-Enable                     20      bool
 # Routing Policy Filters
 ATTRIBUTE      Policy-Filter                           21      ipv4prefix      prefix=split,array
 ATTRIBUTE      Max-Datagram-Reassembly-Size            22      uint16
-ATTRIBUTE      Default-IP-TTL                          23      octets
+ATTRIBUTE      Default-IP-TTL                          23      byte
 ATTRIBUTE      Path-MTU-Aging-Timeout                  24      uint32
 ATTRIBUTE      Path-MTU-Plateau-Table                  25      uint16 array
 ATTRIBUTE      Interface-MTU-Size                      26      uint16
@@ -128,7 +128,7 @@ ATTRIBUTE   NIS-Server-Address                      65      ipaddr
 ATTRIBUTE      TFTP-Server-Name                        66      string
 ATTRIBUTE      Boot-File-Name                          67      string
 # Home Agent Addresses
-ATTRIBUTE      Home-Agent-Address                      68      octets
+ATTRIBUTE      Home-Agent-Address                      68      ipaddr array
 ATTRIBUTE      SMTP-Server-Address                     69      ipaddr array
 ATTRIBUTE      POP3-Server-Address                     70      ipaddr array
 ATTRIBUTE      NNTP-Server-Address                     71      ipaddr array
@@ -169,12 +169,6 @@ ATTRIBUTE  Server-Identifier-Override              82.11   ipaddr
 
 # Internet Storage Name Service
 ATTRIBUTE      iSNS                                    83      octets
-# Novell Directory Services
-ATTRIBUTE      NDS-Servers                             85      octets
-# Novell Directory Services
-ATTRIBUTE      NDS-Tree-Name                           86      octets
-# Novell Directory Services
-ATTRIBUTE      NDS-Context                             87      octets
 
 # Authentication
 ATTRIBUTE      Authentication                          90      octets
@@ -183,14 +177,9 @@ ATTRIBUTE  Client-Last-Transaction-Time            91      uint32 # seconds on the past
 
 ATTRIBUTE      associated-ip                           92      ipaddr array
 
-# Client System Architecture
-ATTRIBUTE      Client-System                           93      octets
-# Client Network Device Interface
-ATTRIBUTE      Client-NDI                              94      octets
 # Lightweight Directory Access Protocol
 ATTRIBUTE      LDAP                                    95      octets
-# UUID/GUID-based Client Identifier
-ATTRIBUTE      UUID/GUID                               97      octets
+
 # Open Group's User Authentication
 ATTRIBUTE      User-Auth                               98      octets
 
@@ -202,12 +191,18 @@ ATTRIBUTE Netinfo-Tag                             113     octets
 ATTRIBUTE      URL                                     114     octets
 # DHCP Auto-Configuration
 ATTRIBUTE      Auto-Config                             116     uint8
+
 # Name Service Search
-ATTRIBUTE      Name-Service-Search                     117     octets
+#
+#  Array of option numbers which should then be used, in order,
+#  to search for DNS information.
+#
+ATTRIBUTE      Name-Service-Search                     117     uint16 array
+
+
 # Subnet Selection Option
 ATTRIBUTE      Subnet-Selection-Option                 118     ipaddr
-# DNS domain serach list
-ATTRIBUTE      Domain-Search                           119     octets # really compressed, concatenated, dns_label array
+
 # SIP-Servers DHCP Option
 ATTRIBUTE      SIP-Servers-Option                      120     octets
 

diff --git a/share/dictionary/dhcpv4/dictionary.rfc2241 b/share/dictionary/dhcpv4/dictionary.rfc2241
new file mode 100644 (file)
index 0000000..d3f99ea
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc2241
@@ -0,0 +1,19 @@
+# -*- text -*-
+# Copyright (C) 2022 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$
+##############################################################################
+#
+#  RFC2610 - DHCP Options for Service Location Protocol
+#
+#  $Id$
+#
+##############################################################################
+
+# Novell Directory Services
+ATTRIBUTE      NDS-Servers                             85      ipaddr array
+# Novell Directory Services
+
+ATTRIBUTE      NDS-Tree-Name                           86      string
+# Novell Directory Services
+ATTRIBUTE      NDS-Context                             87      string

diff --git a/share/dictionary/dhcpv4/dictionary.rfc3397 b/share/dictionary/dhcpv4/dictionary.rfc3397
new file mode 100644 (file)
index 0000000..9217a07
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc3397
@@ -0,0 +1,19 @@
+# -*- text -*-
+# Copyright (C) 2022 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$
+##############################################################################
+#
+#  RFC3397 - DHCP DHCP) Domain Search Option
+#
+#  $Id$
+#
+##############################################################################
+
+
+#
+#  Unlike other options, this uses DNS compression.
+#
+#  @todo - add a "compressed" dns label flag.
+#
+ATTRIBUTE      Domain-Search                           119     string  dns_label,array

diff --git a/share/dictionary/dhcpv4/dictionary.rfc4578 b/share/dictionary/dhcpv4/dictionary.rfc4578
index 2885a0cbff384b49dd3623f3c905659e3dba341a..66f6d6e4873181f0b0b7e3dcded2d79557117cfa 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary.rfc4578
+++ b/share/dictionary/dhcpv4/dictionary.rfc4578
@@ -11,6 +11,31 @@
 #
 ##############################################################################
 
+# Client System Architecture
+ATTRIBUTE      Client-System                           93      uint16  array
+
+VALUE  Client-System   Intel-x86PC     0
+VALUE  Client-System   NEXT-PC98       1
+VALUE  Client-System   EFI-Itanium     2
+VALUE  Client-System   DEC-Alpha       3
+VALUE  Client-System   Arc-x86         4
+VALUE  Client-System   Intel-Lean-Client 5
+VALUE  Client-System   EFI-IA32        6
+VALUE  Client-System   EFI-BC          7
+VALUE  Client-System   EFI-Xscale      8
+VALUE  Client-System   EDI-x86-64      9
+
+# Client Network Device Interface
+ATTRIBUTE      Client-NDI                              94      struct
+MEMBER         Type            uint8
+MEMBER         Major           uint8
+MEMBER         Minor           uint8
+
+# UUID/GUID-based Client Identifier
+ATTRIBUTE      UUID/GUID                               97      struct
+MEMBER         Type            uint8           # really key, but only one sub-structure is defined
+MEMBER         Identifier      octets[16]
+
 ATTRIBUTE      TFTP-Server-IP-Address                  128     octets
 ATTRIBUTE      Call-Server-IP-address                  129     octets
 ATTRIBUTE      Ethernet-Interface                      130     octets