move RFC 2610 options to their own file

diff --git a/share/dictionary/dhcpv4/dictionary b/share/dictionary/dhcpv4/dictionary
index 7535d6e4ee8a9473d0ddb710ce7f9c54038b1324..f60b711ad4b679612ef2ddb084562a38041addde 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary
+++ b/share/dictionary/dhcpv4/dictionary
@@ -23,6 +23,7 @@ $INCLUDE dictionary.freeradius.internal
 
 # Fixme should be broken out into separate RFCs
 $INCLUDE dictionary.rfc2131
+$INCLUDE dictionary.rfc2610
 $INCLUDE dictionary.rfc4280
 $INCLUDE dictionary.rfc4578
 $INCLUDE dictionary.rfc4776

diff --git a/share/dictionary/dhcpv4/dictionary.rfc2131 b/share/dictionary/dhcpv4/dictionary.rfc2131
index 2a9f5f9e37212c7cab0c1e3365442fa5cb4be84b..b0bab52ecc404ca44d4c07d518b0f24700e5d31f 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary.rfc2131
+++ b/share/dictionary/dhcpv4/dictionary.rfc2131
@@ -139,10 +139,7 @@ ATTRIBUTE  StreetTalk-Server-Address               75      ipaddr array
 ATTRIBUTE      STDA-Server-Address                     76      ipaddr array
 # User Class Information
 ATTRIBUTE      User-Class                              77      octets
-# directory agent information
-ATTRIBUTE      Directory-Agent                         78      octets
-# service location agent scope
-ATTRIBUTE      Service-Scope                           79      octets
+
 # Rapid Commit
 ATTRIBUTE      Rapid-Commit                            80      bool
 # Fully Qualified Domain Name

diff --git a/share/dictionary/dhcpv4/dictionary.rfc2610 b/share/dictionary/dhcpv4/dictionary.rfc2610
new file mode 100644 (file)
index 0000000..1fa7ad2
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc2610
@@ -0,0 +1,21 @@
+# -*- 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$
+#
+##############################################################################
+
+# directory agent information
+ATTRIBUTE      Directory-Agent                         78      struct
+MEMBER         Mandatory                               uint8
+MEMBER         Agent                                   ipaddr  array
+
+# service location agent scope
+ATTRIBUTE      Service-Scope                           79      struct
+MEMBER         Mandatory                               uint8
+MEMBER         Scope-List                              string # space-separated set of strings