Add VALUEs for Datum in Geoconf-Option and change test to match (#4454)

diff --git a/share/dictionary/dhcpv4/dictionary.rfc3825 b/share/dictionary/dhcpv4/dictionary.rfc3825
index a2dc64c4180d7c172af2848c23f912a3d4f3ed42..434211505393c3afc022fcb81a5d18d0416ee7b7 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary.rfc3825
+++ b/share/dictionary/dhcpv4/dictionary.rfc3825
@@ -22,3 +22,6 @@ 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/src/tests/unit/protocols/dhcpv4/rfc3825.txt b/src/tests/unit/protocols/dhcpv4/rfc3825.txt
index e193112080c42ed8f7d9b7ff56f95b64d9aa09bf..6d5f8f656293ada4717bb2ff60017185f31e6531 100644 (file)
--- a/src/tests/unit/protocols/dhcpv4/rfc3825.txt
+++ b/src/tests/unit/protocols/dhcpv4/rfc3825.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 = 2 }
+encode-pair GeoConf-Option = { LaRes = 20, Latitude = 1395556352, LoRes = 20, Longitude = 3140812800, AT = Meters, AltRes = 20, Altitude = 384, 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 = 2 }
+match GeoConf-Option = { LaRes = 20, Latitude = 1395556352, LoRes = 20, Longitude = 3140812800, AT = Meters, AltRes = 20, Altitude = 384, Datum = NAVD88 }
 
 count
 match 7