Replace dictionary.rfc3825 with dictionary.rfc6225

RFC6225 obsoletes RFC3825

diff --git a/share/dictionary/dhcpv4/dictionary b/share/dictionary/dhcpv4/dictionary
index 2bc46be0eab9327a8bf3250628ffeadb3948341a..0e3670670f722af22591173ec6c18eab75529106 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary
+++ b/share/dictionary/dhcpv4/dictionary
@@ -37,7 +37,6 @@ $INCLUDE dictionary.rfc3397
 $INCLUDE dictionary.rfc3442
 $INCLUDE dictionary.rfc3495
 $INCLUDE dictionary.rfc3679
-$INCLUDE dictionary.rfc3825
 $INCLUDE dictionary.rfc3925
 $INCLUDE dictionary.rfc4039
 $INCLUDE dictionary.rfc4280
@@ -57,6 +56,7 @@ $INCLUDE dictionary.rfc5969
 $INCLUDE dictionary.rfc5986
 $INCLUDE dictionary.rfc6011
 $INCLUDE dictionary.rfc6153
+$INCLUDE dictionary.rfc6225
 $INCLUDE dictionary.rfc6656
 $INCLUDE dictionary.rfc6731
 $INCLUDE dictionary.rfc6926

diff --git a/share/dictionary/dhcpv4/dictionary.rfc3825 b/share/dictionary/dhcpv4/dictionary.rfc3825
deleted file mode 100644 (file)
index 4342115..0000000
--- a/share/dictionary/dhcpv4/dictionary.rfc3825
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- 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$
-##############################################################################
-#
-#  RFC3825 - Dynamic Host Configuration Protocol Option for Coordinate-based
-#            Location Configuration Information
-#  $Id$
-#
-##############################################################################
-
-# 16 GeoConf Option
-ATTRIBUTE       GeoConf-Option                          123     struct
-MEMBER          LaRes                           bit[6]
-MEMBER          Latitude                        bit[34] # 9 bits before, 25 after radix point
-MEMBER          LoRes                           bit[6]
-MEMBER          Longitude                       bit[34] # 9 bits before, 25 after radix point
-MEMBER          AT                              bit[4]
-VALUE           AT                      Meters  1
-VALUE           AT                      Floors  2
-MEMBER          AltRes                          bit[6]
-MEMBER          Altitude                        bit[30] # 22 bits before, 8 after radix point
-MEMBER          Datum                           uint8
-VALUE          Datum                   WGS84   1
-VALUE          Datum                   NAVD88  2
-VALUE          Datum                   MLLW    3

diff --git a/share/dictionary/dhcpv4/dictionary.rfc6225 b/share/dictionary/dhcpv4/dictionary.rfc6225
new file mode 100644 (file)
index 0000000..40d0551
--- /dev/null
+++ b/share/dictionary/dhcpv4/dictionary.rfc6225
@@ -0,0 +1,47 @@
+# -*- 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$
+##############################################################################
+#
+#  RFC6225 - Dynamic Host Configuration Protocol Option for Coordinate-based
+#            Location Configuration Information
+#  $Id$
+#
+##############################################################################
+
+# 16 GeoConf Option
+ATTRIBUTE      GeoConf-Option                          123     struct
+MEMBER         LaRes                           bit[6]
+MEMBER         Latitude                        bit[34] # 9 bits before, 25 after radix point
+MEMBER         LoRes                           bit[6]
+MEMBER         Longitude                       bit[34] # 9 bits before, 25 after radix point
+MEMBER         AType                           bit[4]
+VALUE          AType                   Meters  1
+VALUE          AType                   Floors  2
+MEMBER         AltRes                          bit[6]
+MEMBER         Altitude                        bit[30] # 22 bits before, 8 after radix point
+MEMBER         Res                             bit[5]
+MEMBER         Datum                           bit[3]
+VALUE          Datum                   WGS84   1
+VALUE          Datum                   NAVD88  2
+VALUE          Datum                   MLLW    3
+
+# 16 GeoLoc Option
+ATTRIBUTE      GeoLoc                                  144     struct
+MEMBER         LatUnc                          bit[6]
+MEMBER         Latitude                        bit[34] # 9 bits before, 25 after radix point
+MEMBER         LongUnc                         bit[6]
+MEMBER         Longitude                       bit[34] # 9 bits before, 25 after radix point
+MEMBER         AType                           bit[4]
+VALUE          AType                   Meters  1
+VALUE          AType                   Floors  2
+MEMBER         AltUnc                          bit[6]
+MEMBER         Altitude                        bit[30] # 22 bits before, 8 after radix point
+MEMBER         Ver                             bit[2]  # always 1
+MEMBER         Res                             bit[3]
+MEMBER         Datum                           bit[3]
+VALUE          Datum                   WGS84   1
+VALUE          Datum                   NAVD88  2
+VALUE          Datum                   MLLW    3
+

diff --git a/src/tests/unit/protocols/dhcpv4/rfc3825.txt b/src/tests/unit/protocols/dhcpv4/rfc6225.txt
similarity index 59%
rename from src/tests/unit/protocols/dhcpv4/rfc3825.txt
rename to src/tests/unit/protocols/dhcpv4/rfc6225.txt
index e3a4fe6cd5e41662374dfcc4fdedfbce73314a28..f3547dc8a0dcdf92aeea03160a8dbe64a1a38701 100644 (file)
--- a/src/tests/unit/protocols/dhcpv4/rfc3825.txt
+++ b/src/tests/unit/protocols/dhcpv4/rfc6225.txt
@@ -5,11 +5,11 @@ proto dhcpv4
 proto-dictionary dhcpv4
 fuzzer-out dhcpv4
 
-encode-pair GeoConf-Option = { LaRes = 20, Latitude = 1395556352, LoRes = 20, Longitude = 3140812800, AT = Meters, AltRes = 20, Altitude = 384, Datum = NAVD88 }
+encode-pair GeoConf-Option = { LaRes = 20, Latitude = 1395556352, LoRes = 20, Longitude = 3140812800, AType = Meters, AltRes = 20, Altitude = 384, Res = 0, Datum = NAVD88 }
 match 7b 10 50 53 2e 80 00 50 bb 35 00 00 15 00 00 01 80 02
 
 decode-pair -
-match GeoConf-Option = { LaRes = 20, Latitude = 1395556352, LoRes = 20, Longitude = 3140812800, AT = ::Meters, AltRes = 20, Altitude = 384, Datum = ::NAVD88 }
+match GeoConf-Option = { LaRes = 20, Latitude = 1395556352, LoRes = 20, Longitude = 3140812800, AType = ::Meters, AltRes = 20, Altitude = 384, Res = 0, Datum = ::NAVD88 }
 
 count
 match 7