]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Split DHCPv6 options definitions into different files matching their RFC names
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Thu, 21 Mar 2019 10:29:50 +0000 (17:29 +0700)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Thu, 21 Mar 2019 10:30:31 +0000 (17:30 +0700)
Remove DHCPv6 prefix from DHCPv6 options.  We don't use RADIUS-User-Name.

The same thing should be done for the rest of the protocols, feel free reader of this commit message...

54 files changed:
share/dictionary/dhcpv6/dictionary
share/dictionary/dhcpv6/dictionary.dhcpv6 [deleted file]
share/dictionary/dhcpv6/dictionary.freeradius.internal [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc3315 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc3319 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc3633 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc3646 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc3898 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc4075 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc4242 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc4280 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc4580 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc4649 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc4704 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc4776 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc4833 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc4994 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc5007 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc5192 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc5223 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc5417 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc5460 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc5678 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc5908 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc5970 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc5986 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6011 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6153 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6225 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6334 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6422 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6440 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6603 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6607 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6610 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6731 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6784 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6939 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc6977 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc7037 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc7078 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc7083 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc7291 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc7341 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc7598 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc7600 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc7653 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc7710 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc7774 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc7839 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc8026 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc8115 [new file with mode: 0644]
share/dictionary/dhcpv6/dictionary.rfc8156 [new file with mode: 0644]
src/tests/unit/dhcpv6.txt

index f8f20fdc09d6920f21f948c908a18abd6dd25001..b9537322867b20f786b793a17c39cdf2b3b2dd40 100644 (file)
@@ -1,32 +1,66 @@
 # -*- text -*-
-# Copyright (C) 2015 The FreeRADIUS Server project and contributors
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
 ##############################################################################
 #
-#      DHCP dictionary.
+#  DHCPv6 dictionary.
 #
-#      http://www.iana.org/assignments/bootp-dhcp-parameters
-#
-#      Also http://www.networksorcery.com/enp/protocol/bootp/options.htm
-#
-#      http://www.bind9.net/rfc-dhcp
-#
-#      $Id$
+#  $Id$
 #
 ##############################################################################
 
-#
-#
-#      The vendor codes are 2 octets, because we need 256 numbers
-#      for the base DHCP options, PLUS a few for the DHCP headers,
-#      which aren't in option format.
-#
-#      On top of that, a number of options are really TLV's.
-#      We need to be able to understand them, too.
-#
 PROTOCOL       DHCPv6  3
 BEGIN-PROTOCOL DHCPv6
 
-# Fixme should be broken out into separate RFCs
-$INCLUDE dictionary.dhcpv6
+$INCLUDE dictionary.freeradius.internal
+$INCLUDE dictionary.rfc3315
+$INCLUDE dictionary.rfc3319
+$INCLUDE dictionary.rfc3633
+$INCLUDE dictionary.rfc3646
+$INCLUDE dictionary.rfc3898
+$INCLUDE dictionary.rfc4075
+$INCLUDE dictionary.rfc4242
+$INCLUDE dictionary.rfc4280
+$INCLUDE dictionary.rfc4580
+$INCLUDE dictionary.rfc4649
+$INCLUDE dictionary.rfc4704
+$INCLUDE dictionary.rfc4776
+$INCLUDE dictionary.rfc4833
+$INCLUDE dictionary.rfc4994
+$INCLUDE dictionary.rfc5007
+$INCLUDE dictionary.rfc5192
+$INCLUDE dictionary.rfc5223
+$INCLUDE dictionary.rfc5417
+$INCLUDE dictionary.rfc5460
+$INCLUDE dictionary.rfc5678
+$INCLUDE dictionary.rfc5908
+$INCLUDE dictionary.rfc5970
+$INCLUDE dictionary.rfc5986
+$INCLUDE dictionary.rfc6011
+$INCLUDE dictionary.rfc6153
+$INCLUDE dictionary.rfc6225
+$INCLUDE dictionary.rfc6334
+$INCLUDE dictionary.rfc6422
+$INCLUDE dictionary.rfc6440
+$INCLUDE dictionary.rfc6603
+$INCLUDE dictionary.rfc6607
+$INCLUDE dictionary.rfc6610
+$INCLUDE dictionary.rfc6731
+$INCLUDE dictionary.rfc6784
+$INCLUDE dictionary.rfc6939
+$INCLUDE dictionary.rfc6977
+$INCLUDE dictionary.rfc7037
+$INCLUDE dictionary.rfc7078
+$INCLUDE dictionary.rfc7083
+$INCLUDE dictionary.rfc7291
+$INCLUDE dictionary.rfc7341
+$INCLUDE dictionary.rfc7598
+$INCLUDE dictionary.rfc7600
+$INCLUDE dictionary.rfc7653
+$INCLUDE dictionary.rfc7710
+$INCLUDE dictionary.rfc7774
+$INCLUDE dictionary.rfc7839
+$INCLUDE dictionary.rfc8026
+$INCLUDE dictionary.rfc8115
+$INCLUDE dictionary.rfc8156
 
 END-PROTOCOL   DHCPv6
diff --git a/share/dictionary/dhcpv6/dictionary.dhcpv6 b/share/dictionary/dhcpv6/dictionary.dhcpv6
deleted file mode 100644 (file)
index ecc1a73..0000000
+++ /dev/null
@@ -1,513 +0,0 @@
-# -*- text -*-
-# Copyright (C) 2018 The FreeRADIUS Server project and contributors
-##############################################################################
-#
-#      DHCPv6 Protocol attributes
-#
-##############################################################################
-
-#
-#  RFC3316 - Dynamic Host Configuration Protocol for IPv6 (DHCPv6)
-#
-ATTRIBUTE      DHCPv6-Client-ID                        1       octets
-ATTRIBUTE      DHCPv6-Server-ID                        2       octets
-ATTRIBUTE      DHCPv6-IA-NA                            3       octets          # Complex struct see RFC 3315
-ATTRIBUTE      DHCPv6-IA-TA                            4       octets          # Complex struct see RFC 3315
-ATTRIBUTE      DHCPv6-IA-ADDR                          5       octets          # Complex struct see RFC 3315
-ATTRIBUTE      DHCPv6-Option-Request                   6       octets          # Magic option listing requested options
-ATTRIBUTE      DHCPv6-Preference                       7       uint8
-ATTRIBUTE      DHCPv6-Elapsed-Time                     8       uint16
-ATTRIBUTE      DHCPv6-Relay-Message                    9       octets
-ATTRIBUTE      DHCPv6-Auth                             11      octets          # Complex struct see RFC 3315
-ATTRIBUTE      DHCPv6-Unicast                          12      ipv6addr
-ATTRIBUTE      DHCPv6-Status-Code                      13      octets          # Complex struct see RFC 3315
-ATTRIBUTE      DHCPv6-Rapid-Commit                     14      bool
-ATTRIBUTE      DHCPv6-User-Class                       15      octets array
-ATTRIBUTE      DHCPv6-Vendor-Class                     16      octets          # Complex struct see RFC 3315
-ATTRIBUTE      DHCPv6-Vendor-Opts                      17      vsa
-ATTRIBUTE      DHCPv6-Interface-ID                     18      octets
-ATTRIBUTE      DHCPv6-Reconf-Msg                       19      uint8
-ATTRIBUTE      DHCPv6-Reconf-Accept                    20      bool
-
-#
-#  RFC3319 - Dynamic Host Configuration Protocol (DHCPv6) Options
-#            for Session Initiation Protocol (SIP) Servers
-#
-ATTRIBUTE      DHCPv6-SIP-Server-Domain-Name-List      21      octets          # Domain name list (DNS encoding)
-ATTRIBUTE      DHCPv6-SIP-Server-Address               22      ipv6addr array
-
-#
-#  RFC3646 - DNS Configuration options for Dynamic Host
-#           Configuration Protocol for IPv6 (DHCPv6)
-#
-ATTRIBUTE      DHCPv6-DNS-Servers                      23      ipv6addr array
-ATTRIBUTE      DHCPv6-Domain-List                      24      octets          # Domain name list (DNS encoding)
-
-#
-#  RFC3666 - IPv6 Prefix Options for
-#           Dynamic Host Configuration Protocol (DHCP) version 6
-#
-ATTRIBUTE      DHCPv6-IA-PD                            25      octets          # Complex struct see RFC 3633
-ATTRIBUTE      DHCPv6-IA-Prefix                        26      octets          # Complex struct see RFC 3633
-
-#
-#  RFC3898 - Network Information Service (NIS)
-#           Configuration Options for
-#           Dynamic Host Configuration Protocol for IPv6 (DHCPv6)
-#
-ATTRIBUTE      DHCPv6-NIS-Servers                      27      ipv6addr array
-ATTRIBUTE      DHCPv6-NIS-Plus-Servers                 28      ipv6addr array
-ATTRIBUTE      DHCPv6-NIS-Domain-Name                  29      octets          # Domain name
-ATTRIBUTE      DHCPv6-NIS-Plus-Domain-Name             30      octets          # Domain name
-
-#
-#  RFC 4075 - Simple Network Time Protocol (SNTP) Configuration Option for DHCPv6
-#
-ATTRIBUTE      DHCPv6-SNTP-Servers                     31      ipv6addr array
-
-#
-#  RFC 4242 - Information Refresh Time Option for
-#            Dynamic Host Configuration Protocol for IPv6 (DHCPv6)
-#
-ATTRIBUTE      DHCPv6-Information-Refresh-Time         32      uint32
-
-#
-#  RFC 4280 - Dynamic Host Configuration Protocol (DHCP) Options for
-#             Broadcast and Multicast Control Servers
-#
-ATTRIBUTE      DHCPv6-BCMCS-Server-Domain-Name-List    33      octets          # Domain name list (DNS encoding)
-ATTRIBUTE      DHCPv6-BCMCS-Server-Address             34      ipv6addr array
-
-#
-#  RFC 4776 - Dynamic Host Configuration Protocol (DHCPv4 and DHCPv6) Option
-#             for Civic Addresses Configuration Information
-#
-ATTRIBUTE      DHCPv6-Geoconf-Civic                    36      octets          # Complex struct see RFC 4776
-
-#
-#  RFC 4649 - Dynamic Host Configuration Protocol for IPv6 (DHCPv6)
-#            Relay Agent Remote-ID Option
-#
-ATTRIBUTE      DHCPv6-Relay-Agent-Remote-ID            37      octets          # Complex struct see RFC 4649
-
-#
-#  RFC 4580 - Dynamic Host Configuration Protocol for IPv6 (DHCPv6)
-#             Relay Agent Subscriber-ID Option
-#
-ATTRIBUTE      DHCPv6-Subscriber-ID                    38      string
-
-#
-#  RFC 4704 - The Dynamic Host Configuration Protocol for IPv6 (DHCPv6) Client
-#             Fully Qualified Domain Name (FQDN) Option
-#
-ATTRIBUTE      DHCPv6-Client-FQDN                      39      octets          # Complex struct see RFC 4704
-
-#
-#  RFC 5192 - DHCP Options for Protocol for Carrying Authentication for
-#             Network Access (PANA) Authentication Agent
-#
-ATTRIBUTE      DHCPv6-PANA-Authentication-Agent        40      ipv6addr array
-
-#
-#  RFC 4833 - Timezone Options for DHCP
-#
-ATTRIBUTE      DHCPv6-New-Posix-Timezone               41      string
-ATTRIBUTE      DHCPv6-New-TZDB-Timezone                42      string
-
-#
-#  RFC 4994 - DHCPv6 Relay Agent Echo Request Option
-#
-ATTRIBUTE      DHCPv6-Relay-Agent-Echo-Request         43      uint16 array    # Array of option numbers
-
-#
-#  RFC 5007 - DHCPv6 Leasequery
-#
-ATTRIBUTE      DHCPv6-Lease-Query                      44      octets          # Complex struct see RFC 5007
-ATTRIBUTE      DHCPv6-Client-Data                      45      octets          # Complex struct see RFC 5007
-ATTRIBUTE      DHCPv6-Client-Last-Transaction-Time     46      uint32
-ATTRIBUTE      DHCPv6-Lease-Query-Relay-Data           47      octets          # Complex struct see RFC 5007
-ATTRIBUTE      DHCPv6-Lease-Query-Client-Link          48      ipv6addr array
-
-#
-#  RFC 6610 - DHCP Options for Home Information Discovery in Mobile IPv6 (MIPv6)
-#
-ATTRIBUTE      DHCPv6-MIP6-Home-Net-ID-FQDN            49      octets          # Domain name
-ATTRIBUTE      DHCPv6-MIP6-Home-Net-Info               50      octets          # Complex struct see RFC 6610
-
-ATTRIBUTE      DHCPv6-MIP6-Identified-Home-Net-Info    69      octets          # Complex struct see RFC 6610
-ATTRIBUTE      DHCPv6-MIP6-Unrestricted-Home-Net-Info  70      octets          # Complex struct see RFC 6610
-ATTRIBUTE      DHCPv6-MIP6-Home-Net-Prefix             71      ipv6prefix
-ATTRIBUTE      DHCPv6-MIP6-Home-Net-Address            72      ipv6addr
-ATTRIBUTE      DHCPv6-MIP6-Home-Agent-FQDN             73      octets          # Domain name
-
-#
-#  RFC 5223 - Discovering Location-to-Service Translation (LoST) Servers Using the
-#             Dynamic Host Configuration Protocol (DHCP)
-#
-ATTRIBUTE      DHCPv6-LoST                             51      octets          # Domain name
-
-#
-#  RFC 5417 - Control And Provisioning of Wireless Access Points (CAPWAP)
-#             Access Controller DHCP Option
-#
-ATTRIBUTE      DHCPv6-Capwap-AC                        52      ipv6addr array
-
-#
-#  RFC 5460 - DHCPv6 Bulk Leasequery
-#
-ATTRIBUTE      DHCPv6-Relay-ID                         53      octets
-
-#
-#  RFC 5678 - Dynamic Host Configuration Protocol (DHCPv4 and DHCPv6) Options for
-#             IEEE 802.21 Mobility Services (MoS) Discovery
-#
-ATTRIBUTE      DHCPv6-MOD-Address-List                 54      tlv
-
-BEGIN-TLV      DHCPv6-MOD-Address-List
-ATTRIBUTE      DHCPv6-MOS-Address-IS                   1       ipv6addr array
-ATTRIBUTE      DHCPv6-MOS-Address-CS                   2       ipv6addr array
-ATTRIBUTE      DHCPv6-MOS-Address-ES                   3       ipv6addr array
-END-TLV                DHCPv6-MOD-Address-List
-
-ATTRIBUTE      DHCPv6-MOS-Domain-Name-List             55      tlv
-
-BEGIN-TLV      DHCPv6-MOS-Domain-Name-List
-ATTRIBUTE      DHCPv6-MOS-Domain-Name-IS               1       octets          # Domain name
-ATTRIBUTE      DHCPv6-MOS-Domain-Name-CS               2       octets          # Domain name
-ATTRIBUTE      DHCPv6-MOS-Domain-Name-ES               3       octets          # Domain name
-END-TLV                DHCPv6-MOS-Domain-Name-List
-
-#
-#  RFC 5908 - Network Time Protocol (NTP) Server Option for DHCPv6
-#
-ATTRIBUTE      DHCPv6-NTP-Server                       56      tlv
-BEGIN-TLV      DHCPv6-NTP-Server
-ATTRIBUTE      DHCPv6-NTP-Server-Address               1       ipv6addr
-ATTRIBUTE      DHCPv6-NTP-Server-Multicast-Address     2       ipv6addr
-ATTRIBUTE      DHCPv6-NTP-Server-FQDN                  3       octets          # Domain name
-END-TLV                DHCPv6-NTP-Server
-
-#
-#  RFC 5986 - Discovering the Local Location Information Server (LIS)
-#
-ATTRIBUTE      DHCPv6-LIS-Access-Domain                57      octets          # Domain name
-
-#
-#  RFC 6011 - Session Initiation Protocol (SIP) User Agent Configuration
-#
-ATTRIBUTE      DHCPv6-SIP-US-CS-Domain-List            58      octets          # Domain name list
-
-#
-#  RFC 5970 - DHCPv6 Options for Network Boot
-#
-ATTRIBUTE      DHCPv6-Bootfile-URL                     59      string
-ATTRIBUTE      DHCPv6-Bootfile-Param                   60      string array
-ATTRIBUTE      DHCPv6-Client-Arch-Type                 61      uint16 array
-
-VALUE  DHCPv6-Client-Arch-Type         x86-BIOS                0
-VALUE  DHCPv6-Client-Arch-Type         NEC-PC98                1
-VALUE  DHCPv6-Client-Arch-Type         Itanium                 2
-VALUE  DHCPv6-Client-Arch-Type         DEC-Alpha               3
-VALUE  DHCPv6-Client-Arch-Type         Arc-x86                 4
-VALUE  DHCPv6-Client-Arch-Type         Intel-Lean-Client       5
-VALUE  DHCPv6-Client-Arch-Type         x86-UEFI                6
-VALUE  DHCPv6-Client-Arch-Type         x64-UEFI                7
-VALUE  DHCPv6-Client-Arch-Type         EFI-Xscale              8
-VALUE  DHCPv6-Client-Arch-Type         EBC                     9
-VALUE  DHCPv6-Client-Arch-Type         ARM-32-bit-UEFI         10
-VALUE  DHCPv6-Client-Arch-Type         ARM-64-bit-UEFI         11
-VALUE  DHCPv6-Client-Arch-Type         PowerPC-Open-Firmware   12
-VALUE  DHCPv6-Client-Arch-Type         PowerPC-ePAPR           13
-VALUE  DHCPv6-Client-Arch-Type         POWER-OPAL-v3           14
-VALUE  DHCPv6-Client-Arch-Type         x86-UEFI-Boot-From-HTTP 15
-VALUE  DHCPv6-Client-Arch-Type         x64-UEFI-Boot-From-HTTP 16
-VALUE  DHCPv6-Client-Arch-Type         EBC-Boot-From-HTTP      17
-VALUE  DHCPv6-Client-Arch-Type         ARM-UEFI-32-Boot-From-HTTP 18
-VALUE  DHCPv6-Client-Arch-Type         ARM-UEFI-64-Boot-From-HTTP 19
-VALUE  DHCPv6-Client-Arch-Type         PCAT-BIOS-Boot-From-HTTP 20
-VALUE  DHCPv6-Client-Arch-Type         ARM-32-Uboot            21
-VALUE  DHCPv6-Client-Arch-Type         ARM-64-Uboot            22
-VALUE  DHCPv6-Client-Arch-Type         ARM-Uboot-32-Boot-From-HTTP 23
-VALUE  DHCPv6-Client-Arch-Type         ARM-Uboot-64-Boot-From-HTTP 24
-VALUE  DHCPv6-Client-Arch-Type         RISC-V-32-Bit-UEFI      25
-VALUE  DHCPv6-Client-Arch-Type         RISC-V-32-Bit-UEFI-Boot-From-HTTP 26
-VALUE  DHCPv6-Client-Arch-Type         RISC-V-64-Bit-UEFI      27
-VALUE  DHCPv6-Client-Arch-Type         RISC-V-64-Bit-UEFI-Boot-From-HTTP 28
-VALUE  DHCPv6-Client-Arch-Type         RISC-V-128-Bit-UEFI     29
-VALUE  DHCPv6-Client-Arch-Type         RISC-V-128-Bit-UEFI-Boot-From-HTTP 30
-VALUE  DHCPv6-Client-Arch-Type         S390-Basic              31
-VALUE  DHCPv6-Client-Arch-Type         S390-Extended           32
-
-ATTRIBUTE      DHCPv6-Client-Network-Interface-ID      62      octets          # Complex struct see RFC 5970
-
-#
-#  RFC 6225 - Dynamic Host Configuration Protocol Options for
-#            Coordinate-Based Location Configuration Information
-#
-ATTRIBUTE      DHCPv6-Geolocation                      63      octets          # Complex struct see RFC 6225
-
-#
-#  RFC 6334 - Dynamic Host Configuration Protocol for IPv6 (DHCPv6) Option
-#             for Dual-Stack Lite.
-#
-ATTRIBUTE      DHCPv6-AFTR-Name                        64      octets          # Domain name
-
-#
-#  RFC 6440 - The EAP Re-authentication Protocol (ERP) Local Domain Name DHCPv6 Option
-#
-ATTRIBUTE      DHCPv6-ERP-Local-Domain-Name            65      octets          # Domain name
-
-#
-#  RFC 6422 - Relay-Supplied DHCP Options
-#
-ATTRIBUTE      DHCPv6-Relay-Supplied-Options           66      tlv             # Options see RFC 6422
-
-#
-#  RFC 6603 - PD Exclude
-#
-ATTRIBUTE      DHCPv6-PD-Exclude                       67      ipv6prefix
-
-#
-#  RFC 6607 - Virtual Subnet Selection Options for DHCPv4 and DHCPv6
-#
-ATTRIBUTE      DHCPv6-Virtual-Subnet-Selection         68      octets          # Complex struct see RFC 6607
-
-#
-#  RFC 6731 - Improved Recursive DNS Server Selection for Multi-Interfaced Nodes
-#
-ATTRIBUTE      DHCPv6-DNS-Recursive-Name-Server        74      octets          # Complex struct see RFC 6731
-
-#
-#  RFC 6784 - Kerberos Options for DHCPv6
-#
-ATTRIBUTE      DHCPv6-Kerberos-Principal-Name          75      octets          # Complex struct see RFC 6784
-ATTRIBUTE      DHCPv6-Kerberos-Realm-Name              76      octets          # Complex struct see RFC 6784
-ATTRIBUTE      DHCPv6-Kerberos-Default-Realm-Name      77      octets          # Complex struct see RFC 6784
-ATTRIBUTE      DHCPv6-Kerberos-KDC                     78      octets          # Complex struct see RFC 6784
-
-#
-#  RFC 6939 - Client Link-Layer Address Option
-#
-ATTRIBUTE      DHCPv6-Client-Link-Layer                79      octets          # Complex struct see RFC 6939
-
-#
-#  RFC 6977 - Triggering DHCPv6 Reconfiguration from Relay Agents
-#
-ATTRIBUTE      DHCPv6-Link-Address                     80      ipv6addr
-
-#
-#  RFC 7037 - RADIUS Option for the DHCPv6 Relay Agent
-#
-ATTRIBUTE      DHCPv6-RADIUS                           81      octets          # Foreign protocol (RADIUS)
-
-#
-#  RFC 7083 - Modification to Default Values of SOL_MAX_RT and INF_MAX_RT
-#
-ATTRIBUTE      DHCPv6-SOL-Max-RT                       82      uint32
-ATTRIBUTE      DHCPv6-INF-Max-RT                       83      uint32
-
-#
-#  RFC 7078 - Distributing Address Selection Policy Using DHCPv6
-#
-ATTRIBUTE      DHCPv6-Address-Selection                84      octets          # Complex struct see RFC 7078
-ATTRIBUTE      DHCPv6-Address-Selection-Table          85      octets          # Complex struct see RFC 7078
-
-#
-#  RFC 7291 - DHCP Options for the Port Control Protocol (PCP)
-#
-ATTRIBUTE      DHCPv6-PCP-Server                       86      ipv6addr array
-
-#
-#  RFC 7341 - DHCPv4-over-DHCPv6 (DHCP 4o6) Transport
-#
-ATTRIBUTE      DHCPv6-DHCPv4-Msg                       87      octets          # Foreign protocol (DHCPv4)
-
-#
-#  RFC 7598 - DHCPv6 Options for Configuration of Softwire Address
-#            and Port-Mapped Clients
-#
-ATTRIBUTE      DHCPv6-S46-Rule                         89      octets          # Complex struct see RFC 7598
-ATTRIBUTE      DHCPv6-S46-Border-Relay                 90      ipv6addr
-ATTRIBUTE      DHCPv6-S46-Default-Mapping-Rule         91      ipv6prefix
-ATTRIBUTE      DHCPv6-S46-Address-Binding              92      octets          # Complex struct see RFC 7598
-ATTRIBUTE      DHCPv6-S46-Port-Parameters              93      octets          # Complex struct see RFC 7598
-ATTRIBUTE      DHCPv6-S46-MAP-Cont-E                   94      octets          # Complex struct see RFC 7598
-ATTRIBUTE      DHCPv6-S46-MAP-Cont-T                   95      octets          # Complex struct see RFC 7598
-ATTRIBUTE      DHCPv6-S46-Cont-LW                      96      octets          # Complex struct see RFC 7598
-
-#
-#  RFC 8026 - Unified IPv4-in-IPv6 Softwire Customer Premises Equipment (CPE):
-#            A DHCPv6-Based Prioritization Mechanism
-#
-ATTRIBUTE      DHCPv6-S46-Priority                     111     uint16 array
-VALUE  DHCPv6-S46-Priority             DS-Lite                 64
-VALUE  DHCPv6-S46-Priority             DHCPv4-Over-DHCPv6      88
-VALUE  DHCPv6-S46-Priority             MAP-E                   94
-VALUE  DHCPv6-S46-Priority             MAP-T                   95
-VALUE  DHCPv6-S46-Priority             Lightweight-4-Over-6    96
-
-#
-#  RFC 7600 - IPv4 Residual Deployment via IPv6 - A Stateless Solution (4rd)
-#
-ATTRIBUTE      DHCPv6-4RD                              97      octets          # Complex struct see RFC 7600
-ATTRIBUTE      DHCPv6-4RD-Map-Rule                     98      octets          # Complex struct see RFC 7600
-ATTRIBUTE      DHCPv6-4RD-Non-Map-Rule                 99      octets          # Complex struct see RFC 7600
-
-#
-#  RFC 7653 - DHCPv6 Active Leasequery
-#
-ATTRIBUTE      DHCPv6-Lease-Query-Base-Time            100     date
-ATTRIBUTE      DHCPv6-Lease-Query-Start-Time           101     uint32
-ATTRIBUTE      DHCPv6-Lease-Query-End-Time             102     uint32
-
-#
-#  RFC 7710 - Captive-Portal Identification Using DHCP or Router Advertisements (RAs)
-#
-ATTRIBUTE      DHCPv6-Captive-Portal-URI               103     string
-
-#
-#  RFC 7774 - Multicast Protocol for Low-Power and Lossy Networks (MPL)
-#             Parameter Configuration Option for DHCPv6
-#
-ATTRIBUTE      DHCPv6-MPL-Parameters                   104     octets          # Complex struct see RFC 7774
-
-#
-#  RFC 7839 - Access-Network-Identifier
-#
-ATTRIBUTE      DHCPv6-ANI-Access-Technology-Type       105     uint16
-
-VALUE  DHCPv6-ANI-Access-Technology-Type Virtual               1
-VALUE  DHCPv6-ANI-Access-Technology-Type PPP                   2
-VALUE  DHCPv6-ANI-Access-Technology-Type IEEE802-3             3
-VALUE  DHCPv6-ANI-Access-Technology-Type IEEE802-11abg         4
-VALUE  DHCPv6-ANI-Access-Technology-Type IEEE802-16e           5
-VALUE  DHCPv6-ANI-Access-Technology-Type 3GPP-GERAN            6
-VALUE  DHCPv6-ANI-Access-Technology-Type 3GPP-UTRAN            7
-VALUE  DHCPv6-ANI-Access-Technology-Type 3GPP-E-UTRAN          8
-VALUE  DHCPv6-ANI-Access-Technology-Type 3GPP2-eHRPD           9
-VALUE  DHCPv6-ANI-Access-Technology-Type 3GPP-HRPD             10
-VALUE  DHCPv6-ANI-Access-Technology-Type 3GPP2-1xRTT           11
-VALUE  DHCPv6-ANI-Access-Technology-Type 3GPP2-UMB             12
-VALUE  DHCPv6-ANI-Access-Technology-Type 3GPP2-NB-IOT          13
-
-ATTRIBUTE      DHCPv6-ANI-Network-Name                 106     string
-ATTRIBUTE      DHCPv6-ANI-Access-Point-Name            107     string
-ATTRIBUTE      DHCPv6-ANI-Access-Point-BSSID           108     ether
-ATTRIBUTE      DHCPv6-ANI-Operator-Identifier          109     uint32
-ATTRIBUTE      DHCPv6-ANI-Operator-Realm               110     string
-
-#
-#  RFC 8115 - DHCPv6 Option for IPv4-Embedded Multicast and Unicast IPv6 Prefixes
-#
-ATTRIBUTE      DHCPv6-Prefix64                         113     octets          # Complex (and stupid) struct
-
-#
-#  RFC 8156 - DHCPv6 Failover Protocol
-#
-ATTRIBUTE      DHCPv6-Failover-Binding-Status          114     uint8
-VALUE  DHCPv6-Failover-Binding-Status  Active                  1
-VALUE  DHCPv6-Failover-Binding-Status  Expired                 2
-VALUE  DHCPv6-Failover-Binding-Status  Released                3
-VALUE  DHCPv6-Failover-Binding-Status  Pending-Free            4
-VALUE  DHCPv6-Failover-Binding-Status  Free                    5
-VALUE  DHCPv6-Failover-Binding-Status  Free-Bakcup             6
-VALUE  DHCPv6-Failover-Binding-Status  Abandoned               7
-VALUE  DHCPv6-Failover-Binding-Status  Reset                   8
-
-ATTRIBUTE      DHCPv6-Failover-Connect-Flags           115     uint16
-VALUE  DHCPv6-Failover-Connect-Flags   Fixed-PD-Length         1
-
-ATTRIBUTE      DHCPv6-Failover-DNS-Removal-Info        116     tlv
-
-BEGIN-TLV      DHCPv6-Failover-DNS-Removal-Info
-ATTRIBUTE      DHCPv6-Failover-DNS-Host-Name           117     octets                  # Domain name
-ATTRIBUTE      DHCPv6-Failover-DNS-Zone-Name           118     octets                  # Zone name
-
-ATTRIBUTE      DHCPv6-Failover-DNS-Flags               119     uint16
-VALUE  DHCPv6-Failover-DNS-Flags       Fwd-Up-To-Date          0x01
-VALUE  DHCPv6-Failover-DNS-Flags       Rev-Up-To-Date          0x02
-VALUE  DHCPv6-Failover-DNS-Flags       Synthesized-Name        0x04
-VALUE  DHCPv6-Failover-DNS-Flags       Using-Requested-FQDN    0x08
-END-TLV                DHCPv6-Failover-DNS-Removal-Info
-
-ATTRIBUTE      DHCPv6-Failover-Expiration-Time         120     date
-ATTRIBUTE      DHCPv6-Failover-Max-Unacked-BNDUPD      121     uint32
-ATTRIBUTE      DHCPv6-Failover-Max-Client-Lead-Time    122     uint32
-ATTRIBUTE      DHCPv6-Failover-Max-Partner-Lifetime    123     uint32
-ATTRIBUTE      DHCPv6-Failover-Partner-Lifetime-Sent   124     uint32
-ATTRIBUTE      DHCPv6-Failover-Partner-Down-Time       125     date
-ATTRIBUTE      DHCPv6-Failover-Partner-Raw-CLT-Time    126     date
-ATTRIBUTE      DHCPv6-Failover-Protocol-Version        127     octets          # Complex struct see RFC 8156
-ATTRIBUTE      DHCPv6-Failover-Keepalive-Time          128     uint32
-ATTRIBUTE      DHCPv6-Failover-Reconfigure-Data        129     octets          # Complex struct see RFC 8156
-ATTRIBUTE      DHCPv6-Failover-Relationship-Name       130     string
-
-ATTRIBUTE      DHCPv6-Failover-Server-Flags            131     uint8
-VALUE  DHCPv6-Failover-Server-Flags    Communicated            0x01
-VALUE  DHCPv6-Failover-Server-Flags    Startup                 0x02
-VALUE  DHCPv6-Failover-Server-Flags    ACK-Startup             0x04
-
-ATTRIBUTE      DHCPv6-Failover-Server-State            132     uint8
-VALUE  DHCPv6-Failover-Server-State    Startup                 1
-VALUE  DHCPv6-Failover-Server-State    Normal                  2
-VALUE  DHCPv6-Failover-Server-State    Communications-Interrupted 3
-VALUE  DHCPv6-Failover-Server-State    Partner-Down            4
-VALUE  DHCPv6-Failover-Server-State    Potential-Conflict      5
-VALUE  DHCPv6-Failover-Server-State    Recover                 6
-VALUE  DHCPv6-Failover-Server-State    Recover-Wait            7
-VALUE  DHCPv6-Failover-Server-State    Recover-Done            8
-VALUE  DHCPv6-Failover-Server-State    Resolution-Interrupted  9
-VALUE  DHCPv6-Failover-Server-State    Conflict-Done           10
-
-ATTRIBUTE      DHCPv6-Failover-Start-Time-Of-State     133     date
-ATTRIBUTE      DHCPv6-Failover-State-Expiration-Time   134     uint32
-
-#
-#  RFC 6153 -   DHCPv4 and DHCPv6 Options for
-#              Access Network Discovery and Selection Function (ANDSF) Discovery
-#
-ATTRIBUTE      DHCPv6-ANDSF-Address                    143     ipv6addr
-
-#
-#  DHCPv6 packet header fields
-#
-FLAGS  internal
-
-ATTRIBUTE      DHCPv6-Msg-Type                         65536   uint8
-VALUE  DHCPv6-Msg-Type                 Solicit                 1
-VALUE  DHCPv6-Msg-Type                 Advertise               2
-VALUE  DHCPv6-Msg-Type                 Request                 3
-VALUE  DHCPv6-Msg-Type                 Confirm                 4
-VALUE  DHCPv6-Msg-Type                 Renew                   5
-VALUE  DHCPv6-Msg-Type                 Rebind                  6
-VALUE  DHCPv6-Msg-Type                 Reply                   7
-VALUE  DHCPv6-Msg-Type                 Release                 8
-VALUE  DHCPv6-Msg-Type                 Decline                 9
-VALUE  DHCPv6-Msg-Type                 Reconfigure             10
-VALUE  DHCPv6-Msg-Type                 Information-Request     11
-VALUE  DHCPv6-Msg-Type                 Relay-Forward           12
-VALUE  DHCPv6-Msg-Type                 Relay-Reply             13
-VALUE  DHCPv6-Msg-Type                 Lease-Query             14
-VALUE  DHCPv6-Msg-Type                 Lease-Query-Reply       15
-VALUE  DHCPv6-Msg-Type                 Lease-Query-Done        16
-VALUE  DHCPv6-Msg-Type                 Lease-Query-Data        17
-VALUE  DHCPv6-Msg-Type                 Reconfigure-Request     18
-VALUE  DHCPv6-Msg-Type                 Reconfigure-Reply       19
-VALUE  DHCPv6-Msg-Type                 DHCPv4-Query            20
-VALUE  DHCPv6-Msg-Type                 DHCPv4-Response         21
-VALUE  DHCPv6-Msg-Type                 Active-Lease-Query      22
-VALUE  DHCPv6-Msg-Type                 Start-TLS               23
-VALUE  DHCPv6-Msg-Type                 Bind-Update             24
-VALUE  DHCPv6-Msg-Type                 Bind-Reply              25
-VALUE  DHCPv6-Msg-Type                 Pool-Request            26
-VALUE  DHCPv6-Msg-Type                 Pool-Response           27
-VALUE  DHCPv6-Msg-Type                 Update-Request          28
-VALUE  DHCPv6-Msg-Type                 Update-Request-All      29
-VALUE  DHCPv6-Msg-Type                 Update-Done             30
-VALUE  DHCPv6-Msg-Type                 Connect                 31
-VALUE  DHCPv6-Msg-Type                 Connect-Reply           32
-VALUE  DHCPv6-Msg-Type                 Disconnect              33
-VALUE  DHCPv6-Msg-Type                 State                   34
-VALUE  DHCPv6-Msg-Type                 Contact                 35
-
-ATTRIBUTE      DHCPv6-Transaction-ID                   65537   uint64          # Actually 48bits
diff --git a/share/dictionary/dhcpv6/dictionary.freeradius.internal b/share/dictionary/dhcpv6/dictionary.freeradius.internal
new file mode 100644 (file)
index 0000000..063da25
--- /dev/null
@@ -0,0 +1,53 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+# Internal FreeRADIUS DHCPv6 dictionary.
+#
+# $Id$
+#
+##############################################################################
+
+#
+#  DHCPv6 packet header fields
+#
+FLAGS  internal
+
+ATTRIBUTE      Msg-Type                                65536   uint8
+VALUE  Msg-Type                        Solicit                 1
+VALUE  Msg-Type                        Advertise               2
+VALUE  Msg-Type                        Request                 3
+VALUE  Msg-Type                        Confirm                 4
+VALUE  Msg-Type                        Renew                   5
+VALUE  Msg-Type                        Rebind                  6
+VALUE  Msg-Type                        Reply                   7
+VALUE  Msg-Type                        Release                 8
+VALUE  Msg-Type                        Decline                 9
+VALUE  Msg-Type                        Reconfigure             10
+VALUE  Msg-Type                        Information-Request     11
+VALUE  Msg-Type                        Relay-Forward           12
+VALUE  Msg-Type                        Relay-Reply             13
+VALUE  Msg-Type                        Lease-Query             14
+VALUE  Msg-Type                        Lease-Query-Reply       15
+VALUE  Msg-Type                        Lease-Query-Done        16
+VALUE  Msg-Type                        Lease-Query-Data        17
+VALUE  Msg-Type                        Reconfigure-Request     18
+VALUE  Msg-Type                        Reconfigure-Reply       19
+VALUE  Msg-Type                        DHCPv4-Query            20
+VALUE  Msg-Type                        DHCPv4-Response         21
+VALUE  Msg-Type                        Active-Lease-Query      22
+VALUE  Msg-Type                        Start-TLS               23
+VALUE  Msg-Type                        Bind-Update             24
+VALUE  Msg-Type                        Bind-Reply              25
+VALUE  Msg-Type                        Pool-Request            26
+VALUE  Msg-Type                        Pool-Response           27
+VALUE  Msg-Type                        Update-Request          28
+VALUE  Msg-Type                        Update-Request-All      29
+VALUE  Msg-Type                        Update-Done             30
+VALUE  Msg-Type                        Connect                 31
+VALUE  Msg-Type                        Connect-Reply           32
+VALUE  Msg-Type                        Disconnect              33
+VALUE  Msg-Type                        State                   34
+VALUE  Msg-Type                        Contact                 35
+
+ATTRIBUTE      Transaction-ID                  65537   uint64          # Actually 48bits
diff --git a/share/dictionary/dhcpv6/dictionary.rfc3315 b/share/dictionary/dhcpv6/dictionary.rfc3315
new file mode 100644 (file)
index 0000000..145493d
--- /dev/null
@@ -0,0 +1,29 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC3315 - Dynamic Host Configuration Protocol for IPv6 (DHCPv6)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Client-ID                       1       octets
+ATTRIBUTE      Server-ID                       2       octets
+ATTRIBUTE      IA-NA                           3       octets          # Complex struct see RFC 3315
+ATTRIBUTE      IA-TA                           4       octets          # Complex struct see RFC 3315
+ATTRIBUTE      IA-ADDR                         5       octets          # Complex struct see RFC 3315
+ATTRIBUTE      Option-Request                  6       octets          # Magic option listing requested options
+ATTRIBUTE      Preference                      7       uint8
+ATTRIBUTE      Elapsed-Time                    8       uint16
+ATTRIBUTE      Relay-Message                   9       octets
+ATTRIBUTE      Auth                            11      octets          # Complex struct see RFC 3315
+ATTRIBUTE      Unicast                         12      ipv6addr
+ATTRIBUTE      Status-Code                     13      octets          # Complex struct see RFC 3315
+ATTRIBUTE      Rapid-Commit                    14      bool
+ATTRIBUTE      User-Class                      15      octets array
+ATTRIBUTE      Vendor-Class                    16      octets          # Complex struct see RFC 3315
+ATTRIBUTE      Vendor-Opts                     17      vsa
+ATTRIBUTE      Interface-ID                    18      octets
+ATTRIBUTE      Reconf-Msg                      19      uint8
+ATTRIBUTE      Reconf-Accept                   20      bool
diff --git a/share/dictionary/dhcpv6/dictionary.rfc3319 b/share/dictionary/dhcpv6/dictionary.rfc3319
new file mode 100644 (file)
index 0000000..cf8e798
--- /dev/null
@@ -0,0 +1,13 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC3319 - Dynamic Host Configuration Protocol (DHCPv6) Options
+#            for Session Initiation Protocol (SIP) Servers
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      SIP-Server-Domain-Name-List     21      octets          # Domain name list (DNS encoding)
+ATTRIBUTE      SIP-Server-Address              22      ipv6addr array
diff --git a/share/dictionary/dhcpv6/dictionary.rfc3633 b/share/dictionary/dhcpv6/dictionary.rfc3633
new file mode 100644 (file)
index 0000000..d55315e
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC3633 - IPv6 Prefix Options for
+#           Dynamic Host Configuration Protocol (DHCP) version 6
+#
+##############################################################################
+
+ATTRIBUTE      IA-PD                           25      octets          # Complex struct see RFC 3633
+ATTRIBUTE      IA-Prefix                       26      octets          # Complex struct see RFC 3633
diff --git a/share/dictionary/dhcpv6/dictionary.rfc3646 b/share/dictionary/dhcpv6/dictionary.rfc3646
new file mode 100644 (file)
index 0000000..bee1353
--- /dev/null
@@ -0,0 +1,13 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC3646 - DNS Configuration options for Dynamic Host
+#           Configuration Protocol for IPv6 (DHCPv6)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      DNS-Servers                     23      ipv6addr array
+ATTRIBUTE      Domain-List                     24      octets          # Domain name list (DNS encoding)
diff --git a/share/dictionary/dhcpv6/dictionary.rfc3898 b/share/dictionary/dhcpv6/dictionary.rfc3898
new file mode 100644 (file)
index 0000000..320bad1
--- /dev/null
@@ -0,0 +1,16 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC3898 - Network Information Service (NIS)
+#           Configuration Options for
+#           Dynamic Host Configuration Protocol for IPv6 (DHCPv6)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      NIS-Servers                     27      ipv6addr array
+ATTRIBUTE      NIS-Plus-Servers                        28      ipv6addr array
+ATTRIBUTE      NIS-Domain-Name                 29      octets          # Domain name
+ATTRIBUTE      NIS-Plus-Domain-Name            30      octets          # Domain name
diff --git a/share/dictionary/dhcpv6/dictionary.rfc4075 b/share/dictionary/dhcpv6/dictionary.rfc4075
new file mode 100644 (file)
index 0000000..31f98c3
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 4075 - Simple Network Time Protocol (SNTP) Configuration Option for DHCPv6
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      SNTP-Servers                    31      ipv6addr array
diff --git a/share/dictionary/dhcpv6/dictionary.rfc4242 b/share/dictionary/dhcpv6/dictionary.rfc4242
new file mode 100644 (file)
index 0000000..d6469f3
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 4242 - Information Refresh Time Option for
+#            Dynamic Host Configuration Protocol for IPv6 (DHCPv6)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Information-Refresh-Time                32      uint32
diff --git a/share/dictionary/dhcpv6/dictionary.rfc4280 b/share/dictionary/dhcpv6/dictionary.rfc4280
new file mode 100644 (file)
index 0000000..a17eb30
--- /dev/null
@@ -0,0 +1,13 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 4280 - Dynamic Host Configuration Protocol (DHCP) Options for
+#             Broadcast and Multicast Control Servers
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      BCMCS-Server-Domain-Name-List   33      octets          # Domain name list (DNS encoding)
+ATTRIBUTE      BCMCS-Server-Address            34      ipv6addr array
diff --git a/share/dictionary/dhcpv6/dictionary.rfc4580 b/share/dictionary/dhcpv6/dictionary.rfc4580
new file mode 100644 (file)
index 0000000..d09666e
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 4580 - Dynamic Host Configuration Protocol for IPv6 (DHCPv6)
+#             Relay Agent Subscriber-ID Option
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Subscriber-ID                   38      string
diff --git a/share/dictionary/dhcpv6/dictionary.rfc4649 b/share/dictionary/dhcpv6/dictionary.rfc4649
new file mode 100644 (file)
index 0000000..059191c
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 4649 - Dynamic Host Configuration Protocol for IPv6 (DHCPv6)
+#            Relay Agent Remote-ID Option
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Relay-Agent-Remote-ID           37      octets          # Complex struct see RFC 4649
diff --git a/share/dictionary/dhcpv6/dictionary.rfc4704 b/share/dictionary/dhcpv6/dictionary.rfc4704
new file mode 100644 (file)
index 0000000..c7ad83a
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 4704 - The Dynamic Host Configuration Protocol for IPv6 (DHCPv6) Client
+#             Fully Qualified Domain Name (FQDN) Option
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Client-FQDN                     39      octets          # Complex struct see RFC 4704
diff --git a/share/dictionary/dhcpv6/dictionary.rfc4776 b/share/dictionary/dhcpv6/dictionary.rfc4776
new file mode 100644 (file)
index 0000000..731ebd0
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 4776 - Dynamic Host Configuration Protocol (DHCPv4 and DHCPv6) Option
+#             for Civic Addresses Configuration Information
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Geoconf-Civic                   36      octets          # Complex struct see RFC 4776
diff --git a/share/dictionary/dhcpv6/dictionary.rfc4833 b/share/dictionary/dhcpv6/dictionary.rfc4833
new file mode 100644 (file)
index 0000000..f2d6f4e
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 4833 - Timezone Options for DHCP
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      New-Posix-Timezone              41      string
+ATTRIBUTE      New-TZDB-Timezone               42      string
diff --git a/share/dictionary/dhcpv6/dictionary.rfc4994 b/share/dictionary/dhcpv6/dictionary.rfc4994
new file mode 100644 (file)
index 0000000..9d22ce7
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 4994 - DHCPv6 Relay Agent Echo Request Option
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Relay-Agent-Echo-Request                43      uint16 array    # Array of option numbers
diff --git a/share/dictionary/dhcpv6/dictionary.rfc5007 b/share/dictionary/dhcpv6/dictionary.rfc5007
new file mode 100644 (file)
index 0000000..55b6c0a
--- /dev/null
@@ -0,0 +1,15 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 5007 - DHCPv6 Leasequery
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Lease-Query                     44      octets          # Complex struct see RFC 5007
+ATTRIBUTE      Client-Data                     45      octets          # Complex struct see RFC 5007
+ATTRIBUTE      Client-Last-Transaction-Time    46      uint32
+ATTRIBUTE      Lease-Query-Relay-Data          47      octets          # Complex struct see RFC 5007
+ATTRIBUTE      Lease-Query-Client-Link         48      ipv6addr array
diff --git a/share/dictionary/dhcpv6/dictionary.rfc5192 b/share/dictionary/dhcpv6/dictionary.rfc5192
new file mode 100644 (file)
index 0000000..ad3035b
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 5192 - DHCP Options for Protocol for Carrying Authentication for
+#             Network Access (PANA) Authentication Agent
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      PANA-Authentication-Agent       40      ipv6addr array
diff --git a/share/dictionary/dhcpv6/dictionary.rfc5223 b/share/dictionary/dhcpv6/dictionary.rfc5223
new file mode 100644 (file)
index 0000000..788577f
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 5223 - Discovering Location-to-Service Translation (LoST) Servers Using the
+#             Dynamic Host Configuration Protocol (DHCP)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      LoST                            51      octets          # Domain name
diff --git a/share/dictionary/dhcpv6/dictionary.rfc5417 b/share/dictionary/dhcpv6/dictionary.rfc5417
new file mode 100644 (file)
index 0000000..def57fd
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 5417 - Control And Provisioning of Wireless Access Points (CAPWAP)
+#             Access Controller DHCP Option
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Capwap-AC                       52      ipv6addr array
diff --git a/share/dictionary/dhcpv6/dictionary.rfc5460 b/share/dictionary/dhcpv6/dictionary.rfc5460
new file mode 100644 (file)
index 0000000..fcfd255
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 5460 - DHCPv6 Bulk Leasequery
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Relay-ID                                53      octets
diff --git a/share/dictionary/dhcpv6/dictionary.rfc5678 b/share/dictionary/dhcpv6/dictionary.rfc5678
new file mode 100644 (file)
index 0000000..80d18d7
--- /dev/null
@@ -0,0 +1,26 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 5678 - Dynamic Host Configuration Protocol (DHCPv4 and DHCPv6) Options for
+#             IEEE 802.21 Mobility Services (MoS) Discovery
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      MOD-Address-List                        54      tlv
+
+BEGIN-TLV      MOD-Address-List
+ATTRIBUTE      MOS-Address-IS                  1       ipv6addr array
+ATTRIBUTE      MOS-Address-CS                  2       ipv6addr array
+ATTRIBUTE      MOS-Address-ES                  3       ipv6addr array
+END-TLV                MOD-Address-List
+
+ATTRIBUTE      MOS-Domain-Name-List            55      tlv
+
+BEGIN-TLV      MOS-Domain-Name-List
+ATTRIBUTE      MOS-Domain-Name-IS              1       octets          # Domain name
+ATTRIBUTE      MOS-Domain-Name-CS              2       octets          # Domain name
+ATTRIBUTE      MOS-Domain-Name-ES              3       octets          # Domain name
+END-TLV                MOS-Domain-Name-List
diff --git a/share/dictionary/dhcpv6/dictionary.rfc5908 b/share/dictionary/dhcpv6/dictionary.rfc5908
new file mode 100644 (file)
index 0000000..7d95410
--- /dev/null
@@ -0,0 +1,16 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 5908 - Network Time Protocol (NTP) Server Option for DHCPv6
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      NTP-Server                      56      tlv
+BEGIN-TLV      NTP-Server
+ATTRIBUTE      NTP-Server-Address              1       ipv6addr
+ATTRIBUTE      NTP-Server-Multicast-Address    2       ipv6addr
+ATTRIBUTE      NTP-Server-FQDN                 3       octets          # Domain name
+END-TLV                NTP-Server
diff --git a/share/dictionary/dhcpv6/dictionary.rfc5970 b/share/dictionary/dhcpv6/dictionary.rfc5970
new file mode 100644 (file)
index 0000000..0edad60
--- /dev/null
@@ -0,0 +1,49 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 5970 - DHCPv6 Options for Network Boot
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Bootfile-URL                    59      string
+ATTRIBUTE      Bootfile-Param                  60      string array
+ATTRIBUTE      Client-Arch-Type                        61      uint16 array
+
+VALUE  Client-Arch-Type                x86-BIOS                0
+VALUE  Client-Arch-Type                NEC-PC98                1
+VALUE  Client-Arch-Type                Itanium                 2
+VALUE  Client-Arch-Type                DEC-Alpha               3
+VALUE  Client-Arch-Type                Arc-x86                 4
+VALUE  Client-Arch-Type                Intel-Lean-Client       5
+VALUE  Client-Arch-Type                x86-UEFI                6
+VALUE  Client-Arch-Type                x64-UEFI                7
+VALUE  Client-Arch-Type                EFI-Xscale              8
+VALUE  Client-Arch-Type                EBC                     9
+VALUE  Client-Arch-Type                ARM-32-bit-UEFI         10
+VALUE  Client-Arch-Type                ARM-64-bit-UEFI         11
+VALUE  Client-Arch-Type                PowerPC-Open-Firmware   12
+VALUE  Client-Arch-Type                PowerPC-ePAPR           13
+VALUE  Client-Arch-Type                POWER-OPAL-v3           14
+VALUE  Client-Arch-Type                x86-UEFI-Boot-From-HTTP 15
+VALUE  Client-Arch-Type                x64-UEFI-Boot-From-HTTP 16
+VALUE  Client-Arch-Type                EBC-Boot-From-HTTP      17
+VALUE  Client-Arch-Type                ARM-UEFI-32-Boot-From-HTTP 18
+VALUE  Client-Arch-Type                ARM-UEFI-64-Boot-From-HTTP 19
+VALUE  Client-Arch-Type                PCAT-BIOS-Boot-From-HTTP 20
+VALUE  Client-Arch-Type                ARM-32-Uboot            21
+VALUE  Client-Arch-Type                ARM-64-Uboot            22
+VALUE  Client-Arch-Type                ARM-Uboot-32-Boot-From-HTTP 23
+VALUE  Client-Arch-Type                ARM-Uboot-64-Boot-From-HTTP 24
+VALUE  Client-Arch-Type                RISC-V-32-Bit-UEFI      25
+VALUE  Client-Arch-Type                RISC-V-32-Bit-UEFI-Boot-From-HTTP 26
+VALUE  Client-Arch-Type                RISC-V-64-Bit-UEFI      27
+VALUE  Client-Arch-Type                RISC-V-64-Bit-UEFI-Boot-From-HTTP 28
+VALUE  Client-Arch-Type                RISC-V-128-Bit-UEFI     29
+VALUE  Client-Arch-Type                RISC-V-128-Bit-UEFI-Boot-From-HTTP 30
+VALUE  Client-Arch-Type                S390-Basic              31
+VALUE  Client-Arch-Type                S390-Extended           32
+
+ATTRIBUTE      Client-Network-Interface-ID     62      octets          # Complex struct see RFC 5970
diff --git a/share/dictionary/dhcpv6/dictionary.rfc5986 b/share/dictionary/dhcpv6/dictionary.rfc5986
new file mode 100644 (file)
index 0000000..7b47873
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 5986 - Discovering the Local Location Information Server (LIS)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      LIS-Access-Domain               57      octets          # Domain name
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6011 b/share/dictionary/dhcpv6/dictionary.rfc6011
new file mode 100644 (file)
index 0000000..ec9e8ed
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6011 - Session Initiation Protocol (SIP) User Agent Configuration
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      SIP-US-CS-Domain-List           58      octets          # Domain name list
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6153 b/share/dictionary/dhcpv6/dictionary.rfc6153
new file mode 100644 (file)
index 0000000..eeb1adb
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6153 -   DHCPv4 and DHCPv6 Options for
+#              Access Network Discovery and Selection Function (ANDSF) Discovery
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      ANDSF-Address                   143     ipv6addr
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6225 b/share/dictionary/dhcpv6/dictionary.rfc6225
new file mode 100644 (file)
index 0000000..df901a4
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6225 - Dynamic Host Configuration Protocol Options for
+#            Coordinate-Based Location Configuration Information
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Geolocation                     63      octets          # Complex struct see RFC 6225
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6334 b/share/dictionary/dhcpv6/dictionary.rfc6334
new file mode 100644 (file)
index 0000000..fa4fac7
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6334 - Dynamic Host Configuration Protocol for IPv6 (DHCPv6) Option
+#             for Dual-Stack Lite.
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      AFTR-Name                       64      octets          # Domain name
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6422 b/share/dictionary/dhcpv6/dictionary.rfc6422
new file mode 100644 (file)
index 0000000..7528d56
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6422 - Relay-Supplied DHCP Options
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Relay-Supplied-Options          66      tlv             # Options see RFC 6422
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6440 b/share/dictionary/dhcpv6/dictionary.rfc6440
new file mode 100644 (file)
index 0000000..cbd9032
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6440 - The EAP Re-authentication Protocol (ERP) Local Domain Name DHCPv6 Option
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      ERP-Local-Domain-Name           65      octets          # Domain name
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6603 b/share/dictionary/dhcpv6/dictionary.rfc6603
new file mode 100644 (file)
index 0000000..d205465
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6603 - PD Exclude
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      PD-Exclude                      67      ipv6prefix
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6607 b/share/dictionary/dhcpv6/dictionary.rfc6607
new file mode 100644 (file)
index 0000000..8aa6edc
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6607 - Virtual Subnet Selection Options for DHCPv4 and DHCPv6
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Virtual-Subnet-Selection                68      octets          # Complex struct see RFC 6607
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6610 b/share/dictionary/dhcpv6/dictionary.rfc6610
new file mode 100644 (file)
index 0000000..21f8571
--- /dev/null
@@ -0,0 +1,18 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6610 - DHCP Options for Home Information Discovery in Mobile IPv6 (MIPv6)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      MIP6-Home-Net-ID-FQDN           49      octets          # Domain name
+ATTRIBUTE      MIP6-Home-Net-Info              50      octets          # Complex struct see RFC 6610
+
+ATTRIBUTE      MIP6-Identified-Home-Net-Info   69      octets          # Complex struct see RFC 6610
+ATTRIBUTE      MIP6-Unrestricted-Home-Net-Info 70      octets          # Complex struct see RFC 6610
+ATTRIBUTE      MIP6-Home-Net-Prefix            71      ipv6prefix
+ATTRIBUTE      MIP6-Home-Net-Address           72      ipv6addr
+ATTRIBUTE      MIP6-Home-Agent-FQDN            73      octets          # Domain name
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6731 b/share/dictionary/dhcpv6/dictionary.rfc6731
new file mode 100644 (file)
index 0000000..5792386
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6731 - Improved Recursive DNS Server Selection for Multi-Interfaced Nodes
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      DNS-Recursive-Name-Server       74      octets          # Complex struct see RFC 6731
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6784 b/share/dictionary/dhcpv6/dictionary.rfc6784
new file mode 100644 (file)
index 0000000..702750e
--- /dev/null
@@ -0,0 +1,14 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6784 - Kerberos Options for DHCPv6
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Kerberos-Principal-Name         75      octets          # Complex struct see RFC 6784
+ATTRIBUTE      Kerberos-Realm-Name             76      octets          # Complex struct see RFC 6784
+ATTRIBUTE      Kerberos-Default-Realm-Name     77      octets          # Complex struct see RFC 6784
+ATTRIBUTE      Kerberos-KDC                    78      octets          # Complex struct see RFC 6784
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6939 b/share/dictionary/dhcpv6/dictionary.rfc6939
new file mode 100644 (file)
index 0000000..55c0e49
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6939 - Client Link-Layer Address Option
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Client-Link-Layer               79      octets          # Complex struct see RFC 6939
diff --git a/share/dictionary/dhcpv6/dictionary.rfc6977 b/share/dictionary/dhcpv6/dictionary.rfc6977
new file mode 100644 (file)
index 0000000..de31590
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 6977 - Triggering DHCPv6 Reconfiguration from Relay Agents
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Link-Address                    80      ipv6addr
diff --git a/share/dictionary/dhcpv6/dictionary.rfc7037 b/share/dictionary/dhcpv6/dictionary.rfc7037
new file mode 100644 (file)
index 0000000..a63de79
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 7037 - RADIUS Option for the DHCPv6 Relay Agent
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      RADIUS                          81      octets          # Foreign protocol (RADIUS)
diff --git a/share/dictionary/dhcpv6/dictionary.rfc7078 b/share/dictionary/dhcpv6/dictionary.rfc7078
new file mode 100644 (file)
index 0000000..dffe3f6
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 7083 - Modification to Default Values of SOL_MAX_RT and INF_MAX_RT
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      SOL-Max-RT                      82      uint32
+ATTRIBUTE      INF-Max-RT                      83      uint32
diff --git a/share/dictionary/dhcpv6/dictionary.rfc7083 b/share/dictionary/dhcpv6/dictionary.rfc7083
new file mode 100644 (file)
index 0000000..b1576bf
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 7078 - Distributing Address Selection Policy Using DHCPv6
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Address-Selection               84      octets          # Complex struct see RFC 7078
+ATTRIBUTE      Address-Selection-Table         85      octets          # Complex struct see RFC 7078
diff --git a/share/dictionary/dhcpv6/dictionary.rfc7291 b/share/dictionary/dhcpv6/dictionary.rfc7291
new file mode 100644 (file)
index 0000000..dd3ac5d
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 7291 - DHCP Options for the Port Control Protocol (PCP)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      PCP-Server                      86      ipv6addr array
diff --git a/share/dictionary/dhcpv6/dictionary.rfc7341 b/share/dictionary/dhcpv6/dictionary.rfc7341
new file mode 100644 (file)
index 0000000..49fff56
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 7341 - DHCPv4-over-DHCPv6 (DHCP 4o6) Transport
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      DHCPv4-Msg                      87      octets          # Foreign protocol (DHCPv4)
diff --git a/share/dictionary/dhcpv6/dictionary.rfc7598 b/share/dictionary/dhcpv6/dictionary.rfc7598
new file mode 100644 (file)
index 0000000..12edea8
--- /dev/null
@@ -0,0 +1,19 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 7598 - DHCPv6 Options for Configuration of Softwire Address
+#            and Port-Mapped Clients
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      S46-Rule                                89      octets          # Complex struct see RFC 7598
+ATTRIBUTE      S46-Border-Relay                        90      ipv6addr
+ATTRIBUTE      S46-Default-Mapping-Rule                91      ipv6prefix
+ATTRIBUTE      S46-Address-Binding             92      octets          # Complex struct see RFC 7598
+ATTRIBUTE      S46-Port-Parameters             93      octets          # Complex struct see RFC 7598
+ATTRIBUTE      S46-MAP-Cont-E                  94      octets          # Complex struct see RFC 7598
+ATTRIBUTE      S46-MAP-Cont-T                  95      octets          # Complex struct see RFC 7598
+ATTRIBUTE      S46-Cont-LW                     96      octets          # Complex struct see RFC 7598
diff --git a/share/dictionary/dhcpv6/dictionary.rfc7600 b/share/dictionary/dhcpv6/dictionary.rfc7600
new file mode 100644 (file)
index 0000000..6fbf199
--- /dev/null
@@ -0,0 +1,13 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 7600 - IPv4 Residual Deployment via IPv6 - A Stateless Solution (4rd)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      4RD                             97      octets          # Complex struct see RFC 7600
+ATTRIBUTE      4RD-Map-Rule                    98      octets          # Complex struct see RFC 7600
+ATTRIBUTE      4RD-Non-Map-Rule                        99      octets          # Complex struct see RFC 7600
diff --git a/share/dictionary/dhcpv6/dictionary.rfc7653 b/share/dictionary/dhcpv6/dictionary.rfc7653
new file mode 100644 (file)
index 0000000..caeb84c
--- /dev/null
@@ -0,0 +1,13 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 7653 - DHCPv6 Active Leasequery
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Lease-Query-Base-Time           100     date
+ATTRIBUTE      Lease-Query-Start-Time          101     uint32
+ATTRIBUTE      Lease-Query-End-Time            102     uint32
diff --git a/share/dictionary/dhcpv6/dictionary.rfc7710 b/share/dictionary/dhcpv6/dictionary.rfc7710
new file mode 100644 (file)
index 0000000..21074f7
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 7710 - Captive-Portal Identification Using DHCP or Router Advertisements (RAs)
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Captive-Portal-URI              103     string
diff --git a/share/dictionary/dhcpv6/dictionary.rfc7774 b/share/dictionary/dhcpv6/dictionary.rfc7774
new file mode 100644 (file)
index 0000000..f05024f
--- /dev/null
@@ -0,0 +1,12 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 7774 - Multicast Protocol for Low-Power and Lossy Networks (MPL)
+#             Parameter Configuration Option for DHCPv6
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      MPL-Parameters                  104     octets          # Complex struct see RFC 7774
diff --git a/share/dictionary/dhcpv6/dictionary.rfc7839 b/share/dictionary/dhcpv6/dictionary.rfc7839
new file mode 100644 (file)
index 0000000..92b3d66
--- /dev/null
@@ -0,0 +1,29 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 7839 - Access-Network-Identifier
+#
+#  $Id$
+#
+ATTRIBUTE      ANI-Access-Technology-Type      105     uint16
+
+VALUE  ANI-Access-Technology-Type Virtual              1
+VALUE  ANI-Access-Technology-Type PPP                  2
+VALUE  ANI-Access-Technology-Type IEEE802-3            3
+VALUE  ANI-Access-Technology-Type IEEE802-11abg                4
+VALUE  ANI-Access-Technology-Type IEEE802-16e          5
+VALUE  ANI-Access-Technology-Type 3GPP-GERAN           6
+VALUE  ANI-Access-Technology-Type 3GPP-UTRAN           7
+VALUE  ANI-Access-Technology-Type 3GPP-E-UTRAN         8
+VALUE  ANI-Access-Technology-Type 3GPP2-eHRPD          9
+VALUE  ANI-Access-Technology-Type 3GPP-HRPD            10
+VALUE  ANI-Access-Technology-Type 3GPP2-1xRTT          11
+VALUE  ANI-Access-Technology-Type 3GPP2-UMB            12
+VALUE  ANI-Access-Technology-Type 3GPP2-NB-IOT         13
+
+ATTRIBUTE      ANI-Network-Name                        106     string
+ATTRIBUTE      ANI-Access-Point-Name           107     string
+ATTRIBUTE      ANI-Access-Point-BSSID          108     ether
+ATTRIBUTE      ANI-Operator-Identifier         109     uint32
+ATTRIBUTE      ANI-Operator-Realm              110     string
diff --git a/share/dictionary/dhcpv6/dictionary.rfc8026 b/share/dictionary/dhcpv6/dictionary.rfc8026
new file mode 100644 (file)
index 0000000..df8c575
--- /dev/null
@@ -0,0 +1,17 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 8026 - Unified IPv4-in-IPv6 Softwire Customer Premises Equipment (CPE):
+#            A Based Prioritization Mechanism
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      S46-Priority                    111     uint16 array
+VALUE  S46-Priority            DS-Lite                 64
+VALUE  S46-Priority            DHCPv4-Over-DHCPv6      88
+VALUE  S46-Priority            MAP-E                   94
+VALUE  S46-Priority            MAP-T                   95
+VALUE  S46-Priority            Lightweight-4-Over-6    96
diff --git a/share/dictionary/dhcpv6/dictionary.rfc8115 b/share/dictionary/dhcpv6/dictionary.rfc8115
new file mode 100644 (file)
index 0000000..7cf9bc4
--- /dev/null
@@ -0,0 +1,11 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 8115 - DHCPv6 Option for IPv4-Embedded Multicast and Unicast IPv6 Prefixes
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Prefix64                                113     octets          # Complex (and stupid) struct
diff --git a/share/dictionary/dhcpv6/dictionary.rfc8156 b/share/dictionary/dhcpv6/dictionary.rfc8156
new file mode 100644 (file)
index 0000000..ec9fa3d
--- /dev/null
@@ -0,0 +1,67 @@
+# -*- text -*-
+# Copyright (C) 2019 The FreeRADIUS Server project and contributors
+##############################################################################
+#
+#  RFC 8156 - DHCPv6 Failover Protocol
+#
+#  $Id$
+#
+##############################################################################
+
+ATTRIBUTE      Failover-Binding-Status         114     uint8
+VALUE  Failover-Binding-Status Active                  1
+VALUE  Failover-Binding-Status Expired                 2
+VALUE  Failover-Binding-Status Released                3
+VALUE  Failover-Binding-Status Pending-Free            4
+VALUE  Failover-Binding-Status Free                    5
+VALUE  Failover-Binding-Status Free-Bakcup             6
+VALUE  Failover-Binding-Status Abandoned               7
+VALUE  Failover-Binding-Status Reset                   8
+
+ATTRIBUTE      Failover-Connect-Flags          115     uint16
+VALUE  Failover-Connect-Flags  Fixed-PD-Length         1
+
+ATTRIBUTE      Failover-DNS-Removal-Info       116     tlv
+
+BEGIN-TLV      Failover-DNS-Removal-Info
+ATTRIBUTE      Failover-DNS-Host-Name          117     octets                  # Domain name
+ATTRIBUTE      Failover-DNS-Zone-Name          118     octets                  # Zone name
+
+ATTRIBUTE      Failover-DNS-Flags              119     uint16
+VALUE  Failover-DNS-Flags      Fwd-Up-To-Date          0x01
+VALUE  Failover-DNS-Flags      Rev-Up-To-Date          0x02
+VALUE  Failover-DNS-Flags      Synthesized-Name        0x04
+VALUE  Failover-DNS-Flags      Using-Requested-FQDN    0x08
+END-TLV                Failover-DNS-Removal-Info
+
+ATTRIBUTE      Failover-Expiration-Time                120     date
+ATTRIBUTE      Failover-Max-Unacked-BNDUPD     121     uint32
+ATTRIBUTE      Failover-Max-Client-Lead-Time   122     uint32
+ATTRIBUTE      Failover-Max-Partner-Lifetime   123     uint32
+ATTRIBUTE      Failover-Partner-Lifetime-Sent  124     uint32
+ATTRIBUTE      Failover-Partner-Down-Time      125     date
+ATTRIBUTE      Failover-Partner-Raw-CLT-Time   126     date
+ATTRIBUTE      Failover-Protocol-Version       127     octets          # Complex struct see RFC 8156
+ATTRIBUTE      Failover-Keepalive-Time         128     uint32
+ATTRIBUTE      Failover-Reconfigure-Data       129     octets          # Complex struct see RFC 8156
+ATTRIBUTE      Failover-Relationship-Name      130     string
+
+ATTRIBUTE      Failover-Server-Flags           131     uint8
+VALUE  Failover-Server-Flags   Communicated            0x01
+VALUE  Failover-Server-Flags   Startup                 0x02
+VALUE  Failover-Server-Flags   ACK-Startup             0x04
+
+ATTRIBUTE      Failover-Server-State           132     uint8
+VALUE  Failover-Server-State   Startup                 1
+VALUE  Failover-Server-State   Normal                  2
+VALUE  Failover-Server-State   Communications-Interrupted 3
+VALUE  Failover-Server-State   Partner-Down            4
+VALUE  Failover-Server-State   Potential-Conflict      5
+VALUE  Failover-Server-State   Recover                 6
+VALUE  Failover-Server-State   Recover-Wait            7
+VALUE  Failover-Server-State   Recover-Done            8
+VALUE  Failover-Server-State   Resolution-Interrupted  9
+VALUE  Failover-Server-State   Conflict-Done           10
+
+ATTRIBUTE      Failover-Start-Time-Of-State    133     date
+ATTRIBUTE      Failover-State-Expiration-Time  134     uint32
index 4fffbbf31f34790d2f6c74dfa0f34a85c8ed99ac..03c5e4b0daf3f3912db12920e8374a13947a51ee 100644 (file)
@@ -7,182 +7,182 @@ load-dictionary dhcpv6
 #
 #  Simple octets type
 #
-encode-pair DHCPv6-Client-ID = 0x010203040506070809
+encode-pair Client-ID = 0x010203040506070809
 data 00 01 00 09 01 02 03 04 05 06 07 08 09
 
-encode-pair DHCPv6-Client-ID = 0x010101010101010101, DHCPv6-Server-ID = 0x02020202020202020202
+encode-pair Client-ID = 0x010101010101010101, Server-ID = 0x02020202020202020202
 data 00 01 00 09 01 01 01 01 01 01 01 01 01 00 02 00 0a 02 02 02 02 02 02 02 02 02 02
 
 # Zero length octets
-encode-pair DHCPv6-Client-ID = 0x
+encode-pair Client-ID = 0x
 data 00 01 00 00
 
 #
 #  Simple string type
 #
-encode-pair DHCPv6-Subscriber-ID = "fred"
+encode-pair Subscriber-ID = "fred"
 data 00 26 00 04 66 72 65 64
 
-encode-pair DHCPv6-Subscriber-ID = "bob", DHCPv6-New-Posix-Timezone = "GB"
+encode-pair Subscriber-ID = "bob", New-Posix-Timezone = "GB"
 data 00 26 00 03 62 6f 62 00 29 00 02 47 42
 
 # Zero length string
-encode-pair DHCPv6-Subscriber-ID = ""
+encode-pair Subscriber-ID = ""
 data 00 26 00 00
 
 #
 #  Bool
 #
-encode-pair DHCPv6-Rapid-Commit = yes
+encode-pair Rapid-Commit = yes
 data 00 0e 00 00
 
-encode-pair DHCPv6-Rapid-Commit = no
+encode-pair Rapid-Commit = no
 data
 
 #
 #  1 byte unsigned integer (uint8)
 #
-encode-pair DHCPv6-Preference = 255
+encode-pair Preference = 255
 data 00 07 00 01 ff
 
-encode-pair DHCPv6-Preference = 0
+encode-pair Preference = 0
 data 00 07 00 01 00
 
 #
 #  2 byte unsigned integer (uint16)
 #
-encode-pair DHCPv6-ANI-Access-Technology-Type = 3GPP2-NB-IOT
+encode-pair ANI-Access-Technology-Type = 3GPP2-NB-IOT
 data 00 69 00 02 00 0d
 
 #
 #  4 byte unsigned integer (uint32)
 #
-encode-pair DHCPv6-Information-Refresh-Time = 99
+encode-pair Information-Refresh-Time = 99
 data 00 20 00 04 00 00 00 63
 
 #
 #  Date. Like a 32bit unix timestamp but starts from 1st Jan 2000 instead of 1st Jan 1970
 #
-encode-pair DHCPv6-Failover-Expiration-Time = 0
+encode-pair Failover-Expiration-Time = 0
 data 00 78 00 04 00 00 00 00
 
 # Still less than 946080000 (30 years), so still 0 (we can't represent dates earlier than 1st Jan 2000)
-encode-pair DHCPv6-Failover-Expiration-Time = 500
+encode-pair Failover-Expiration-Time = 500
 data 00 78 00 04 00 00 00 00
 
-encode-pair DHCPv6-Failover-Expiration-Time = 946080000
+encode-pair Failover-Expiration-Time = 946080000
 data 00 78 00 04 00 00 00 00
 
 # 1st second of 1st Jan 2000
-encode-pair DHCPv6-Failover-Expiration-Time = 946080001
+encode-pair Failover-Expiration-Time = 946080001
 data 00 78 00 04 00 00 00 01
 
 #
 #  Encode ipv6address
 #
-encode-pair DHCPv6-Unicast = 2001:0db8:85a3:0000:0000:8a2e:0370:7334
+encode-pair Unicast = 2001:0db8:85a3:0000:0000:8a2e:0370:7334
 data 00 0c 00 10 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 34
 
 # Scope should be ignored.  We use %0 as numbered scopes work everywhere, interfaces don't
-encode-pair DHCPv6-Unicast = 2001:0db8:85a3:0000:0000:8a2e:0370:7334%0
+encode-pair Unicast = 2001:0db8:85a3:0000:0000:8a2e:0370:7334%0
 data 00 0c 00 10 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 34
 
 #
 #  Encode ipv6prefix
 #
-encode-pair DHCPv6-MIP6-Home-Net-Prefix = 2001:db8::/32
+encode-pair MIP6-Home-Net-Prefix = 2001:db8::/32
 data 00 47 00 05 20 20 01 0d b8
 
 # Prefix truncates address portion
-encode-pair DHCPv6-MIP6-Home-Net-Prefix = 2001:db8:00ff::/32
+encode-pair MIP6-Home-Net-Prefix = 2001:db8:00ff::/32
 data 00 47 00 05 20 20 01 0d b8
 
 # Prefix longer than address portion
-encode-pair DHCPv6-MIP6-Home-Net-Prefix = 2001:db8:00ff::/64
+encode-pair MIP6-Home-Net-Prefix = 2001:db8:00ff::/64
 data 00 47 00 09 40 20 01 0d b8 00 ff 00 00
 
-encode-pair DHCPv6-MIP6-Home-Net-Prefix = 2001:0db8:85a3:0000:0000:8a2e:0370:7334/128
+encode-pair MIP6-Home-Net-Prefix = 2001:0db8:85a3:0000:0000:8a2e:0370:7334/128
 data 00 47 00 11 80 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 34
 
 # Cast ipv6addr to 128bit prefix
-encode-pair DHCPv6-MIP6-Home-Net-Prefix = 2001:0db8:85a3:0000:0000:8a2e:0370:7334
+encode-pair MIP6-Home-Net-Prefix = 2001:0db8:85a3:0000:0000:8a2e:0370:7334
 data 00 47 00 11 80 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 34
 
 # 0 bit prefix
-encode-pair DHCPv6-MIP6-Home-Net-Prefix = ::/0
+encode-pair MIP6-Home-Net-Prefix = ::/0
 data 00 47 00 01 00
 
 # v4 address - Check the correct 4in6 prefix is added
-encode-pair DHCPv6-MIP6-Home-Net-Prefix = ::ffff:192.168.0.1
+encode-pair MIP6-Home-Net-Prefix = ::ffff:192.168.0.1
 data 00 47 00 11 80 00 00 00 00 00 00 00 00 00 00 ff ff c0 a8 00 01
 
 #
 #  Array of 16bit integers
 #
-encode-pair DHCPv6-Client-Arch-Type = x86-BIOS, DHCPv6-Client-Arch-Type = ARM-64-Uboot
+encode-pair Client-Arch-Type = x86-BIOS, Client-Arch-Type = ARM-64-Uboot
 data 00 3d 00 04 00 00 00 16
 
 #
 #  Two different arrays of 16bit integers
 #
-encode-pair DHCPv6-Client-Arch-Type = x86-BIOS, DHCPv6-Client-Arch-Type = ARM-64-Uboot, DHCPv6-S46-Priority = DS-Lite, DHCPv6-S46-Priority = MAP-E
+encode-pair Client-Arch-Type = x86-BIOS, Client-Arch-Type = ARM-64-Uboot, S46-Priority = DS-Lite, S46-Priority = MAP-E
 data 00 3d 00 04 00 00 00 16 00 6f 00 04 00 40 00 5e
 
 #
 #  Array type with one element
 #
-encode-pair DHCPv6-Client-Arch-Type = x86-BIOS
+encode-pair Client-Arch-Type = x86-BIOS
 data 00 3d 00 02 00 00
 
 #
 #  Array of IPv6 addresses
 #
-encode-pair DHCPv6-SIP-Server-Address = 2001:0db8:85a3:0000:0000:8a2e:0370:7334, DHCPv6-SIP-Server-Address = 2001:0db8:85a3:0000:0000:8a2e:0370:7335
+encode-pair SIP-Server-Address = 2001:0db8:85a3:0000:0000:8a2e:0370:7334, SIP-Server-Address = 2001:0db8:85a3:0000:0000:8a2e:0370:7335
 data 00 16 00 20 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 34 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 35
 
 #
 #  Array of strings, each substring should have a 16bit length field containing its length
 #
-encode-pair DHCPv6-Bootfile-Param = "I LIKE CHICKEN",  DHCPv6-Bootfile-Param = "I LIKE LIVER"
+encode-pair Bootfile-Param = "I LIKE CHICKEN",  Bootfile-Param = "I LIKE LIVER"
 data 00 3c 00 1e 00 0e 49 20 4c 49 4b 45 20 43 48 49 43 4b 45 4e 00 0c 49 20 4c 49 4b 45 20 4c 49 56 45 52
 
 # Still needs to add the length field with only one element
-encode-pair DHCPv6-Bootfile-Param = "MEOW MIX MEOW MIX"
+encode-pair Bootfile-Param = "MEOW MIX MEOW MIX"
 data 00 3c 00 13 00 11 4d 45 4f 57 20 4d 49 58 20 4d 45 4f 57 20 4d 49 58
 
-encode-pair DHCPv6-Bootfile-Param = ""
+encode-pair Bootfile-Param = ""
 data 00 3c 00 02 00 00
 
-encode-pair DHCPv6-Bootfile-Param = "",  DHCPv6-Bootfile-Param = "foo"
+encode-pair Bootfile-Param = "",  Bootfile-Param = "foo"
 data 00 3c 00 07 00 00 00 03 66 6f 6f
 
 #
 #  Variable length octets array
 #
-encode-pair DHCPv6-User-Class = 0x010203, DHCPv6-User-Class = 0x02040810
+encode-pair User-Class = 0x010203, User-Class = 0x02040810
 data 00 0f 00 0b 00 03 01 02 03 00 04 02 04 08 10
 
-encode-pair DHCPv6-User-Class = 0x010203
+encode-pair User-Class = 0x010203
 data 00 0f 00 05 00 03 01 02 03
 
-encode-pair DHCPv6-User-Class = 0x, DHCPv6-User-Class = 0x
+encode-pair User-Class = 0x, User-Class = 0x
 data 00 0f 00 04 00 00 00 00
 
 #
 #  TLV with array type values
 #
-encode-pair DHCPv6-MOS-Address-IS = 2001:0db8:85a3:0000:0000:8a2e:0370:7334
+encode-pair MOS-Address-IS = 2001:0db8:85a3:0000:0000:8a2e:0370:7334
 data 00 36 00 14 00 01 00 10 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 34
 
-encode-pair DHCPv6-MOS-Address-IS = 2001:0db8:85a3:0000:0000:8a2e:0370:7334, DHCPv6-MOS-Address-IS = 2001:0db8:85a3:0000:0000:8a2e:0370:7335
+encode-pair MOS-Address-IS = 2001:0db8:85a3:0000:0000:8a2e:0370:7334, MOS-Address-IS = 2001:0db8:85a3:0000:0000:8a2e:0370:7335
 data 00 36 00 24 00 01 00 20 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 34 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 35
 
-encode-pair DHCPv6-MOS-Address-IS = 2001:0db8:85a3:0000:0000:8a2e:0370:7334, DHCPv6-MOS-Address-ES = 2001:0db8:85a3:0000:0000:8a2e:0370:7335
+encode-pair MOS-Address-IS = 2001:0db8:85a3:0000:0000:8a2e:0370:7334, MOS-Address-ES = 2001:0db8:85a3:0000:0000:8a2e:0370:7335
 data 00 36 00 28 00 01 00 10 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 34 00 03 00 10 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 35
 
 #
 #  TLV with single values
 #
-encode-pair DHCPv6-NTP-Server-Address = 2001:0db8:85a3:0000:0000:8a2e:0370:7334
+encode-pair NTP-Server-Address = 2001:0db8:85a3:0000:0000:8a2e:0370:7334
 data 00 38 00 14 00 01 00 10 20 01 0d b8 85 a3 00 00 00 00 8a 2e 03 70 73 34