Take more advantage of dns_label (#4437)

diff --git a/share/dictionary/dhcpv4/dictionary.rfc5678 b/share/dictionary/dhcpv4/dictionary.rfc5678
index 8f7e85a951baed00f2fe3783c377c6997e360681..86b6d01b3dac5a27f9e629e50415cc4273794160 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary.rfc5678
+++ b/share/dictionary/dhcpv4/dictionary.rfc5678
@@ -17,6 +17,6 @@ ATTRIBUTE     MoS-IPv4-Address-CS                     .2      ipaddr array
 ATTRIBUTE      MoS-IPv4-Address-ES                     .3      ipaddr array
 
 ATTRIBUTE      MoS-IPv4-FQDN                           140     tlv
-ATTRIBUTE      MoS-IPv4-FQDN-IS                        .1      octets # really dns_label array
-ATTRIBUTE      MoS-IPv4-FQDN-CS                        .2      octets # really dns_label array
-ATTRIBUTE      MoS-IPv4-FQDN-ES                        .3      octets # really dns_label array
+ATTRIBUTE      MoS-IPv4-FQDN-IS                        .1      string dns_label,array
+ATTRIBUTE      MoS-IPv4-FQDN-CS                        .2      string dns_label,array
+ATTRIBUTE      MoS-IPv4-FQDN-ES                        .3      string dns_label,array

diff --git a/share/dictionary/dhcpv4/dictionary.rfc5986 b/share/dictionary/dhcpv4/dictionary.rfc5986
index 9f5fc135728c661a54ed07d6126af1d1f2ee3274..b49265cb6191b6ad2c10aef84a119e2b545d0453 100644 (file)
--- a/share/dictionary/dhcpv4/dictionary.rfc5986
+++ b/share/dictionary/dhcpv4/dictionary.rfc5986
@@ -10,4 +10,4 @@
 #
 ##############################################################################
 
-ATTRIBUTE      Access-Network-Domain-Name              213     string # really one dns_label
+ATTRIBUTE      Access-Network-Domain-Name              213     string dns_label

diff --git a/src/tests/unit/protocols/dhcpv4/rfc5678.txt b/src/tests/unit/protocols/dhcpv4/rfc5678.txt
new file mode 100644 (file)
index 0000000..4d617d8
--- /dev/null
+++ b/src/tests/unit/protocols/dhcpv4/rfc5678.txt
@@ -0,0 +1,16 @@
+#
+#  Test vectors for DHCP attributes
+#
+proto dhcpv4
+proto-dictionary dhcpv4
+fuzzer-out dhcpv4
+
+
+encode-pair MoS-IPv4-FQDN = { MoS-IPv4-FQDN-IS = "mydomain1.com", MoS-IPv4-FQDN-IS = "mydomain2.lan", MoS-IPv4-FQDN-IS =  "corp.mydomain3.co", }
+match 8c 33 01 31 09 6d 79 64 6f 6d 61 69 6e 31 03 63 6f 6d 00 09 6d 79 64 6f 6d 61 69 6e 32 03 6c 61 6e 00 04 63 6f 72 70 09 6d 79 64 6f 6d 61 69 6e 33 02 63 6f 00
+
+decode-pair -
+match MoS-IPv4-FQDN.MoS-IPv4-FQDN-IS = "mydomain1.com", MoS-IPv4-FQDN.MoS-IPv4-FQDN-IS = "mydomain2.lan", MoS-IPv4-FQDN.MoS-IPv4-FQDN-IS = "corp.mydomain3.co"
+
+count
+match 7