call dhcpv6 encode_value from the struct encoder

which then changes all of the dates in the tests, as DHCPv6
starts dates from Jan 1 2000, instead of Jan 1 1970.

diff --git a/src/lib/util/struct.c b/src/lib/util/struct.c
index 8dfcb2a696107a77912be102492a30493f572cd4..6021a0b2e3857587bb7b7cf40ecd35d2c9a7de39 100644 (file)
--- a/src/lib/util/struct.c
+++ b/src/lib/util/struct.c
@@ -532,10 +532,10 @@ ssize_t fr_struct_to_network(uint8_t *out, size_t outlen,
                        } while (vp != NULL);
                        goto next;
 
-               } else if (encode_value && !child->flags.extra && child->flags.subtype) {
+               } else if (encode_value) {
                        ssize_t slen;
 
-                       tlv_stack[depth + 1] = child;
+                       fr_proto_tlv_stack_build(tlv_stack, child);
                        slen = encode_value(p, outlen, tlv_stack, depth + 1, cursor, encoder_ctx);
                        if (slen < 0) return slen;
                        len = slen;
@@ -605,8 +605,8 @@ ssize_t fr_struct_to_network(uint8_t *out, size_t outlen,
                 */
                if ((vp->da->parent->parent == key_da) &&
                    (vp->da->parent->type == FR_TYPE_STRUCT)) {
-                       tlv_stack[depth + 1] = vp->da->parent; /* hackity hack */
-                       len = fr_struct_to_network(p, outlen, tlv_stack, depth + 1,
+                       fr_proto_tlv_stack_build(tlv_stack, vp->da->parent);
+                       len = fr_struct_to_network(p, outlen, tlv_stack, depth + 2, /* note + 2 !!! */
                                                   cursor, encoder_ctx, encode_value);
                        if (len < 0) return len;
                        return (p - out) + len;

diff --git a/src/tests/unit/protocols/dhcpv6/packet_AFTR-Name-rfc6334.txt b/src/tests/unit/protocols/dhcpv6/packet_AFTR-Name-rfc6334.txt
index 6b580da3783da5dcefcff1d6b4fa3d1de7ddb92c..7ee603b806babcd96a44b5bdf7c8e31623436bd5 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_AFTR-Name-rfc6334.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_AFTR-Name-rfc6334.txt
@@ -41,11 +41,11 @@ match Packet-Type = Solicit, Transaction-ID = 0xd81eb8, Client-ID-DUID = Client-
 #    DNS recursive name server
 #    Dual-Stack Lite AFTR Name
 #
-encode-proto Packet-Type = Advertise, Transaction-ID = 0xd81eb8, IA-PD-IAID = 33752069, IA-PD-T1 = 150, IA-PD-T2 = 250, IA-PD-Options = 0x001a0019000000fa0000012c382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 22 1982 08:36:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Preference = 10, DNS-Servers = 2a01::1, AFTR-Name = "aftr-name.mydomain.net"
-match 02 d8 1e b8 00 19 00 29 02 03 04 05 00 00 00 96 00 00 00 fa 00 1a 00 19 00 00 00 fa 00 00 01 2c 38 2a 00 00 01 00 01 01 00 00 00 00 00 00 00 00 00 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 18 3f 4e f0 00 11 22 33 44 55 00 07 00 01 0a 00 17 00 10 2a 01 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 40 00 18 09 61 66 74 72 2d 6e 61 6d 65 08 6d 79 64 6f 6d 61 69 6e 03 6e 65 74 00
+encode-proto Packet-Type = Advertise, Transaction-ID = 0xd81eb8, IA-PD-IAID = 33752069, IA-PD-T1 = 150, IA-PD-T2 = 250, IA-PD-Options = 0x001a0019000000fa0000012c382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:01:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Preference = 10, DNS-Servers = 2a01::1, AFTR-Name = "aftr-name.mydomain.net"
+match 02 d8 1e b8 00 19 00 29 02 03 04 05 00 00 00 96 00 00 00 fa 00 1a 00 19 00 00 00 fa 00 00 01 2c 38 2a 00 00 01 00 01 01 00 00 00 00 00 00 00 00 00 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 00 00 00 3e 00 11 22 33 44 55 00 07 00 01 0a 00 17 00 10 2a 01 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 40 00 18 09 61 66 74 72 2d 6e 61 6d 65 08 6d 79 64 6f 6d 61 69 6e 03 6e 65 74 00
 
 decode-proto -
-match Packet-Type = Advertise, Transaction-ID = 0xd81eb8, IA-PD-IAID = 33752069, IA-PD-T1 = 150, IA-PD-T2 = 250, IA-PD-Options = 0x001a0019000000fa0000012c382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 22 1982 08:36:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Preference = 10, DNS-Servers = 2a01::1, AFTR-Name = "aftr-name.mydomain.net"
+match Packet-Type = Advertise, Transaction-ID = 0xd81eb8, IA-PD-IAID = 33752069, IA-PD-T1 = 150, IA-PD-T2 = 250, IA-PD-Options = 0x001a0019000000fa0000012c382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:01:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Preference = 10, DNS-Servers = 2a01::1, AFTR-Name = "aftr-name.mydomain.net"
 
 #
 #  3. Request (Client -> Broadcast)
@@ -59,11 +59,11 @@ match Packet-Type = Advertise, Transaction-ID = 0xd81eb8, IA-PD-IAID = 33752069,
 #    Elapsed time
 #    Identity Association for Prefix Delegation
 #
-encode-proto Packet-Type = Request, Transaction-ID = 0x1e291d, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 22 1982 08:36:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = AFTR-Name, Elapsed-Time = 0, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a001900001c2000001d4c382a000001000101000000000000000000
-match 03 1e 29 1d 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 18 3f 4e f0 00 11 22 33 44 55 00 06 00 04 00 17 00 40 00 08 00 02 00 00 00 19 00 29 02 03 04 05 00 00 0e 10 00 00 15 18 00 1a 00 19 00 00 1c 20 00 00 1d 4c 38 2a 00 00 01 00 01 01 00 00 00 00 00 00 00 00 00
+encode-proto Packet-Type = Request, Transaction-ID = 0x1e291d, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = AFTR-Name, Elapsed-Time = 0, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a001900001c2000001d4c382a000001000101000000000000000000
+match 03 1e 29 1d 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 00 00 00 02 00 11 22 33 44 55 00 06 00 04 00 17 00 40 00 08 00 02 00 00 00 19 00 29 02 03 04 05 00 00 0e 10 00 00 15 18 00 1a 00 19 00 00 1c 20 00 00 1d 4c 38 2a 00 00 01 00 01 01 00 00 00 00 00 00 00 00 00
 
 decode-proto -
-match Packet-Type = Request, Transaction-ID = 0x1e291d, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 22 1982 08:36:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = AFTR-Name, Elapsed-Time = 0, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a001900001c2000001d4c382a000001000101000000000000000000
+match Packet-Type = Request, Transaction-ID = 0x1e291d, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = AFTR-Name, Elapsed-Time = 0, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a001900001c2000001d4c382a000001000101000000000000000000
 
 #
 #  4. Solicit (Server -> Client)
@@ -78,11 +78,11 @@ match Packet-Type = Request, Transaction-ID = 0x1e291d, Client-ID-DUID = Client-
 #    DNS recursive name server
 #    Dual-Stack Lite AFTR Name
 #
-encode-proto Packet-Type = Reply, Transaction-ID = 0x1e291d, IA-PD-IAID = 33752069, IA-PD-T1 = 150, IA-PD-T2 = 250, IA-PD-Options = 0x001a0019000000fa0000012c382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 22 1982 08:36:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Preference = 10, DNS-Servers = 2a01::1, AFTR-Name = "aftr-name.mydomain.net"
-match 07 1e 29 1d 00 19 00 29 02 03 04 05 00 00 00 96 00 00 00 fa 00 1a 00 19 00 00 00 fa 00 00 01 2c 38 2a 00 00 01 00 01 01 00 00 00 00 00 00 00 00 00 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 18 3f 4e f0 00 11 22 33 44 55 00 07 00 01 0a 00 17 00 10 2a 01 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 40 00 18 09 61 66 74 72 2d 6e 61 6d 65 08 6d 79 64 6f 6d 61 69 6e 03 6e 65 74 00
+encode-proto Packet-Type = Reply, Transaction-ID = 0x1e291d, IA-PD-IAID = 33752069, IA-PD-T1 = 150, IA-PD-T2 = 250, IA-PD-Options = 0x001a0019000000fa0000012c382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Preference = 10, DNS-Servers = 2a01::1, AFTR-Name = "aftr-name.mydomain.net"
+match 07 1e 29 1d 00 19 00 29 02 03 04 05 00 00 00 96 00 00 00 fa 00 1a 00 19 00 00 00 fa 00 00 01 2c 38 2a 00 00 01 00 01 01 00 00 00 00 00 00 00 00 00 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 00 00 00 02 00 11 22 33 44 55 00 07 00 01 0a 00 17 00 10 2a 01 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 40 00 18 09 61 66 74 72 2d 6e 61 6d 65 08 6d 79 64 6f 6d 61 69 6e 03 6e 65 74 00
 
 decode-proto -
-match Packet-Type = Reply, Transaction-ID = 0x1e291d, IA-PD-IAID = 33752069, IA-PD-T1 = 150, IA-PD-T2 = 250, IA-PD-Options = 0x001a0019000000fa0000012c382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 22 1982 08:36:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Preference = 10, DNS-Servers = 2a01::1, AFTR-Name = "aftr-name.mydomain.net"
+match Packet-Type = Reply, Transaction-ID = 0x1e291d, IA-PD-IAID = 33752069, IA-PD-T1 = 150, IA-PD-T2 = 250, IA-PD-Options = 0x001a0019000000fa0000012c382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Preference = 10, DNS-Servers = 2a01::1, AFTR-Name = "aftr-name.mydomain.net"
 
 count
 match 18

diff --git a/src/tests/unit/protocols/dhcpv6/packet_domain-list.txt b/src/tests/unit/protocols/dhcpv6/packet_domain-list.txt
index 7938b1fa09e4291c938041ecd8eec55315905d07..ed4dc3d3dd17605f53c971c390d6cebfa1db5f74 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_domain-list.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_domain-list.txt
@@ -21,11 +21,11 @@ proto-dictionary dhcpv6
 #    Server Identifier
 #    Domain Search List
 #
-encode-proto Packet-Type = Reply, Transaction-ID = 0xaa56ce, Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Apr  5 1983 09:58:23 UTC", Client-ID-DUID-LLT-Ethernet-Address = 00:0c:29:38:f3:68, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Apr  5 1983 01:34:19 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x000c299ba153, Domain-List = "example.com", Domain-List = "sales.example.com", Domain-List = "eng.example.com"
-match 07 aa 56 ce 00 01 00 0e 00 01 00 01 18 f0 0b 3f 00 0c 29 38 f3 68 00 02 00 0e 00 01 00 01 18 ef 95 1b 00 0c 29 9b a1 53 00 18 00 31 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00 05 73 61 6c 65 73 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00 03 65 6e 67 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00
+encode-proto Packet-Type = Reply, Transaction-ID = 0xaa56ce, Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Client-ID-DUID-LLT-Ethernet-Address = 00:0c:29:38:f3:68, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:03 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x000c299ba153, Domain-List = "example.com", Domain-List = "sales.example.com", Domain-List = "eng.example.com"
+match 07 aa 56 ce 00 01 00 0e 00 01 00 01 00 00 00 02 00 0c 29 38 f3 68 00 02 00 0e 00 01 00 01 00 00 00 03 00 0c 29 9b a1 53 00 18 00 31 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00 05 73 61 6c 65 73 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00 03 65 6e 67 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00
 
 decode-proto -
-match Packet-Type = Reply, Transaction-ID = 0xaa56ce, Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Apr  5 1983 09:58:23 UTC", Client-ID-DUID-LLT-Ethernet-Address = 00:0c:29:38:f3:68, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Apr  5 1983 01:34:19 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x000c299ba153, Domain-List = "example.com", Domain-List = "sales.example.com", Domain-List = "eng.example.com"
+match Packet-Type = Reply, Transaction-ID = 0xaa56ce, Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Client-ID-DUID-LLT-Ethernet-Address = 00:0c:29:38:f3:68, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:03 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x000c299ba153, Domain-List = "example.com", Domain-List = "sales.example.com", Domain-List = "eng.example.com"
 
 count
 match 6

diff --git a/src/tests/unit/protocols/dhcpv6/packet_ia-na.txt b/src/tests/unit/protocols/dhcpv6/packet_ia-na.txt
index c983d14a6ff0a92ad6d83f18a8faf5c6f07b223f..3482ce2e6df9c22d591aa0416302924ad6e2d729 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_ia-na.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_ia-na.txt
@@ -24,29 +24,29 @@ match Packet-Type = Solicit, Transaction-ID = 0x90b45c, Client-ID-DUID = Client-
 #
 #  2.
 #
-encode-proto Packet-Type = Advertise, Transaction-ID = 0x90b45c, IA-NA-IAID = 33752069, IA-NA-T1 = 3600, IA-NA-T2 = 5400, IA-NA-Options = 0x000500182a0000010001020038e6b22ec440acdf0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:34:36 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
-match 02 90 b4 5c 00 03 00 28 02 03 04 05 00 00 0e 10 00 00 15 18 00 05 00 18 2a 00 00 01 00 01 02 00 38 e6 b2 2e c4 40 ac df 00 00 11 94 00 00 1c 20 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 18 46 48 8c 00 11 22 33 44 55
+encode-proto Packet-Type = Advertise, Transaction-ID = 0x90b45c, IA-NA-IAID = 33752069, IA-NA-T1 = 3600, IA-NA-T2 = 5400, IA-NA-Options = 0x000500182a0000010001020038e6b22ec440acdf0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan 01 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
+match 02 90 b4 5c 00 03 00 28 02 03 04 05 00 00 0e 10 00 00 15 18 00 05 00 18 2a 00 00 01 00 01 02 00 38 e6 b2 2e c4 40 ac df 00 00 11 94 00 00 1c 20 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 00 00 00 02 00 11 22 33 44 55
 
 decode-proto -
-match Packet-Type = Advertise, Transaction-ID = 0x90b45c, IA-NA-IAID = 33752069, IA-NA-T1 = 3600, IA-NA-T2 = 5400, IA-NA-Options = 0x000500182a0000010001020038e6b22ec440acdf0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:34:36 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
+match Packet-Type = Advertise, Transaction-ID = 0x90b45c, IA-NA-IAID = 33752069, IA-NA-T1 = 3600, IA-NA-T2 = 5400, IA-NA-Options = 0x000500182a0000010001020038e6b22ec440acdf0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
 
 #
 #  3.
 #
-encode-proto Packet-Type = Request, Transaction-ID = 0x2ffdd1, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:34:36 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA-IAID = 33752069, IA-NA-T1 = 3600, IA-NA-T2 = 5400, IA-NA-Options = 0x000500182a0000010001020038e6b22ec440acdf00001c2000001d4c
-match 03 2f fd d1 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 18 46 48 8c 00 11 22 33 44 55 00 06 00 04 00 17 00 18 00 08 00 02 00 00 00 03 00 28 02 03 04 05 00 00 0e 10 00 00 15 18 00 05 00 18 2a 00 00 01 00 01 02 00 38 e6 b2 2e c4 40 ac df 00 00 1c 20 00 00 1d 4c
+encode-proto Packet-Type = Request, Transaction-ID = 0x2ffdd1, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan 01 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA-IAID = 33752069, IA-NA-T1 = 3600, IA-NA-T2 = 5400, IA-NA-Options = 0x000500182a0000010001020038e6b22ec440acdf00001c2000001d4c
+match 03 2f fd d1 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 00 00 00 02 00 11 22 33 44 55 00 06 00 04 00 17 00 18 00 08 00 02 00 00 00 03 00 28 02 03 04 05 00 00 0e 10 00 00 15 18 00 05 00 18 2a 00 00 01 00 01 02 00 38 e6 b2 2e c4 40 ac df 00 00 1c 20 00 00 1d 4c
 
 decode-proto -
-match Packet-Type = Request, Transaction-ID = 0x2ffdd1, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:34:36 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA-IAID = 33752069, IA-NA-T1 = 3600, IA-NA-T2 = 5400, IA-NA-Options = 0x000500182a0000010001020038e6b22ec440acdf00001c2000001d4c
+match Packet-Type = Request, Transaction-ID = 0x2ffdd1, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA-IAID = 33752069, IA-NA-T1 = 3600, IA-NA-T2 = 5400, IA-NA-Options = 0x000500182a0000010001020038e6b22ec440acdf00001c2000001d4c
 
 #
 #  4.
 #
-encode-proto Packet-Type = Reply, Transaction-ID = 0x2ffdd1, IA-NA-IAID = 33752069, IA-NA-T1 = 3600, IA-NA-T2 = 5400, IA-NA-Options = 0x000500182a0000010001020038e6b22ec440acdf0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:34:36 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
-match 07 2f fd d1 00 03 00 28 02 03 04 05 00 00 0e 10 00 00 15 18 00 05 00 18 2a 00 00 01 00 01 02 00 38 e6 b2 2e c4 40 ac df 00 00 11 94 00 00 1c 20 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 18 46 48 8c 00 11 22 33 44 55
+encode-proto Packet-Type = Reply, Transaction-ID = 0x2ffdd1, IA-NA-IAID = 33752069, IA-NA-T1 = 3600, IA-NA-T2 = 5400, IA-NA-Options = 0x000500182a0000010001020038e6b22ec440acdf0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan 01 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
+match 07 2f fd d1 00 03 00 28 02 03 04 05 00 00 0e 10 00 00 15 18 00 05 00 18 2a 00 00 01 00 01 02 00 38 e6 b2 2e c4 40 ac df 00 00 11 94 00 00 1c 20 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 00 00 00 02 00 11 22 33 44 55
 
 decode-proto -
-match Packet-Type = Reply, Transaction-ID = 0x2ffdd1, IA-NA-IAID = 33752069, IA-NA-T1 = 3600, IA-NA-T2 = 5400, IA-NA-Options = 0x000500182a0000010001020038e6b22ec440acdf0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:34:36 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
+match Packet-Type = Reply, Transaction-ID = 0x2ffdd1, IA-NA-IAID = 33752069, IA-NA-T1 = 3600, IA-NA-T2 = 5400, IA-NA-Options = 0x000500182a0000010001020038e6b22ec440acdf0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
 
 count
 match 18

diff --git a/src/tests/unit/protocols/dhcpv6/packet_ia-pd.txt b/src/tests/unit/protocols/dhcpv6/packet_ia-pd.txt
index 0d4a06a626edae7f43c6240060b5323e42e776f4..8e465c24defe12bd87326b6f1dbc7ed2a10f3a0e 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_ia-pd.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_ia-pd.txt
@@ -24,29 +24,29 @@ match Packet-Type = Solicit, Transaction-ID = 0xe1e093, Client-ID-DUID = Client-
 #
 #  2.
 #
-encode-proto Packet-Type = Advertise, Transaction-ID = 0xe1e093, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a00190000119400001c20382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:39:05 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
-match 02 e1 e0 93 00 19 00 29 02 03 04 05 00 00 0e 10 00 00 15 18 00 1a 00 19 00 00 11 94 00 00 1c 20 38 2a 00 00 01 00 01 01 00 00 00 00 00 00 00 00 00 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 18 46 49 99 00 11 22 33 44 55
+encode-proto Packet-Type = Advertise, Transaction-ID = 0xe1e093, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a00190000119400001c20382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan 01 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
+match 02 e1 e0 93 00 19 00 29 02 03 04 05 00 00 0e 10 00 00 15 18 00 1a 00 19 00 00 11 94 00 00 1c 20 38 2a 00 00 01 00 01 01 00 00 00 00 00 00 00 00 00 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 00 00 00 02 00 11 22 33 44 55
 
 decode-proto -
-match Packet-Type = Advertise, Transaction-ID = 0xe1e093, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a00190000119400001c20382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:39:05 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
+match Packet-Type = Advertise, Transaction-ID = 0xe1e093, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a00190000119400001c20382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
 
 #
 #  3.
 #
-encode-proto Packet-Type = Request, Transaction-ID = 0x12b08a, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:39:05 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a001900001c2000001d4c382a000001000101000000000000000000
-match 03 12 b0 8a 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 18 46 49 99 00 11 22 33 44 55 00 06 00 04 00 17 00 18 00 08 00 02 00 00 00 19 00 29 02 03 04 05 00 00 0e 10 00 00 15 18 00 1a 00 19 00 00 1c 20 00 00 1d 4c 38 2a 00 00 01 00 01 01 00 00 00 00 00 00 00 00 00
+encode-proto Packet-Type = Request, Transaction-ID = 0x12b08a, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a001900001c2000001d4c382a000001000101000000000000000000
+match 03 12 b0 8a 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 00 00 00 02 00 11 22 33 44 55 00 06 00 04 00 17 00 18 00 08 00 02 00 00 00 19 00 29 02 03 04 05 00 00 0e 10 00 00 15 18 00 1a 00 19 00 00 1c 20 00 00 1d 4c 38 2a 00 00 01 00 01 01 00 00 00 00 00 00 00 00 00
 
 decode-proto -
-match Packet-Type = Request, Transaction-ID = 0x12b08a, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:39:05 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a001900001c2000001d4c382a000001000101000000000000000000
+match Packet-Type = Request, Transaction-ID = 0x12b08a, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a001900001c2000001d4c382a000001000101000000000000000000
 
 #
 #  4.
 #
-encode-proto Packet-Type = Reply, Transaction-ID = 0x12b08a, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a00190000119400001c20382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:39:05 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
-match 07 12 b0 8a 00 19 00 29 02 03 04 05 00 00 0e 10 00 00 15 18 00 1a 00 19 00 00 11 94 00 00 1c 20 38 2a 00 00 01 00 01 01 00 00 00 00 00 00 00 00 00 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 18 46 49 99 00 11 22 33 44 55
+encode-proto Packet-Type = Reply, Transaction-ID = 0x12b08a, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a00190000119400001c20382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
+match 07 12 b0 8a 00 19 00 29 02 03 04 05 00 00 0e 10 00 00 15 18 00 1a 00 19 00 00 11 94 00 00 1c 20 38 2a 00 00 01 00 01 01 00 00 00 00 00 00 00 00 00 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 00 00 00 02 00 11 22 33 44 55
 
 decode-proto -
-match Packet-Type = Reply, Transaction-ID = 0x12b08a, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a00190000119400001c20382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:39:05 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
+match Packet-Type = Reply, Transaction-ID = 0x12b08a, IA-PD-IAID = 33752069, IA-PD-T1 = 3600, IA-PD-T2 = 5400, IA-PD-Options = 0x001a00190000119400001c20382a000001000101000000000000000000, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
 
 count
 match 18

diff --git a/src/tests/unit/protocols/dhcpv6/packet_ia-ta.txt b/src/tests/unit/protocols/dhcpv6/packet_ia-ta.txt
index 5470445afb0f73025e42fb57a2f8ec1af291b67b..23faa26b3c1849db2ae1f1b7e88e1c73287afc6c 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_ia-ta.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_ia-ta.txt
@@ -24,29 +24,29 @@ match Packet-Type = Solicit, Transaction-ID = 0x28b040, Client-ID-DUID = Client-
 #
 #  2.
 #
-encode-proto Packet-Type = Advertise, Transaction-ID = 0x28b040, IA-TA-IAID = 33752069, IA-TA-Options = 0x000500182a000001000102005da2f92084c488cc0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:32:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
-match 02 28 b0 40 00 04 00 20 02 03 04 05 00 05 00 18 2a 00 00 01 00 01 02 00 5d a2 f9 20 84 c4 88 cc 00 00 11 94 00 00 1c 20 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 18 46 47 f0 00 11 22 33 44 55
+encode-proto Packet-Type = Advertise, Transaction-ID = 0x28b040, IA-TA-IAID = 33752069, IA-TA-Options = 0x000500182a000001000102005da2f92084c488cc0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
+match 02 28 b0 40 00 04 00 20 02 03 04 05 00 05 00 18 2a 00 00 01 00 01 02 00 5d a2 f9 20 84 c4 88 cc 00 00 11 94 00 00 1c 20 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 00 00 00 02 00 11 22 33 44 55
 
 decode-proto -
-match Packet-Type = Advertise, Transaction-ID = 0x28b040, IA-TA-IAID = 33752069, IA-TA-Options = 0x000500182a000001000102005da2f92084c488cc0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:32:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
+match Packet-Type = Advertise, Transaction-ID = 0x28b040, IA-TA-IAID = 33752069, IA-TA-Options = 0x000500182a000001000102005da2f92084c488cc0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
 
 #
 #  3.
 #
-encode-proto Packet-Type = Request, Transaction-ID = 0x2b0e45, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:32:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-TA-IAID = 33752069, IA-TA-Options = 0x000500182a000001000102005da2f92084c488cc00001c2000001d4c
-match 03 2b 0e 45 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 18 46 47 f0 00 11 22 33 44 55 00 06 00 04 00 17 00 18 00 08 00 02 00 00 00 04 00 20 02 03 04 05 00 05 00 18 2a 00 00 01 00 01 02 00 5d a2 f9 20 84 c4 88 cc 00 00 1c 20 00 00 1d 4c
+encode-proto Packet-Type = Request, Transaction-ID = 0x2b0e45, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-TA-IAID = 33752069, IA-TA-Options = 0x000500182a000001000102005da2f92084c488cc00001c2000001d4c
+match 03 2b 0e 45 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 00 00 00 02 00 11 22 33 44 55 00 06 00 04 00 17 00 18 00 08 00 02 00 00 00 04 00 20 02 03 04 05 00 05 00 18 2a 00 00 01 00 01 02 00 5d a2 f9 20 84 c4 88 cc 00 00 1c 20 00 00 1d 4c
 
 decode-proto -
-match Packet-Type = Request, Transaction-ID = 0x2b0e45, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:32:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-TA-IAID = 33752069, IA-TA-Options = 0x000500182a000001000102005da2f92084c488cc00001c2000001d4c
+match Packet-Type = Request, Transaction-ID = 0x2b0e45, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-TA-IAID = 33752069, IA-TA-Options = 0x000500182a000001000102005da2f92084c488cc00001c2000001d4c
 
 #
 #  4.
 #
-encode-proto Packet-Type = Reply, Transaction-ID = 0x2b0e45, IA-TA-IAID = 33752069, IA-TA-Options = 0x000500182a000001000102005da2f92084c488cc0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:32:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
-match 07 2b 0e 45 00 04 00 20 02 03 04 05 00 05 00 18 2a 00 00 01 00 01 02 00 5d a2 f9 20 84 c4 88 cc 00 00 11 94 00 00 1c 20 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 18 46 47 f0 00 11 22 33 44 55
+encode-proto Packet-Type = Reply, Transaction-ID = 0x2b0e45, IA-TA-IAID = 33752069, IA-TA-Options = 0x000500182a000001000102005da2f92084c488cc0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
+match 07 2b 0e 45 00 04 00 20 02 03 04 05 00 05 00 18 2a 00 00 01 00 01 02 00 5d a2 f9 20 84 c4 88 cc 00 00 11 94 00 00 1c 20 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 02 00 0e 00 01 00 01 00 00 00 02 00 11 22 33 44 55
 
 decode-proto -
-match Packet-Type = Reply, Transaction-ID = 0x2b0e45, IA-TA-IAID = 33752069, IA-TA-Options = 0x000500182a000001000102005da2f92084c488cc0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Nov 27 1982 15:32:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
+match Packet-Type = Reply, Transaction-ID = 0x2b0e45, IA-TA-IAID = 33752069, IA-TA-Options = 0x000500182a000001000102005da2f92084c488cc0000119400001c20, Client-ID-DUID = Client-ID-DUID-LL, Client-ID-DUID-LL-Hardware-Type = 1, Client-ID-DUID-LL-Address = 0x000102030405, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x001122334455
 
 count
 match 18

diff --git a/src/tests/unit/protocols/dhcpv6/packet_ntp-server.txt b/src/tests/unit/protocols/dhcpv6/packet_ntp-server.txt
index 9386a32fe5d0a297c39a6892a48282a321edd521..37db6af05a43831d3c4657eebe15bec37698894f 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_ntp-server.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_ntp-server.txt
@@ -15,11 +15,11 @@ proto-dictionary dhcpv6
 #
 #  1.
 #
-encode-proto Packet-Type = Reply, Transaction-ID = 0xf69b57, Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Apr  5 1983 09:58:23 UTC", Client-ID-DUID-LLT-Ethernet-Address = 00:0c:29:38:f3:68, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Apr  5 1983 01:34:19 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x000c299ba153, NTP-Server-Address = 2a01::1, NTP-Server-Multicast-Address = ff05::101, NTP-Server-FQDN = "ntp.example.com"
-match 07 f6 9b 57 00 01 00 0e 00 01 00 01 18 f0 0b 3f 00 0c 29 38 f3 68 00 02 00 0e 00 01 00 01 18 ef 95 1b 00 0c 29 9b a1 53 00 38 00 3d 00 01 00 10 2a 01 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 02 00 10 ff 05 00 00 00 00 00 00 00 00 00 00 00 00 01 01 00 03 00 11 03 6e 74 70 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00
+encode-proto Packet-Type = Reply, Transaction-ID = 0xf69b57, Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Client-ID-DUID-LLT-Ethernet-Address = 00:0c:29:38:f3:68, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:03 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x000c299ba153, NTP-Server-Address = 2a01::1, NTP-Server-Multicast-Address = ff05::101, NTP-Server-FQDN = "ntp.example.com"
+match 07 f6 9b 57 00 01 00 0e 00 01 00 01 00 00 00 02 00 0c 29 38 f3 68 00 02 00 0e 00 01 00 01 00 00 00 03 00 0c 29 9b a1 53 00 38 00 3d 00 01 00 10 2a 01 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 02 00 10 ff 05 00 00 00 00 00 00 00 00 00 00 00 00 01 01 00 03 00 11 03 6e 74 70 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00
 
 decode-proto -
-match Packet-Type = Reply, Transaction-ID = 0xf69b57, Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Apr  5 1983 09:58:23 UTC", Client-ID-DUID-LLT-Ethernet-Address = 00:0c:29:38:f3:68, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Apr  5 1983 01:34:19 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x000c299ba153, NTP-Server-Address = 2a01::1, NTP-Server-Multicast-Address = ff05::101, NTP-Server-FQDN = "ntp.example.com"
+match Packet-Type = Reply, Transaction-ID = 0xf69b57, Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Client-ID-DUID-LLT-Ethernet-Address = 00:0c:29:38:f3:68, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:03 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x000c299ba153, NTP-Server-Address = 2a01::1, NTP-Server-Multicast-Address = ff05::101, NTP-Server-FQDN = "ntp.example.com"
 
 count
 match 6

diff --git a/src/tests/unit/protocols/dhcpv6/packet_sip-server-d.txt b/src/tests/unit/protocols/dhcpv6/packet_sip-server-d.txt
index 4528eb005a62cc875de62e12b6b83ee161e26165..903e08bccc453a9a712e96a52205509e8b68cf77 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_sip-server-d.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_sip-server-d.txt
@@ -15,11 +15,11 @@ proto-dictionary dhcpv6
 #
 #  1.
 #
-encode-proto Packet-Type = Reply, Transaction-ID = 0x6890d8, Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Apr  5 1983 09:58:23 UTC", Client-ID-DUID-LLT-Ethernet-Address = 00:0c:29:38:f3:68, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Apr  5 1983 01:34:19 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x000c299ba153, SIP-Server-Domain-Name-List = "sip1.my-domain.net", SIP-Server-Domain-Name-List = "sip2.example.com", SIP-Server-Domain-Name-List = "sip3.sub.my-domain.org"
-match 07 68 90 d8 00 01 00 0e 00 01 00 01 18 f0 0b 3f 00 0c 29 38 f3 68 00 02 00 0e 00 01 00 01 18 ef 95 1b 00 0c 29 9b a1 53 00 15 00 3e 04 73 69 70 31 09 6d 79 2d 64 6f 6d 61 69 6e 03 6e 65 74 00 04 73 69 70 32 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00 04 73 69 70 33 03 73 75 62 09 6d 79 2d 64 6f 6d 61 69 6e 03 6f 72 67 00
+encode-proto Packet-Type = Reply, Transaction-ID = 0x6890d8, Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Client-ID-DUID-LLT-Ethernet-Address = 00:0c:29:38:f3:68, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:03 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x000c299ba153, SIP-Server-Domain-Name-List = "sip1.my-domain.net", SIP-Server-Domain-Name-List = "sip2.example.com", SIP-Server-Domain-Name-List = "sip3.sub.my-domain.org"
+match 07 68 90 d8 00 01 00 0e 00 01 00 01 00 00 00 02 00 0c 29 38 f3 68 00 02 00 0e 00 01 00 01 00 00 00 03 00 0c 29 9b a1 53 00 15 00 3e 04 73 69 70 31 09 6d 79 2d 64 6f 6d 61 69 6e 03 6e 65 74 00 04 73 69 70 32 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00 04 73 69 70 33 03 73 75 62 09 6d 79 2d 64 6f 6d 61 69 6e 03 6f 72 67 00
 
 decode-proto -
-match Packet-Type = Reply, Transaction-ID = 0x6890d8, Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Apr  5 1983 09:58:23 UTC", Client-ID-DUID-LLT-Ethernet-Address = 00:0c:29:38:f3:68, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Apr  5 1983 01:34:19 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x000c299ba153, SIP-Server-Domain-Name-List = "sip1.my-domain.net", SIP-Server-Domain-Name-List = "sip2.example.com", SIP-Server-Domain-Name-List = "sip3.sub.my-domain.org"
+match Packet-Type = Reply, Transaction-ID = 0x6890d8, Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Jan  1 2000 00:00:02 UTC", Client-ID-DUID-LLT-Ethernet-Address = 00:0c:29:38:f3:68, Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 1, Server-ID-DUID-LLT-Time = "Jan  1 2000 00:00:03 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0x000c299ba153, SIP-Server-Domain-Name-List = "sip1.my-domain.net", SIP-Server-Domain-Name-List = "sip2.example.com", SIP-Server-Domain-Name-List = "sip3.sub.my-domain.org"
 
 count
 match 6

diff --git a/src/tests/unit/protocols/dhcpv6/rfc3315.txt b/src/tests/unit/protocols/dhcpv6/rfc3315.txt
index 6c457e0807d4056e20365a51ffb70c7499df41ca..c69e447e0e3c294bd260c629bca3c7b6656c623f 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/rfc3315.txt
+++ b/src/tests/unit/protocols/dhcpv6/rfc3315.txt
@@ -42,22 +42,22 @@ proto-dictionary dhcpv6
 #
 
 #  Define the DUID-LLT + DUID
-encode-pair Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = 1, Client-ID-DUID-LLT-Time = "Jan  1 1970 12:00:00 UTC", Client-ID-DUID-LLT-Ethernet-Address = aa:bb:cc:dd:ee:ff
+encode-pair Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = 1, Client-ID-DUID-LLT-Time = "Jan  1 2000 12:00:00 UTC", Client-ID-DUID-LLT-Ethernet-Address = aa:bb:cc:dd:ee:ff
 match 00 01 00 0e 00 01 00 01 00 00 a8 c0 aa bb cc dd ee ff
 
 decode-pair -
-match Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Jan  1 1970 12:00:00 UTC", Client-ID-DUID-LLT-Ethernet-Address = aa:bb:cc:dd:ee:ff
+match Client-ID-DUID = Client-ID-DUID-LLT, Client-ID-DUID-LLT-Hardware-Type = Client-ID-DUID-LLT-Ethernet, Client-ID-DUID-LLT-Time = "Jan  1 2000 12:00:00 UTC", Client-ID-DUID-LLT-Ethernet-Address = aa:bb:cc:dd:ee:ff
 
 #
 #  Server Identifier
 #
 
 #  Define the DUID-LLT + DUID
-encode-pair Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 3, Server-ID-DUID-LLT-Time = "Jan  1 1970 12:00:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0xc0ffeec0ffee
+encode-pair Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 3, Server-ID-DUID-LLT-Time = "Jan  1 2000 12:00:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0xc0ffeec0ffee
 match 00 02 00 0e 00 01 00 03 00 00 a8 c0 c0 ff ee c0 ff ee
 
 decode-pair -
-match Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 3, Server-ID-DUID-LLT-Time = "Jan  1 1970 12:00:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0xc0ffeec0ffee
+match Server-ID-DUID = Server-ID-DUID-LLT, Server-ID-DUID-LLT-Hardware-Type = 3, Server-ID-DUID-LLT-Time = "Jan  1 2000 12:00:00 UTC", Server-ID-DUID-LLT-Link-Layer-Address = 0xc0ffeec0ffee
 
 #
 #  9.3. DUID Assigned by Vendor Based on Enterprise Number [DUID-EN]