move fr_pair_print() to using ::enum-name

and update the regression tests to match.

Anything which reads the server output will need to be updated
to allow ::enum-name.

the value-box and tmpl functions already allow, but don't require
the "::" prefix for enum names.  So any server code will be OK.

i.e. radclient etc. will parse either ::enum-name or enum-name.

This change should only affect the unit tests, and the detail file
writer.

diff --git a/src/lib/util/pair_print.c b/src/lib/util/pair_print.c
index 43f0e6a4eb42cabe8d0367f28276a0445ec2a3ca..f01f25ea9125e6379ab68063da21b4ef14f09127 100644 (file)
--- a/src/lib/util/pair_print.c
+++ b/src/lib/util/pair_print.c
@@ -109,7 +109,19 @@ ssize_t fr_pair_print(fr_sbuff_t *out, fr_dict_attr_t const *parent, fr_pair_t c
        FR_SBUFF_IN_CHAR_RETURN(&our_out, ' ');
        FR_SBUFF_IN_STRCPY_RETURN(&our_out, token);
        FR_SBUFF_IN_CHAR_RETURN(&our_out, ' ');
-       FR_SBUFF_RETURN(fr_pair_print_value_quoted, &our_out, vp, T_DOUBLE_QUOTED_STRING);
+
+       if (fr_type_is_leaf(vp->vp_type) && vp->data.enumv && vp->data.enumv->flags.has_value) {
+               char const *name;
+
+               name = fr_dict_enum_name_by_value(vp->data.enumv, &vp->data);
+               if (!name) goto no_enumv;
+
+               FR_SBUFF_IN_CHAR_RETURN(&our_out, ':', ':');
+               FR_SBUFF_IN_STRCPY_RETURN(&our_out, name);
+       } else {
+       no_enumv:
+               FR_SBUFF_RETURN(fr_pair_print_value_quoted, &our_out, vp, T_DOUBLE_QUOTED_STRING);
+       }
 
        FR_SBUFF_SET_RETURN(out, &our_out);
 }

diff --git a/src/tests/unit/protocols/arp/base.txt b/src/tests/unit/protocols/arp/base.txt
index 2eee7eb32067c1416d2759991bd1d66ea8dedd2a..c6fa4d18a11fcad508b12a8cc621727f99681a69 100644 (file)
--- a/src/tests/unit/protocols/arp/base.txt
+++ b/src/tests/unit/protocols/arp/base.txt
@@ -16,7 +16,7 @@ encode-proto arp.hardware-format = Ethernet, arp.protocol-format = IPv4, arp.har
 match 00 01 08 00 06 04 00 01 00 01 02 03 04 05 c0 00 02 01 00 aa bb cc dd ee c0 00 02 80
 
 decode-proto -
-match arp = { hardware-format = Ethernet, protocol-format = IPv4, hardware-address-length = 6, protocol-address-length = 4, packet-type = Request, sender-hardware-address = 00:01:02:03:04:05, sender-protocol-address = 192.0.2.1, target-hardware-address = 00:aa:bb:cc:dd:ee, target-protocol-address = 192.0.2.128 }
+match arp = { hardware-format = ::Ethernet, protocol-format = ::IPv4, hardware-address-length = 6, protocol-address-length = 4, packet-type = ::Request, sender-hardware-address = 00:01:02:03:04:05, sender-protocol-address = 192.0.2.1, target-hardware-address = 00:aa:bb:cc:dd:ee, target-protocol-address = 192.0.2.128 }
 
 #
 #  and with missing fields that we don't care about.  this results in the same hex string as above.
@@ -26,7 +26,7 @@ encode-proto arp.packet-type = Request, arp.sender-hardware-address = 00:01:02:0
 match 00 01 08 00 06 04 00 01 00 01 02 03 04 05 c0 00 02 01 00 aa bb cc dd ee c0 00 02 80
 
 decode-proto -
-match arp = { hardware-format = Ethernet, protocol-format = IPv4, hardware-address-length = 6, protocol-address-length = 4, packet-type = Request, sender-hardware-address = 00:01:02:03:04:05, sender-protocol-address = 192.0.2.1, target-hardware-address = 00:aa:bb:cc:dd:ee, target-protocol-address = 192.0.2.128 }
+match arp = { hardware-format = ::Ethernet, protocol-format = ::IPv4, hardware-address-length = 6, protocol-address-length = 4, packet-type = ::Request, sender-hardware-address = 00:01:02:03:04:05, sender-protocol-address = 192.0.2.1, target-hardware-address = 00:aa:bb:cc:dd:ee, target-protocol-address = 192.0.2.128 }
 
 count
 match 10

diff --git a/src/tests/unit/protocols/bfd/base.txt b/src/tests/unit/protocols/bfd/base.txt
index 93ac238c374da7d54b7b8faf038c744c0414f7c6..333feb1f87cb37697684f0713be8f7661d543ec3 100644 (file)
--- a/src/tests/unit/protocols/bfd/base.txt
+++ b/src/tests/unit/protocols/bfd/base.txt
@@ -13,7 +13,7 @@ encode-proto Packet = { version = 1, diagnostic = none, state = up, poll = false
 match 20 c0 03 18 de ad be ef 21 12 68 09 00 00 00 1f 00 00 00 7f 00 00 00 ff
 
 decode-proto -
-match Packet-Type = Up, Packet = { version = 1, diagnostic = none, state = up, poll = no, final = no, control-plane-independent = no, auth-present = no, demand = no, multipoint = no, detect-multi = 3, length = 24, my-discriminator = 3735928559, your-discriminator = 554854409, desired-min-tx-interval = 31, required-min-tx-interval = 127, required-min-echo-interval = 255 }
+match Packet-Type = ::Up, Packet = { version = 1, diagnostic = ::none, state = ::up, poll = no, final = no, control-plane-independent = no, auth-present = no, demand = no, multipoint = no, detect-multi = 3, length = 24, my-discriminator = 3735928559, your-discriminator = 554854409, desired-min-tx-interval = 31, required-min-tx-interval = 127, required-min-echo-interval = 255 }
 
 
 #
@@ -25,13 +25,13 @@ encode-proto Packet = { version = 1, diagnostic = none, state = up, poll = false
 match 20 c0 03 18 de ad be ef 21 12 68 09 00 00 00 1f 00 00 00 7f 00 00 00 ff 21 40 03 e8 03 66 6f 6f
 
 decode-proto -
-match Packet-Type = Up, Packet = { version = 1, diagnostic = none, state = up, poll = no, final = no, control-plane-independent = no, auth-present = no, demand = no, multipoint = no, detect-multi = 3, length = 24, my-discriminator = 3735928559, your-discriminator = 554854409, desired-min-tx-interval = 31, required-min-tx-interval = 127, required-min-echo-interval = 255 }, Additional-Data = { Stripped-User-Name = "foo" }
+match Packet-Type = ::Up, Packet = { version = 1, diagnostic = ::none, state = ::up, poll = no, final = no, control-plane-independent = no, auth-present = no, demand = no, multipoint = no, detect-multi = 3, length = 24, my-discriminator = 3735928559, your-discriminator = 554854409, desired-min-tx-interval = 31, required-min-tx-interval = 127, required-min-echo-interval = 255 }, Additional-Data = { Stripped-User-Name = "foo" }
 
 #
 #  With authentication type
 #
 decode-proto 20 c4 03 21 de ad be ef 21 12 68 09 00 00 00 1f 00 00 00 7f 00 00 00 ff 01 0a 0f 00 68 65 6c 6c 6f
-match Packet-Type = Up, Packet = { version = 1, diagnostic = none, state = up, poll = no, final = no, control-plane-independent = no, auth-present = yes, demand = no, multipoint = no, detect-multi = 3, length = 33, my-discriminator = 3735928559, your-discriminator = 554854409, desired-min-tx-interval = 31, required-min-tx-interval = 127, required-min-echo-interval = 255, auth-type = simple-password, auth-type.simple-password = { key-id = 15, reserved = 0, password = "hello" } }
+match Packet-Type = ::Up, Packet = { version = 1, diagnostic = ::none, state = ::up, poll = no, final = no, control-plane-independent = no, auth-present = yes, demand = no, multipoint = no, detect-multi = 3, length = 33, my-discriminator = 3735928559, your-discriminator = 554854409, desired-min-tx-interval = 31, required-min-tx-interval = 127, required-min-echo-interval = 255, auth-type = ::simple-password, auth-type.simple-password = { key-id = 15, reserved = 0, password = "hello" } }
 
 
 #
@@ -44,7 +44,7 @@ match 20 c4 03 21 de ad be ef 21 12 68 09 00 00 00 1f 00 00 00 7f 00 00 00 ff 00
 #  Because auth-type=0, we can't decode the above text.
 #
 decode-proto -
-match Packet-Type = Up, raw.Packet = 0x20c40321deadbeef211268090000001f0000007f000000ff000a0f0068656c6c6f
+match Packet-Type = ::Up, raw.Packet = 0x20c40321deadbeef211268090000001f0000007f000000ff000a0f0068656c6c6f
 
 #match Packet = { version = 1, diagnostic = none, state = up, poll = no, final = no, control-plane-independent = no, auth-present = yes, demand = no, multipoint = no, detect-multi = 3, length = 24, my-discriminator = 3735928559, your-discriminator = 554854409, desired-min-tx-interval = 31, required-min-tx-interval = 127, required-min-echo-interval = 255, auth-type.simple-password = { key-id = 0, reserved = 0, password = "hello" } }
 

diff --git a/src/tests/unit/protocols/dhcpv4/PRIV_bootp-both_overload.txt b/src/tests/unit/protocols/dhcpv4/PRIV_bootp-both_overload.txt
index 1f95ba6c85c16012ff9a4b4b2bea3c4a0ba09eae..e89ef0378a58f5f76aa7850582fd38a649953de9 100644 (file)
--- a/src/tests/unit/protocols/dhcpv4/PRIV_bootp-both_overload.txt
+++ b/src/tests/unit/protocols/dhcpv4/PRIV_bootp-both_overload.txt
@@ -32,7 +32,7 @@ proto-dictionary dhcpv4
 #    options   = [message-type=discover max_dhcp_size=590 param_req_list=[1, 28, 3, 43] lease_time=3600 dhcp-option-overload=3 error_message=b'Padding' pad client_id='\x01\x00\x00l\\x82\\xdcN' end]
 #
 decode-proto 01 01 06 00 ac 2e ff ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 6c 82 dc 4e 00 00 00 00 00 00 00 00 00 00 38 14 73 6e 61 6d 65 20 66 69 65 6c 64 20 6f 76 65 72 6c 6f 61 64 ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 38 18 66 69 6c 65 20 6e 61 6d 65 20 66 69 65 6c 64 20 6f 76 65 72 6c 6f 61 64 ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 63 82 53 63 35 01 01 39 02 02 4e 37 04 01 1c 03 2b 33 04 00 00 0e 10 34 01 03 38 07 50 61 64 64 69 6e 67 00 3d 07 01 00 00 6c 82 dc 4e ff
-match Opcode = Client-Message, Hardware-Type = Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 2888761343, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 0.0.0.0, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 0.0.0.0, Client-Hardware-Address = 00:00:6c:82:dc:4e, Message-Type = Discover, Maximum-Msg-Size = 590, Parameter-Request-List = Subnet-Mask, Parameter-Request-List = Broadcast-Address, Parameter-Request-List = Router-Address, Parameter-Request-List = Vendor, IP-Address-Lease-Time = 3600, Overload = 3, Error-Message = "Padding", Error-Message = "sname field overload", Error-Message = "file name field overload", Network-Subnet = 0.0.0.0/32
+match Opcode = ::Client-Message, Hardware-Type = ::Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 2888761343, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 0.0.0.0, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 0.0.0.0, Client-Hardware-Address = 00:00:6c:82:dc:4e, Message-Type = ::Discover, Maximum-Msg-Size = 590, Parameter-Request-List = ::Subnet-Mask, Parameter-Request-List = ::Broadcast-Address, Parameter-Request-List = ::Router-Address, Parameter-Request-List = ::Vendor, IP-Address-Lease-Time = 3600, Overload = 3, Error-Message = "Padding", Error-Message = "sname field overload", Error-Message = "file name field overload", Network-Subnet = 0.0.0.0/32
 
 count
 match 4

diff --git a/src/tests/unit/protocols/dhcpv4/PRIV_bootp-both_overload_empty-no_end.txt b/src/tests/unit/protocols/dhcpv4/PRIV_bootp-both_overload_empty-no_end.txt
index 63398b47935e682cf743d94a78caf1c8e6c9bc8f..31cd5948fde39bcc5b95b5345786ff5aa755fcfb 100644 (file)
--- a/src/tests/unit/protocols/dhcpv4/PRIV_bootp-both_overload_empty-no_end.txt
+++ b/src/tests/unit/protocols/dhcpv4/PRIV_bootp-both_overload_empty-no_end.txt
@@ -32,7 +32,7 @@ proto-dictionary dhcpv4
 #    options   = [message-type=discover max_dhcp_size=590 param_req_list=[1, 28, 3, 43] lease_time=3600 dhcp-option-overload=3 error_message=b'Padding' pad client_id='\x01\x00\x00l\\x82\\xdcN' pad]
 #
 decode-proto 01 01 06 00 ac 2e ff ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 6c 82 dc 4e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 63 82 53 63 35 01 01 39 02 02 4e 37 04 01 1c 03 2b 33 04 00 00 0e 10 34 01 03 38 07 50 61 64 64 69 6e 67 00 3d 07 01 00 00 6c 82 dc 4e 00
-match Opcode = Client-Message, Hardware-Type = Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 2888761343, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 0.0.0.0, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 0.0.0.0, Client-Hardware-Address = 00:00:6c:82:dc:4e, Message-Type = Discover, Maximum-Msg-Size = 590, Parameter-Request-List = Subnet-Mask, Parameter-Request-List = Broadcast-Address, Parameter-Request-List = Router-Address, Parameter-Request-List = Vendor, IP-Address-Lease-Time = 3600, Overload = 3, Error-Message = "Padding", Network-Subnet = 0.0.0.0/32
+match Opcode = ::Client-Message, Hardware-Type = ::Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 2888761343, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 0.0.0.0, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 0.0.0.0, Client-Hardware-Address = 00:00:6c:82:dc:4e, Message-Type = ::Discover, Maximum-Msg-Size = 590, Parameter-Request-List = ::Subnet-Mask, Parameter-Request-List = ::Broadcast-Address, Parameter-Request-List = ::Router-Address, Parameter-Request-List = ::Vendor, IP-Address-Lease-Time = 3600, Overload = 3, Error-Message = "Padding", Network-Subnet = 0.0.0.0/32
 
 count
 match 4

diff --git a/src/tests/unit/protocols/dhcpv4/base.txt b/src/tests/unit/protocols/dhcpv4/base.txt
index d38bdaec630b01bdb58292aaabacb164cdb431dd..a20a65f73ce61a13444d0d0fbfd8734c17fa6e47 100644 (file)
--- a/src/tests/unit/protocols/dhcpv4/base.txt
+++ b/src/tests/unit/protocols/dhcpv4/base.txt
@@ -42,7 +42,7 @@ match ANDSF-IPv6-Address = fe80::1, ANDSF-IPv6-Address = fe80::2, ANDSF-IPv6-Add
 #  A long one... with a weird specific vendor ID.
 #
 decode-pair 3501013d0701001ceaadac1e37070103060f2c2e2f3c094d5346545f495054565232011c4c41424f4c54322065746820312f312f30312f30312f31302f312f3209120000197f0d050b4c4142373336304f4c5432
-match Message-Type = Discover, Client-Identifier = 0x01001ceaadac1e, Parameter-Request-List = Subnet-Mask, Parameter-Request-List = Router-Address, Parameter-Request-List = Domain-Name-Server, Parameter-Request-List = Domain-Name, Parameter-Request-List = NETBIOS-Name-Servers, Parameter-Request-List = NETBIOS-Node-Type, Parameter-Request-List = NETBIOS, Vendor-Class-Identifier = 0x4d5346545f49505456, Relay-Agent-Information = { Circuit-Id = 0x4c41424f4c54322065746820312f312f30312f30312f31302f312f32, Vendor-Specific-Information = 0x0000197f0d050b4c4142373336304f4c5432 }
+match Message-Type = ::Discover, Client-Identifier = 0x01001ceaadac1e, Parameter-Request-List = ::Subnet-Mask, Parameter-Request-List = ::Router-Address, Parameter-Request-List = ::Domain-Name-Server, Parameter-Request-List = ::Domain-Name, Parameter-Request-List = ::NETBIOS-Name-Servers, Parameter-Request-List = ::NETBIOS-Node-Type, Parameter-Request-List = ::NETBIOS, Vendor-Class-Identifier = 0x4d5346545f49505456, Relay-Agent-Information = { Circuit-Id = 0x4c41424f4c54322065746820312f312f30312f30312f31302f312f32, Vendor-Specific-Information = 0x0000197f0d050b4c4142373336304f4c5432 }
 
 #
 #  Two sub-options 82, that cannot fit in a single option.

diff --git a/src/tests/unit/protocols/dhcpv4/client-server.txt b/src/tests/unit/protocols/dhcpv4/client-server.txt
index da3bec849c927178c73b4a61fa6f889f5cfb8cbd..7f3a74bfe645a62a21874a751efad40e92ee6d9c 100644 (file)
--- a/src/tests/unit/protocols/dhcpv4/client-server.txt
+++ b/src/tests/unit/protocols/dhcpv4/client-server.txt
@@ -32,7 +32,7 @@ proto-dictionary dhcpv4
 #    options   = [message-type=discover client_id='\x01\x00\x0b\\x82\x01\\xfcB' requested_addr=0.0.0.0 param_req_list=[1, 3, 6, 42] end pad pad pad pad pad pad pad]
 #
 decode-proto 01 01 06 00 00 00 3d 1d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0b 82 01 fc 42 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 63 82 53 63 35 01 01 3d 07 01 00 0b 82 01 fc 42 32 04 00 00 00 00 37 04 01 03 06 2a ff 00 00 00 00 00 00 00
-match Opcode = Client-Message, Hardware-Type = Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 15645, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 0.0.0.0, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 0.0.0.0, Client-Hardware-Address = 00:0b:82:01:fc:42, Message-Type = Discover, Client-Identifier = 0x01000b8201fc42, Requested-IP-Address = 0.0.0.0, Parameter-Request-List = Subnet-Mask, Parameter-Request-List = Router-Address, Parameter-Request-List = Domain-Name-Server, Parameter-Request-List = NTP-Servers, Network-Subnet = 0.0.0.0/32
+match Opcode = ::Client-Message, Hardware-Type = ::Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 15645, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 0.0.0.0, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 0.0.0.0, Client-Hardware-Address = 00:0b:82:01:fc:42, Message-Type = ::Discover, Client-Identifier = 0x01000b8201fc42, Requested-IP-Address = 0.0.0.0, Parameter-Request-List = ::Subnet-Mask, Parameter-Request-List = ::Router-Address, Parameter-Request-List = ::Domain-Name-Server, Parameter-Request-List = ::NTP-Servers, Network-Subnet = 0.0.0.0/32
 
 #
 #  2.
@@ -57,7 +57,7 @@ match Opcode = Client-Message, Hardware-Type = Ethernet, Hardware-Address-Length
 #    options   = [message-type=offer subnet_mask=255.255.255.0 renewal_time=1800 rebinding_time=3150 lease_time=3600 server_id=192.168.0.1 end pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad]
 #
 decode-proto 02 01 06 00 00 00 3d 1d 00 00 00 00 00 00 00 00 c0 a8 00 0a c0 a8 00 01 00 00 00 00 00 0b 82 01 fc 42 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 63 82 53 63 35 01 02 01 04 ff ff ff 00 3a 04 00 00 07 08 3b 04 00 00 0c 4e 33 04 00 00 0e 10 36 04 c0 a8 00 01 ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-match Opcode = Server-Message, Hardware-Type = Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 15645, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 192.168.0.10, Server-IP-Address = 192.168.0.1, Gateway-IP-Address = 0.0.0.0, Client-Hardware-Address = 00:0b:82:01:fc:42, Message-Type = Offer, Subnet-Mask = 255.255.255.0, Renewal-Time = 1800, Rebinding-Time = 3150, IP-Address-Lease-Time = 3600, Server-Identifier = 192.168.0.1, Network-Subnet = 0.0.0.0/32
+match Opcode = ::Server-Message, Hardware-Type = ::Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 15645, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 192.168.0.10, Server-IP-Address = 192.168.0.1, Gateway-IP-Address = 0.0.0.0, Client-Hardware-Address = 00:0b:82:01:fc:42, Message-Type = ::Offer, Subnet-Mask = 255.255.255.0, Renewal-Time = 1800, Rebinding-Time = 3150, IP-Address-Lease-Time = 3600, Server-Identifier = 192.168.0.1, Network-Subnet = 0.0.0.0/32
 
 #
 #  3.
@@ -82,7 +82,7 @@ match Opcode = Server-Message, Hardware-Type = Ethernet, Hardware-Address-Length
 #    options   = [message-type=request client_id='\x01\x00\x0b\\x82\x01\\xfcB' requested_addr=192.168.0.10 server_id=192.168.0.1 param_req_list=[1, 3, 6, 42] end pad]
 #
 decode-proto 01 01 06 00 00 00 3d 1e 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0b 82 01 fc 42 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 63 82 53 63 35 01 03 3d 07 01 00 0b 82 01 fc 42 32 04 c0 a8 00 0a 36 04 c0 a8 00 01 37 04 01 03 06 2a ff 00
-match Opcode = Client-Message, Hardware-Type = Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 15646, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 0.0.0.0, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 0.0.0.0, Client-Hardware-Address = 00:0b:82:01:fc:42, Message-Type = Request, Client-Identifier = 0x01000b8201fc42, Requested-IP-Address = 192.168.0.10, Server-Identifier = 192.168.0.1, Parameter-Request-List = Subnet-Mask, Parameter-Request-List = Router-Address, Parameter-Request-List = Domain-Name-Server, Parameter-Request-List = NTP-Servers, Network-Subnet = 0.0.0.0/32
+match Opcode = ::Client-Message, Hardware-Type = ::Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 15646, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 0.0.0.0, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 0.0.0.0, Client-Hardware-Address = 00:0b:82:01:fc:42, Message-Type = ::Request, Client-Identifier = 0x01000b8201fc42, Requested-IP-Address = 192.168.0.10, Server-Identifier = 192.168.0.1, Parameter-Request-List = ::Subnet-Mask, Parameter-Request-List = ::Router-Address, Parameter-Request-List = ::Domain-Name-Server, Parameter-Request-List = ::NTP-Servers, Network-Subnet = 0.0.0.0/32
 
 #
 #  4.
@@ -107,7 +107,7 @@ match Opcode = Client-Message, Hardware-Type = Ethernet, Hardware-Address-Length
 #    options   = [message-type=ack renewal_time=1800 rebinding_time=3150 lease_time=3600 server_id=192.168.0.1 subnet_mask=255.255.255.0 end pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad pad]
 #
 decode-proto 02 01 06 00 00 00 3d 1e 00 00 00 00 00 00 00 00 c0 a8 00 0a 00 00 00 00 00 00 00 00 00 0b 82 01 fc 42 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 63 82 53 63 35 01 05 3a 04 00 00 07 08 3b 04 00 00 0c 4e 33 04 00 00 0e 10 36 04 c0 a8 00 01 01 04 ff ff ff 00 ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
-match Opcode = Server-Message, Hardware-Type = Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 15646, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 192.168.0.10, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 0.0.0.0, Client-Hardware-Address = 00:0b:82:01:fc:42, Message-Type = Ack, Renewal-Time = 1800, Rebinding-Time = 3150, IP-Address-Lease-Time = 3600, Server-Identifier = 192.168.0.1, Subnet-Mask = 255.255.255.0, Network-Subnet = 0.0.0.0/32
+match Opcode = ::Server-Message, Hardware-Type = ::Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 15646, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 192.168.0.10, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 0.0.0.0, Client-Hardware-Address = 00:0b:82:01:fc:42, Message-Type = ::Ack, Renewal-Time = 1800, Rebinding-Time = 3150, IP-Address-Lease-Time = 3600, Server-Identifier = 192.168.0.1, Subnet-Mask = 255.255.255.0, Network-Subnet = 0.0.0.0/32
 
 count
 match 10

diff --git a/src/tests/unit/protocols/dhcpv4/dhcp-auth.txt b/src/tests/unit/protocols/dhcpv4/dhcp-auth.txt
index 70f6efca103037ab4e9840a6944db2db3da020e7..73bf9ff9d99dfebbdaa70a8a11082d352c96b707 100644 (file)
--- a/src/tests/unit/protocols/dhcpv4/dhcp-auth.txt
+++ b/src/tests/unit/protocols/dhcpv4/dhcp-auth.txt
@@ -32,7 +32,7 @@ proto-dictionary dhcpv4
 #    options   = [message-type=offer subnet_mask=255.255.255.0 server_id=172.22.178.234 lease_time=43200 router=10.10.8.254 name_server=143.209.4.1,143.209.5.1 tftp_server_name=b'172.22.178.234' 120=b'\x01\xac\x16\xb2\xea' client_id='\x00nathan1clientid' 90=b'\x01\x01\x00\xc8x\xc4RV@ \x811234\x8f\xe0\xcc\xe2\xee\x85\x96\xab\xb2X\x17\xc4\x80\xb2\xfd0' relay_agent_information=b'\x01\x14 PON 1/1/07/01:1.0.1' end]
 #
 decode-proto 02 01 06 01 77 71 cf 85 00 0a 00 00 00 00 00 00 0a 0a 08 eb ac 16 b2 ea 0a 0a 08 f0 00 0e 86 11 c0 75 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 63 82 53 63 35 01 02 01 04 ff ff ff 00 36 04 ac 16 b2 ea 33 04 00 00 a8 c0 03 04 0a 0a 08 fe 06 08 8f d1 04 01 8f d1 05 01 42 0e 31 37 32 2e 32 32 2e 31 37 38 2e 32 33 34 78 05 01 ac 16 b2 ea 3d 10 00 6e 61 74 68 61 6e 31 63 6c 69 65 6e 74 69 64 5a 1f 01 01 00 c8 78 c4 52 56 40 20 81 31 32 33 34 8f e0 cc e2 ee 85 96 ab b2 58 17 c4 80 b2 fd 30 52 16 01 14 20 50 4f 4e 20 31 2f 31 2f 30 37 2f 30 31 3a 31 2e 30 2e 31 ff
-match Opcode = Server-Message, Hardware-Type = Ethernet, Hardware-Address-Length = 6, Hop-Count = 1, Transaction-Id = 2003947397, Number-of-Seconds = 10, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 10.10.8.235, Server-IP-Address = 172.22.178.234, Gateway-IP-Address = 10.10.8.240, Client-Hardware-Address = 00:0e:86:11:c0:75, Message-Type = Offer, Subnet-Mask = 255.255.255.0, Server-Identifier = 172.22.178.234, IP-Address-Lease-Time = 43200, Router-Address = 10.10.8.254, Domain-Name-Server = 143.209.4.1, Domain-Name-Server = 143.209.5.1, TFTP-Server-Name = "172.22.178.234", raw.SIP-Servers-Option = 0x01ac16b2ea, Client-Identifier = 0x006e617468616e31636c69656e746964, Authentication = { protocol = delayed-authentication, algorithm = HMAC-SHA1-keyed-hash, RDM = 0, replay-detection = 14445511662704271489, raw.algorithm.HMAC-SHA1-keyed-hash = 0x313233348fe0cce2ee8596abb25817c480b2fd30 }, Relay-Agent-Information = { Circuit-Id = 0x20504f4e20312f312f30372f30313a312e302e31 }, Network-Subnet = 10.10.8.240/32
+match Opcode = ::Server-Message, Hardware-Type = ::Ethernet, Hardware-Address-Length = 6, Hop-Count = 1, Transaction-Id = 2003947397, Number-of-Seconds = 10, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 10.10.8.235, Server-IP-Address = 172.22.178.234, Gateway-IP-Address = 10.10.8.240, Client-Hardware-Address = 00:0e:86:11:c0:75, Message-Type = ::Offer, Subnet-Mask = 255.255.255.0, Server-Identifier = 172.22.178.234, IP-Address-Lease-Time = 43200, Router-Address = 10.10.8.254, Domain-Name-Server = 143.209.4.1, Domain-Name-Server = 143.209.5.1, TFTP-Server-Name = "172.22.178.234", raw.SIP-Servers-Option = 0x01ac16b2ea, Client-Identifier = 0x006e617468616e31636c69656e746964, Authentication = { protocol = ::delayed-authentication, algorithm = ::HMAC-SHA1-keyed-hash, RDM = 0, replay-detection = 14445511662704271489, raw.algorithm.HMAC-SHA1-keyed-hash = 0x313233348fe0cce2ee8596abb25817c480b2fd30 }, Relay-Agent-Information = { Circuit-Id = 0x20504f4e20312f312f30372f30313a312e302e31 }, Network-Subnet = 10.10.8.240/32
 
 count
 match 4

diff --git a/src/tests/unit/protocols/dhcpv4/error.txt b/src/tests/unit/protocols/dhcpv4/error.txt
index 163b4eb4af30972700aca81c12fd7638e4fa5447..310754798748e94c3a631f1e8833dcba946fb9f4 100644 (file)
--- a/src/tests/unit/protocols/dhcpv4/error.txt
+++ b/src/tests/unit/protocols/dhcpv4/error.txt
@@ -18,7 +18,7 @@ decode-pair 76 03 01 02 03
 match raw.Subnet-Selection-Option = 0x010203
 
 decode-proto 0101 0600 f59e ad14 0000 0000 0b0c 0c0c 0000 0000 0000 0000 0a0b 0b0b 4eaa 0000 0010 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 6382 5363 3501 0176 0931 302e 322e 3130 2e30 3d04 6a69 6d61 ff00 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000
-match Opcode = Client-Message, Hardware-Type = Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 4120816916, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 11.12.12.12, Your-IP-Address = 0.0.0.0, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 10.11.11.11, Client-Hardware-Address = 4e:aa:00:00:00:10, Message-Type = Discover, raw.Subnet-Selection-Option = 0x31302e322e31302e30, Client-Identifier = 0x6a696d61, Network-Subnet = 10.11.11.11/32
+match Opcode = ::Client-Message, Hardware-Type = ::Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 4120816916, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 11.12.12.12, Your-IP-Address = 0.0.0.0, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 10.11.11.11, Client-Hardware-Address = 4e:aa:00:00:00:10, Message-Type = ::Discover, raw.Subnet-Selection-Option = 0x31302e322e31302e30, Client-Identifier = 0x6a696d61, Network-Subnet = 10.11.11.11/32
 
 #
 #  decode TLV which doesn't contain enough data to be a TLV.

diff --git a/src/tests/unit/protocols/dhcpv4/packet.txt b/src/tests/unit/protocols/dhcpv4/packet.txt
index d8b7415bc47f6512380eec5c7f63bea4f49ee825..293dde0715168aaecf8ea5afc6596cd786669954 100644 (file)
--- a/src/tests/unit/protocols/dhcpv4/packet.txt
+++ b/src/tests/unit/protocols/dhcpv4/packet.txt
@@ -9,7 +9,7 @@ encode-proto Opcode = Client-Message, Hardware-Type = Ethernet, Hardware-Address
 match 01 01 06 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0a 0b 13 03 44 48 42 66 00 5a 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 63 82 53 63 35 01 01 ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 
 decode-proto -
-match Opcode = Client-Message, Hardware-Type = Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 0, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 0.0.0.0, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 10.11.19.3, Client-Hardware-Address = 44:48:42:66:00:5a, Message-Type = Discover, Network-Subnet = 10.11.19.3/32
+match Opcode = ::Client-Message, Hardware-Type = ::Ethernet, Hardware-Address-Length = 6, Hop-Count = 0, Transaction-Id = 0, Number-of-Seconds = 0, Flags = 0, Client-IP-Address = 0.0.0.0, Your-IP-Address = 0.0.0.0, Server-IP-Address = 0.0.0.0, Gateway-IP-Address = 10.11.19.3, Client-Hardware-Address = 44:48:42:66:00:5a, Message-Type = ::Discover, Network-Subnet = 10.11.19.3/32
 
 count
 match 7

diff --git a/src/tests/unit/protocols/dhcpv4/rfc3118.txt b/src/tests/unit/protocols/dhcpv4/rfc3118.txt
index 16108e1192af1988a1036c2c9609a5513b9589c8..e3b005908cca6c2b6745630db91e2ff061dbbfc9 100644 (file)
--- a/src/tests/unit/protocols/dhcpv4/rfc3118.txt
+++ b/src/tests/unit/protocols/dhcpv4/rfc3118.txt
@@ -12,7 +12,7 @@ encode-pair Authentication = { protocol = 1, algorithm = 1, rdm = 1, replay-dete
 match 5a 23 01 01 01 00 00 00 00 de ad be ef 00 00 21 12 aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ab
 
 decode-pair -
-match Authentication = { protocol = delayed-authentication, algorithm = HMAC-SHA1-keyed-hash, RDM = monotonically-increasing, replay-detection = 3735928559, algorithm.HMAC-SHA1-keyed-hash = { key-id = 8466, hash = 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab } }
+match Authentication = { protocol = ::delayed-authentication, algorithm = ::HMAC-SHA1-keyed-hash, RDM = ::monotonically-increasing, replay-detection = 3735928559, algorithm.HMAC-SHA1-keyed-hash = { key-id = 8466, hash = 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab } }
 
 count
 match 7

diff --git a/src/tests/unit/protocols/dhcpv4/rfc3825.txt b/src/tests/unit/protocols/dhcpv4/rfc3825.txt
index 6d5f8f656293ada4717bb2ff60017185f31e6531..e3a4fe6cd5e41662374dfcc4fdedfbce73314a28 100644 (file)
--- a/src/tests/unit/protocols/dhcpv4/rfc3825.txt
+++ b/src/tests/unit/protocols/dhcpv4/rfc3825.txt
@@ -9,7 +9,7 @@ encode-pair GeoConf-Option = { LaRes = 20, Latitude = 1395556352, LoRes = 20, Lo
 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, AT = ::Meters, AltRes = 20, Altitude = 384, Datum = ::NAVD88 }
 
 count
 match 7

diff --git a/src/tests/unit/protocols/dhcpv6/fixed_element_arrays.txt b/src/tests/unit/protocols/dhcpv6/fixed_element_arrays.txt
index 923abf215972e0c78dfcce9bd4b3b685d93604b6..6821181cfa9fb5ecca3215e62b9abafee2e21fd1 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/fixed_element_arrays.txt
+++ b/src/tests/unit/protocols/dhcpv6/fixed_element_arrays.txt
@@ -16,7 +16,7 @@ encode-pair Client-Arch-Type = x86-BIOS, Client-Arch-Type = ARM-64-Uboot
 match 00 3d 00 04 00 00 00 16
 
 decode-pair -
-match Client-Arch-Type = x86-BIOS, Client-Arch-Type = ARM-64-Uboot
+match Client-Arch-Type = ::x86-BIOS, Client-Arch-Type = ::ARM-64-Uboot
 
 #
 #  Two different arrays of 16bit integers
@@ -25,7 +25,7 @@ encode-pair Client-Arch-Type = x86-BIOS, Client-Arch-Type = ARM-64-Uboot, S46-Pr
 match 00 3d 00 04 00 00 00 16 00 6f 00 04 00 40 00 5e
 
 decode-pair -
-match Client-Arch-Type = x86-BIOS, Client-Arch-Type = ARM-64-Uboot, S46-Priority = DS-Lite, S46-Priority = MAP-E
+match Client-Arch-Type = ::x86-BIOS, Client-Arch-Type = ::ARM-64-Uboot, S46-Priority = ::DS-Lite, S46-Priority = ::MAP-E
 
 #
 #  Array type with one element
@@ -34,7 +34,7 @@ encode-pair Client-Arch-Type = x86-BIOS
 match 00 3d 00 02 00 00
 
 decode-pair -
-match Client-Arch-Type = x86-BIOS
+match Client-Arch-Type = ::x86-BIOS
 
 #
 #  Array of IPv6 addresses

diff --git a/src/tests/unit/protocols/dhcpv6/integers.txt b/src/tests/unit/protocols/dhcpv6/integers.txt
index 220a050cde1c0a15237684fb404612c94292414c..2104275161734718f26d71dc3fc9112f6d1b1277 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/integers.txt
+++ b/src/tests/unit/protocols/dhcpv6/integers.txt
@@ -31,7 +31,7 @@ encode-pair ANI-Access-Technology-Type = 3GPP2-NB-IOT
 match 00 69 00 02 00 0d
 
 decode-pair -
-match ANI-Access-Technology-Type = 3GPP2-NB-IOT
+match ANI-Access-Technology-Type = ::3GPP2-NB-IOT
 
 #
 #  4 byte unsigned integer (uint32)

diff --git a/src/tests/unit/protocols/dhcpv6/packet.txt b/src/tests/unit/protocols/dhcpv6/packet.txt
index e9a45cd089d9b65c32cce7bd6f34647b60ea3ee7..52b2d2ec7a02386a288d97bb90a1d20ae60232c7 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet.txt
@@ -38,7 +38,7 @@ encode-proto Packet-Type = Request, Transaction-ID = 0xabcdef, Client-ID.DUID =
 match 03 ab cd ef 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
 
 decode-proto -
-match Packet-Type = Request, Transaction-ID = 0xabcdef, Client-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
+match Packet-Type = ::Request, Transaction-ID = 0xabcdef, Client-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
 
 count
 match 17

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 96fedb8d84e25f01685c5dc521e15aa71bd9a537..4376e6c92b900beede8665506975e58a90798d41 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_AFTR-Name-rfc6334.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_AFTR-Name-rfc6334.txt
@@ -44,7 +44,7 @@ fuzzer-out dhcpv6
 #       \iapdopt   \
 #
 decode-proto 01 d8 1e b8 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 06 00 04 00 17 00 40 00 08 00 02 00 00 00 19 00 0c 02 03 04 05 00 00 0e 10 00 00 15 18
-match Packet-Type = Solicit, Transaction-ID = 0xd81eb8, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Option-Request = DNS-Servers, Option-Request = AFTR-Name, Elapsed-Time = 0, IA-PD = { IAID = 33752069, T1 = 3600, T2 = 5400 }
+match Packet-Type = ::Solicit, Transaction-ID = 0xd81eb8, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Option-Request = ::DNS-Servers, Option-Request = ::AFTR-Name, Elapsed-Time = 0, IA-PD = { IAID = 33752069, T1 = 3600, T2 = 5400 }
 
 encode-proto -
 match 01 d8 1e b8 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 06 00 04 00 17 00 40 00 08 00 02 00 00 00 19 00 0c 02 03 04 05 00 00 0e 10 00 00 15 18
@@ -101,7 +101,7 @@ match 01 d8 1e b8 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 06 00 04 00 17 00
 #         data      = '\taftr-name\x08mydomain\x03net\x00'
 #
 decode-proto 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
-match Packet-Type = Advertise, Transaction-ID = 0xd81eb8, IA-PD = { IAID = 33752069, T1 = 150, T2 = 250, Options = { IA-PD-Prefix = { Preferred-Lifetime = 250, Valid-Lifetime = 300, IPv6-Prefix = 2a00:1:1:100::/56 } } }, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2012-11-21T08:36:00Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }, Preference = 10, DNS-Servers = 2a01::1, AFTR-Name = "aftr-name.mydomain.net"
+match Packet-Type = ::Advertise, Transaction-ID = 0xd81eb8, IA-PD = { IAID = 33752069, T1 = 150, T2 = 250, Options = { IA-PD-Prefix = { Preferred-Lifetime = 250, Valid-Lifetime = 300, IPv6-Prefix = 2a00:1:1:100::/56 } } }, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2012-11-21T08:36:00Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }, Preference = 10, DNS-Servers = 2a01::1, AFTR-Name = "aftr-name.mydomain.net"
 
 encode-proto -
 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
@@ -154,7 +154,7 @@ 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
 #         |  iaprefopts= ''
 #
 decode-proto 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
-match Packet-Type = Request, Transaction-ID = 0x1e291d, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2012-11-21T08:36:00Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }, Option-Request = DNS-Servers, Option-Request = AFTR-Name, Elapsed-Time = 0, IA-PD = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-PD-Prefix = { Preferred-Lifetime = 7200, Valid-Lifetime = 7500, IPv6-Prefix = 2a00:1:1:100::/56 } } }
+match Packet-Type = ::Request, Transaction-ID = 0x1e291d, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2012-11-21T08:36:00Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }, Option-Request = ::DNS-Servers, Option-Request = ::AFTR-Name, Elapsed-Time = 0, IA-PD = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-PD-Prefix = { Preferred-Lifetime = 7200, Valid-Lifetime = 7500, IPv6-Prefix = 2a00:1:1:100::/56 } } }
 
 encode-proto -
 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
@@ -211,7 +211,7 @@ 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
 #         data      = '\taftr-name\x08mydomain\x03net\x00'
 #
 decode-proto 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
-match Packet-Type = Reply, Transaction-ID = 0x1e291d, IA-PD = { IAID = 33752069, T1 = 150, T2 = 250, Options = { IA-PD-Prefix = { Preferred-Lifetime = 250, Valid-Lifetime = 300, IPv6-Prefix = 2a00:1:1:100::/56 } } }, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2012-11-21T08:36:00Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }, Preference = 10, DNS-Servers = 2a01::1, AFTR-Name = "aftr-name.mydomain.net"
+match Packet-Type = ::Reply, Transaction-ID = 0x1e291d, IA-PD = { IAID = 33752069, T1 = 150, T2 = 250, Options = { IA-PD-Prefix = { Preferred-Lifetime = 250, Valid-Lifetime = 300, IPv6-Prefix = 2a00:1:1:100::/56 } } }, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2012-11-21T08:36:00Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }, Preference = 10, DNS-Servers = 2a01::1, AFTR-Name = "aftr-name.mydomain.net"
 
 encode-proto -
 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

diff --git a/src/tests/unit/protocols/dhcpv6/packet_client_server.txt b/src/tests/unit/protocols/dhcpv6/packet_client_server.txt
index 97914175baa985022b678e78c7a1dcfed566365a..7ebb83b430401277876ee0567d9ff62c41ca2aec 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_client_server.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_client_server.txt
@@ -31,7 +31,7 @@ encode-proto Packet-Type = Solicit, Transaction-ID = 0xabcdef, Rapid-Commit = ye
 match 01 ab cd ef 00 0e 00 00 00 03 00 12 0a bc de f0 00 00 d3 4d 00 00 b3 3f 00 06 00 02 00 ad 00 27 00 0b 04 09 74 61 70 69 6f 63 61 30 31 00 06 00 0a 00 17 00 18 00 38 00 1f 00 0e 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 08 00 02 b3 3f
 
 decode-proto -
-match Packet-Type = Solicit, Transaction-ID = 0xabcdef, Rapid-Commit = yes, IA-NA = { IAID = 180150000, T1 = 54093, T2 = 45887, Options = { Option-Request = 173 } }, Client-FQDN = { Reserved = 0, No-Server-Update = yes, Server-Override = no, Server-Update = no, Domain-Name = "tapioca01" }, Option-Request = DNS-Servers, Option-Request = Domain-List, Option-Request = NTP-Server, Option-Request = SNTP-Servers, Option-Request = Rapid-Commit, Client-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Elapsed-Time = 45887
+match Packet-Type = ::Solicit, Transaction-ID = 0xabcdef, Rapid-Commit = yes, IA-NA = { IAID = 180150000, T1 = 54093, T2 = 45887, Options = { Option-Request = 173 } }, Client-FQDN = { Reserved = 0, No-Server-Update = yes, Server-Override = no, Server-Update = no, Domain-Name = "tapioca01" }, Option-Request = ::DNS-Servers, Option-Request = ::Domain-List, Option-Request = ::NTP-Server, Option-Request = ::SNTP-Servers, Option-Request = ::Rapid-Commit, Client-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Elapsed-Time = 45887
 
 encode-proto -
 match 01 ab cd ef 00 0e 00 00 00 03 00 12 0a bc de f0 00 00 d3 4d 00 00 b3 3f 00 06 00 02 00 ad 00 27 00 0b 04 09 74 61 70 69 6f 63 61 30 31 00 06 00 0a 00 17 00 18 00 38 00 1f 00 0e 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 08 00 02 b3 3f
@@ -53,7 +53,7 @@ encode-proto Packet-Type = Advertise, Transaction-ID = 0xabcdef, Rapid-Commit =
 match 02 ab cd ef 00 0e 00 00 00 02 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 52 00 04 dd cc bb aa 00 17 00 20 28 04 01 4d 2a 73 44 ab 00 00 00 00 00 00 01 23 28 04 01 4d 2a 73 44 ab 00 00 00 00 00 00 04 56 00 18 00 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 00 03 00 12 0a bc de f0 00 00 d3 4d 00 00 b3 3f 00 06 00 02 00 ad 00 05 00 1e fd 85 d2 bb 09 2c 00 01 74 ae 28 71 f5 6c 8d 94 00 00 00 78 00 01 51 80 00 06 00 02 00 ad
 
 decode-proto -
-match Packet-Type = Advertise, Transaction-ID = 0xabcdef, Rapid-Commit = yes, Server-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Client-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, SOL-Max-RT = 3721182122, DNS-Servers = 2804:14d:2a73:44ab::123, DNS-Servers = 2804:14d:2a73:44ab::456, Domain-List = "mydomain1.com", Domain-List = "mydomain2.lan", Domain-List = "corp.mydomain3.co", IA-NA = { IAID = 180150000, T1 = 54093, T2 = 45887, Options = { Option-Request = 173 } }, IA-Addr = { IPv6-Address = fd85:d2bb:92c:1:74ae:2871:f56c:8d94, Preferred-Lifetime = 120, Valid-Lifetime = 86400, Options = { Option-Request = 173 } }
+match Packet-Type = ::Advertise, Transaction-ID = 0xabcdef, Rapid-Commit = yes, Server-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Client-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, SOL-Max-RT = 3721182122, DNS-Servers = 2804:14d:2a73:44ab::123, DNS-Servers = 2804:14d:2a73:44ab::456, Domain-List = "mydomain1.com", Domain-List = "mydomain2.lan", Domain-List = "corp.mydomain3.co", IA-NA = { IAID = 180150000, T1 = 54093, T2 = 45887, Options = { Option-Request = 173 } }, IA-Addr = { IPv6-Address = fd85:d2bb:92c:1:74ae:2871:f56c:8d94, Preferred-Lifetime = 120, Valid-Lifetime = 86400, Options = { Option-Request = 173 } }
 
 encode-proto -
 match 02 ab cd ef 00 0e 00 00 00 02 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 52 00 04 dd cc bb aa 00 17 00 20 28 04 01 4d 2a 73 44 ab 00 00 00 00 00 00 01 23 28 04 01 4d 2a 73 44 ab 00 00 00 00 00 00 04 56 00 18 00 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 00 03 00 12 0a bc de f0 00 00 d3 4d 00 00 b3 3f 00 06 00 02 00 ad 00 05 00 1e fd 85 d2 bb 09 2c 00 01 74 ae 28 71 f5 6c 8d 94 00 00 00 78 00 01 51 80 00 06 00 02 00 ad
@@ -75,7 +75,7 @@ encode-proto Packet-Type = Request, Transaction-ID = 0xc0ffee, Server-ID.DUID =
 match 03 c0 ff ee 00 02 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 03 00 12 0a bc de f0 00 00 d3 4d 00 00 b3 3f 00 06 00 02 00 ad 00 05 00 1e fd 85 d2 bb 09 2c 00 01 74 ae 28 71 f5 6c 8d 94 00 00 00 78 00 01 51 80 00 06 00 02 00 ad 00 27 00 0b 04 09 74 61 70 69 6f 63 61 30 31 00 06 00 0a 00 17 00 18 00 38 00 1f 00 0e 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 08 00 02 b3 3f
 
 decode-proto -
-match Packet-Type = Request, Transaction-ID = 0xc0ffee, Server-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, IA-NA = { IAID = 180150000, T1 = 54093, T2 = 45887, Options = { Option-Request = 173 } }, IA-Addr = { IPv6-Address = fd85:d2bb:92c:1:74ae:2871:f56c:8d94, Preferred-Lifetime = 120, Valid-Lifetime = 86400, Options = { Option-Request = 173 } }, Client-FQDN = { Reserved = 0, No-Server-Update = yes, Server-Override = no, Server-Update = no, Domain-Name = "tapioca01" }, Option-Request = DNS-Servers, Option-Request = Domain-List, Option-Request = NTP-Server, Option-Request = SNTP-Servers, Option-Request = Rapid-Commit, Client-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Elapsed-Time = 45887
+match Packet-Type = ::Request, Transaction-ID = 0xc0ffee, Server-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, IA-NA = { IAID = 180150000, T1 = 54093, T2 = 45887, Options = { Option-Request = 173 } }, IA-Addr = { IPv6-Address = fd85:d2bb:92c:1:74ae:2871:f56c:8d94, Preferred-Lifetime = 120, Valid-Lifetime = 86400, Options = { Option-Request = 173 } }, Client-FQDN = { Reserved = 0, No-Server-Update = yes, Server-Override = no, Server-Update = no, Domain-Name = "tapioca01" }, Option-Request = ::DNS-Servers, Option-Request = ::Domain-List, Option-Request = ::NTP-Server, Option-Request = ::SNTP-Servers, Option-Request = ::Rapid-Commit, Client-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Elapsed-Time = 45887
 
 #
 #  4. Reply (Server -> Client)
@@ -94,7 +94,7 @@ encode-proto Packet-Type = Reply, Transaction-ID = 0xc0ffee, Server-ID.DUID = UU
 match 07 c0 ff ee 00 02 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 52 00 04 00 00 00 3c 00 17 00 20 fd 85 d2 bb 09 2c 00 00 00 00 00 00 00 00 00 01 fd 85 d2 bb 09 2c 00 00 00 00 00 00 00 00 00 02
 
 decode-proto -
-match Packet-Type = Reply, Transaction-ID = 0xc0ffee, Server-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Client-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, SOL-Max-RT = 60, DNS-Servers = fd85:d2bb:92c::1, DNS-Servers = fd85:d2bb:92c::2
+match Packet-Type = ::Reply, Transaction-ID = 0xc0ffee, Server-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Client-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, SOL-Max-RT = 60, DNS-Servers = fd85:d2bb:92c::1, DNS-Servers = fd85:d2bb:92c::2
 
 #
 #  5. Release (Client -> Broadcast)
@@ -112,7 +112,7 @@ encode-proto Packet-Type = Release, Transaction-ID = 0x00b33f, Client-ID.DUID =
 match 08 00 b3 3f 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 02 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 06 00 04 00 17 00 18 00 08 00 02 b3 3f 00 19 00 11 aa bb cc dd 00 00 d3 4d 00 00 b3 3f 00 07 00 01 01
 
 decode-proto -
-match Packet-Type = Release, Transaction-ID = 0x00b33f, Client-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Server-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 45887, IA-PD = { IAID = 2864434397, T1 = 54093, T2 = 45887, Options = { Preference = 1 } }
+match Packet-Type = ::Release, Transaction-ID = 0x00b33f, Client-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Server-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Option-Request = ::DNS-Servers, Option-Request = ::Domain-List, Elapsed-Time = 45887, IA-PD = { IAID = 2864434397, T1 = 54093, T2 = 45887, Options = { Preference = 1 } }
 
 #
 #  6. Reply (Server -> Client)
@@ -128,7 +128,7 @@ encode-proto Packet-Type = Reply, Transaction-ID = 0x00b33f, Client-ID.DUID = UU
 match 07 00 b3 3f 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 02 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 00 0d 00 13 00 00 52 65 6c 65 61 73 65 20 72 65 63 65 69 76 65 64 2e
 
 decode-proto -
-match Packet-Type = Reply, Transaction-ID = 0x00b33f, Client-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Server-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Status-Code = { Value = Success, Message = "Release received." }
+match Packet-Type = ::Reply, Transaction-ID = 0x00b33f, Client-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Server-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }, Status-Code = { Value = ::Success, Message = "Release received." }
 
 count
 match 31

diff --git a/src/tests/unit/protocols/dhcpv6/packet_domain-list.txt b/src/tests/unit/protocols/dhcpv6/packet_domain-list.txt
index de63d4c6ebb37b501e630ee24ddaa79cf2ae5849..ee16432b43a7420128f4f8e85c6ee9f772bfd4c1 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_domain-list.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_domain-list.txt
@@ -43,7 +43,7 @@ fuzzer-out dhcpv6
 #      dnsdomains= ['example.com.', 'sales.example.com.', 'eng.example.com.']
 #
 decode-proto 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
-match Packet-Type = Reply, Transaction-ID = 0xaa56ce, Client-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2013-04-04T09:58:23Z", Hardware-Type.Ethernet = { Address = 00:0c:29:38:f3:68 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2013-04-04T01:34:19Z", Hardware-Type.Ethernet = { Address = 00:0c:29:9b:a1:53 } } }, Domain-List = "example.com", Domain-List = "sales.example.com", Domain-List = "eng.example.com"
+match Packet-Type = ::Reply, Transaction-ID = 0xaa56ce, Client-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2013-04-04T09:58:23Z", Hardware-Type.Ethernet = { Address = 00:0c:29:38:f3:68 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2013-04-04T01:34:19Z", Hardware-Type.Ethernet = { Address = 00:0c:29:9b:a1:53 } } }, Domain-List = "example.com", Domain-List = "sales.example.com", Domain-List = "eng.example.com"
 
 encode-proto -
 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

diff --git a/src/tests/unit/protocols/dhcpv6/packet_ia-na.txt b/src/tests/unit/protocols/dhcpv6/packet_ia-na.txt
index d13448902c0516266c52c03cebe634541ae7aa9d..874bf8fbe2841135f7f5a321379b32df8452e0a5 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_ia-na.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_ia-na.txt
@@ -44,7 +44,7 @@ fuzzer-out dhcpv6
 #       \ianaopts  \
 #
 decode-proto 01 90 b4 5c 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 06 00 04 00 17 00 18 00 08 00 02 00 00 00 03 00 0c 02 03 04 05 00 00 0e 10 00 00 15 18
-match Packet-Type = Solicit, Transaction-ID = 0x90b45c, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA = { IAID = 33752069, T1 = 3600, T2 = 5400 }
+match Packet-Type = ::Solicit, Transaction-ID = 0x90b45c, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Option-Request = ::DNS-Servers, Option-Request = ::Domain-List, Elapsed-Time = 0, IA-NA = { IAID = 33752069, T1 = 3600, T2 = 5400 }
 
 #
 #  2.
@@ -85,7 +85,7 @@ match Packet-Type = Solicit, Transaction-ID = 0x90b45c, Client-ID = { DUID = LL,
 #       |  lladdr    = 00:11:22:33:44:55
 #
 decode-proto 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
-match Packet-Type = Advertise, Transaction-ID = 0x90b45c, IA-NA = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-Addr = { IPv6-Address = 2a00:1:1:200:38e6:b22e:c440:acdf, Preferred-Lifetime = 4500, Valid-Lifetime = 7200 } } }, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2012-11-26T15:34:36Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }
+match Packet-Type = ::Advertise, Transaction-ID = 0x90b45c, IA-NA = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-Addr = { IPv6-Address = 2a00:1:1:200:38e6:b22e:c440:acdf, Preferred-Lifetime = 4500, Valid-Lifetime = 7200 } } }, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2012-11-26T15:34:36Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }
 
 #
 #  3.
@@ -134,7 +134,7 @@ match Packet-Type = Advertise, Transaction-ID = 0x90b45c, IA-NA = { IAID = 33752
 #         |  iaaddropts= ''
 #
 decode-proto 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
-match Packet-Type = Request, Transaction-ID = 0x2ffdd1, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2012-11-26T15:34:36Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-Addr = { IPv6-Address = 2a00:1:1:200:38e6:b22e:c440:acdf, Preferred-Lifetime = 7200, Valid-Lifetime = 7500 } } }
+match Packet-Type = ::Request, Transaction-ID = 0x2ffdd1, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2012-11-26T15:34:36Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }, Option-Request = ::DNS-Servers, Option-Request = ::Domain-List, Elapsed-Time = 0, IA-NA = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-Addr = { IPv6-Address = 2a00:1:1:200:38e6:b22e:c440:acdf, Preferred-Lifetime = 7200, Valid-Lifetime = 7500 } } }
 
 #
 #  4.
@@ -175,7 +175,7 @@ match Packet-Type = Request, Transaction-ID = 0x2ffdd1, Client-ID = { DUID = LL,
 #       |  lladdr    = 00:11:22:33:44:55
 #
 decode-proto 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
-match Packet-Type = Reply, Transaction-ID = 0x2ffdd1, IA-NA = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-Addr = { IPv6-Address = 2a00:1:1:200:38e6:b22e:c440:acdf, Preferred-Lifetime = 4500, Valid-Lifetime = 7200 } } }, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2012-11-26T15:34:36Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }
+match Packet-Type = ::Reply, Transaction-ID = 0x2ffdd1, IA-NA = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-Addr = { IPv6-Address = 2a00:1:1:200:38e6:b22e:c440:acdf, Preferred-Lifetime = 4500, Valid-Lifetime = 7200 } } }, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2012-11-26T15:34:36Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }
 
 count
 match 11

diff --git a/src/tests/unit/protocols/dhcpv6/packet_ia-pd.txt b/src/tests/unit/protocols/dhcpv6/packet_ia-pd.txt
index 8c290624141b42814fb92f36137c57929343c1ba..f18107549a3f24dc1fea464e5580e0d271c9e120 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_ia-pd.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_ia-pd.txt
@@ -44,7 +44,7 @@ fuzzer-out dhcpv6
 #       \iapdopt   \
 #
 decode-proto 01 e1 e0 93 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 06 00 04 00 17 00 18 00 08 00 02 00 00 00 19 00 0c 02 03 04 05 00 00 0e 10 00 00 15 18
-match Packet-Type = Solicit, Transaction-ID = 0xe1e093, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-PD = { IAID = 33752069, T1 = 3600, T2 = 5400 }
+match Packet-Type = ::Solicit, Transaction-ID = 0xe1e093, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Option-Request = ::DNS-Servers, Option-Request = ::Domain-List, Elapsed-Time = 0, IA-PD = { IAID = 33752069, T1 = 3600, T2 = 5400 }
 
 encode-proto -
 match 01 e1 e0 93 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 06 00 04 00 17 00 18 00 08 00 02 00 00 00 19 00 0c 02 03 04 05 00 00 0e 10 00 00 15 18
@@ -89,7 +89,7 @@ match 01 e1 e0 93 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 06 00 04 00 17 00
 #       |  lladdr    = 00:11:22:33:44:55
 #
 decode-proto 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
-match Packet-Type = Advertise, Transaction-ID = 0xe1e093, IA-PD = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-PD-Prefix = { Preferred-Lifetime = 4500, Valid-Lifetime = 7200, IPv6-Prefix = 2a00:1:1:100::/56 } } }, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2012-11-26T15:39:05Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }
+match Packet-Type = ::Advertise, Transaction-ID = 0xe1e093, IA-PD = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-PD-Prefix = { Preferred-Lifetime = 4500, Valid-Lifetime = 7200, IPv6-Prefix = 2a00:1:1:100::/56 } } }, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2012-11-26T15:39:05Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }
 
 encode-proto -
 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
@@ -143,7 +143,7 @@ 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
 #         |  iaprefopts= ''
 #
 decode-proto 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
-match Packet-Type = Request, Transaction-ID = 0x12b08a, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2012-11-26T15:39:05Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-PD = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-PD-Prefix = { Preferred-Lifetime = 7200, Valid-Lifetime = 7500, IPv6-Prefix = 2a00:1:1:100::/56 } } }
+match Packet-Type = ::Request, Transaction-ID = 0x12b08a, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2012-11-26T15:39:05Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }, Option-Request = ::DNS-Servers, Option-Request = ::Domain-List, Elapsed-Time = 0, IA-PD = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-PD-Prefix = { Preferred-Lifetime = 7200, Valid-Lifetime = 7500, IPv6-Prefix = 2a00:1:1:100::/56 } } }
 
 encode-proto -
 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
@@ -188,7 +188,7 @@ 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
 #       |  lladdr    = 00:11:22:33:44:55
 #
 decode-proto 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
-match Packet-Type = Reply, Transaction-ID = 0x12b08a, IA-PD = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-PD-Prefix = { Preferred-Lifetime = 4500, Valid-Lifetime = 7200, IPv6-Prefix = 2a00:1:1:100::/56 } } }, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2012-11-26T15:39:05Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }
+match Packet-Type = ::Reply, Transaction-ID = 0x12b08a, IA-PD = { IAID = 33752069, T1 = 3600, T2 = 5400, Options = { IA-PD-Prefix = { Preferred-Lifetime = 4500, Valid-Lifetime = 7200, IPv6-Prefix = 2a00:1:1:100::/56 } } }, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2012-11-26T15:39:05Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }
 
 encode-proto -
 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

diff --git a/src/tests/unit/protocols/dhcpv6/packet_ia-ta.txt b/src/tests/unit/protocols/dhcpv6/packet_ia-ta.txt
index 3b2a170f2f47aa6f36a89b5d361c902ce2321502..e2ef332aa2352a0ca9c78642c3f4bbb8fda6118c 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_ia-ta.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_ia-ta.txt
@@ -42,7 +42,7 @@ fuzzer-out dhcpv6
 #       \iataopts  \
 #
 decode-proto 01 28 b0 40 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 06 00 04 00 17 00 18 00 08 00 02 00 00 00 04 00 04 02 03 04 05
-match Packet-Type = Solicit, Transaction-ID = 0x28b040, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-TA = { IAID = 33752069 }
+match Packet-Type = ::Solicit, Transaction-ID = 0x28b040, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Option-Request = ::DNS-Servers, Option-Request = ::Domain-List, Elapsed-Time = 0, IA-TA = { IAID = 33752069 }
 
 encode-proto -
 match 01 28 b0 40 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 06 00 04 00 17 00 18 00 08 00 02 00 00 00 04 00 04 02 03 04 05
@@ -84,7 +84,7 @@ match 01 28 b0 40 00 01 00 0a 00 03 00 01 00 01 02 03 04 05 00 06 00 04 00 17 00
 #       |  lladdr    = 00:11:22:33:44:55
 #
 decode-proto 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
-match Packet-Type = Advertise, Transaction-ID = 0x28b040, IA-TA = { IAID = 33752069, Options = { IA-Addr = { IPv6-Address = 2a00:1:1:200:5da2:f920:84c4:88cc, Preferred-Lifetime = 4500, Valid-Lifetime = 7200 } } }, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2012-11-26T15:32:00Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }
+match Packet-Type = ::Advertise, Transaction-ID = 0x28b040, IA-TA = { IAID = 33752069, Options = { IA-Addr = { IPv6-Address = 2a00:1:1:200:5da2:f920:84c4:88cc, Preferred-Lifetime = 4500, Valid-Lifetime = 7200 } } }, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2012-11-26T15:32:00Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }
 
 encode-proto -
 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
@@ -134,7 +134,7 @@ 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
 #         |  iaaddropts= ''
 #
 decode-proto 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
-match Packet-Type = Request, Transaction-ID = 0x2b0e45, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2012-11-26T15:32:00Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }, Option-Request = DNS-Servers, Option-Request = Domain-List, Elapsed-Time = 0, IA-TA = { IAID = 33752069, Options = { IA-Addr = { IPv6-Address = 2a00:1:1:200:5da2:f920:84c4:88cc, Preferred-Lifetime = 7200, Valid-Lifetime = 7500 } } }
+match Packet-Type = ::Request, Transaction-ID = 0x2b0e45, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2012-11-26T15:32:00Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }, Option-Request = ::DNS-Servers, Option-Request = ::Domain-List, Elapsed-Time = 0, IA-TA = { IAID = 33752069, Options = { IA-Addr = { IPv6-Address = 2a00:1:1:200:5da2:f920:84c4:88cc, Preferred-Lifetime = 7200, Valid-Lifetime = 7500 } } }
 
 encode-proto -
 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
@@ -176,7 +176,7 @@ 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
 #       |  lladdr    = 00:11:22:33:44:55
 #
 decode-proto 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
-match Packet-Type = Reply, Transaction-ID = 0x2b0e45, IA-TA = { IAID = 33752069, Options = { IA-Addr = { IPv6-Address = 2a00:1:1:200:5da2:f920:84c4:88cc, Preferred-Lifetime = 4500, Valid-Lifetime = 7200 } } }, Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2012-11-26T15:32:00Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }
+match Packet-Type = ::Reply, Transaction-ID = 0x2b0e45, IA-TA = { IAID = 33752069, Options = { IA-Addr = { IPv6-Address = 2a00:1:1:200:5da2:f920:84c4:88cc, Preferred-Lifetime = 4500, Valid-Lifetime = 7200 } } }, Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2012-11-26T15:32:00Z", Hardware-Type.Ethernet = { Address = 00:11:22:33:44:55 } } }
 
 encode-proto -
 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

diff --git a/src/tests/unit/protocols/dhcpv6/packet_ntp-server.txt b/src/tests/unit/protocols/dhcpv6/packet_ntp-server.txt
index 7744db266dd9b45cdf6e6c977540946443c52a74..73810cd0db69289754b64ed0397d0bedb3bb25d4 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_ntp-server.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_ntp-server.txt
@@ -43,7 +43,7 @@ fuzzer-out dhcpv6
 #      data      = '\x00\x01\x00\x10*\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x02\x00\x10\xff\x05\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x01\x00\x03\x00\x11\x03ntp\x07example\x03com\x00'
 #
 decode-proto 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
-match Packet-Type = Reply, Transaction-ID = 0xf69b57, Client-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2013-04-04T09:58:23Z", Hardware-Type.Ethernet = { Address = 00:0c:29:38:f3:68 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2013-04-04T01:34:19Z", Hardware-Type.Ethernet = { Address = 00:0c:29:9b:a1:53 } } }, NTP-Server = { Address = 2a01::1, Multicast-Address = ff05::101, FQDN = "ntp.example.com" }
+match Packet-Type = ::Reply, Transaction-ID = 0xf69b57, Client-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2013-04-04T09:58:23Z", Hardware-Type.Ethernet = { Address = 00:0c:29:38:f3:68 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2013-04-04T01:34:19Z", Hardware-Type.Ethernet = { Address = 00:0c:29:9b:a1:53 } } }, NTP-Server = { Address = 2a01::1, Multicast-Address = ff05::101, FQDN = "ntp.example.com" }
 
 encode-proto -
 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

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 686660f4e268d159a4339d855de0f0bd78f17f20..a4de0f3aee9530bdc61df21a012575f80c225855 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/packet_sip-server-d.txt
+++ b/src/tests/unit/protocols/dhcpv6/packet_sip-server-d.txt
@@ -43,7 +43,7 @@ fuzzer-out dhcpv6
 #      sipdomains= ['sip1.my-domain.net.', 'sip2.example.com.', 'sip3.sub.my-domain.org.']
 #
 decode-proto 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
-match Packet-Type = Reply, Transaction-ID = 0x6890d8, Client-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2013-04-04T09:58:23Z", Hardware-Type.Ethernet = { Address = 00:0c:29:38:f3:68 } } }, Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2013-04-04T01:34:19Z", Hardware-Type.Ethernet = { Address = 00:0c:29:9b:a1:53 } } }, 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 = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2013-04-04T09:58:23Z", Hardware-Type.Ethernet = { Address = 00:0c:29:38:f3:68 } } }, Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2013-04-04T01:34:19Z", Hardware-Type.Ethernet = { Address = 00:0c:29:9b:a1:53 } } }, 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"
 
 encode-proto -
 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

diff --git a/src/tests/unit/protocols/dhcpv6/relay_forward.txt b/src/tests/unit/protocols/dhcpv6/relay_forward.txt
index a38472eb40176ae8bbdd09ec1e11d4712d482df6..6f20052e09214e8f0f7616cc5aae797ac0322304 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/relay_forward.txt
+++ b/src/tests/unit/protocols/dhcpv6/relay_forward.txt
@@ -16,10 +16,10 @@ fuzzer-out dhcpv6
 #
 
 decode-proto 0c 01 26 05 86 00 00 06 80 00 00 00 00 00 00 00 00 00 fe 80 00 00 00 00 00 00 02 50 56 ff fe a3 53 fe 00 09 00 c4 0c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 fe 80 00 00 00 00 00 00 02 50 56 ff fe a3 53 fe 00 12 00 1c 4c 41 42 4f 4c 54 32 20 65 74 68 20 31 2f 31 2f 30 35 2f 30 31 2f 32 38 2f 31 2f 31 00 09 00 7e 01 11 41 d7 00 01 00 0e 00 01 00 01 26 b1 b7 f1 00 50 56 a3 53 fe 00 12 00 1c 4c 41 42 4f 4c 54 32 20 65 74 68 20 31 2f 31 2f 30 35 2f 30 31 2f 32 38 2f 31 2f 31 00 06 00 02 00 18 00 08 00 02 00 00 00 03 00 28 56 a3 53 fe 00 00 0e 10 00 00 15 18 00 05 00 18 26 05 86 00 00 06 40 00 00 00 00 00 00 00 00 01 00 00 1c 20 00 00 2a 30 00 19 00 0c 56 a3 53 fe 00 00 0e 10 00 00 15 18 00 25 00 12 00 00 19 7f 00 01 00 01 26 b1 b7 f1 00 50 56 a3 53 fe 00 11 00 2a 00 00 19 7f 00 01 00 0a 4c 41 42 4f 4c 54 32 2d 6e 61 00 02 00 0a 4c 41 42 4f 4c 54 32 2d 70 64 00 03 00 01 3f 00 04 00 01 40
-match Packet-Type = Relay-Forward, Hop-Count = 1, Relay-Link-Address = 2605:8600:6:8000::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Relay-Message = { Packet-Type = Relay-Forward, Hop-Count = 0, Relay-Link-Address = ::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Relay-Message = { Packet-Type = Solicit, Transaction-ID = 0x1141d7, Client-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2020-07-27T16:06:09Z", Hardware-Type.Ethernet = { Address = 00:50:56:a3:53:fe } } }, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA = { IAID = 1453544446, T1 = 3600, T2 = 5400, Options = { IA-Addr = { IPv6-Address = 2605:8600:6:4000::1, Preferred-Lifetime = 7200, Valid-Lifetime = 10800 } } }, IA-PD = { IAID = 1453544446, T1 = 3600, T2 = 5400 } } }, Relay-Agent-Remote-ID = { Vendor = 6527, Value = 0x0001000126b1b7f1005056a353fe }, Vendor-Opts = { Nokia-SR = { WAN-Pool = "LABOLT2-na", PFX-Pool = "LABOLT2-pd", PFX-Len = 63, Reserved-NA-Len = 64 } }
+match Packet-Type = ::Relay-Forward, Hop-Count = 1, Relay-Link-Address = 2605:8600:6:8000::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Relay-Message = { Packet-Type = ::Relay-Forward, Hop-Count = 0, Relay-Link-Address = ::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Relay-Message = { Packet-Type = ::Solicit, Transaction-ID = 0x1141d7, Client-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2020-07-27T16:06:09Z", Hardware-Type.Ethernet = { Address = 00:50:56:a3:53:fe } } }, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Option-Request = ::Domain-List, Elapsed-Time = 0, IA-NA = { IAID = 1453544446, T1 = 3600, T2 = 5400, Options = { IA-Addr = { IPv6-Address = 2605:8600:6:4000::1, Preferred-Lifetime = 7200, Valid-Lifetime = 10800 } } }, IA-PD = { IAID = 1453544446, T1 = 3600, T2 = 5400 } } }, Relay-Agent-Remote-ID = { Vendor = 6527, Value = 0x0001000126b1b7f1005056a353fe }, Vendor-Opts = { Nokia-SR = { WAN-Pool = "LABOLT2-na", PFX-Pool = "LABOLT2-pd", PFX-Len = 63, Reserved-NA-Len = 64 } }
 
 decode-proto 0c 01 26 05 86 00 00 06 80 00 00 00 00 00 00 00 00 00 fe 80 00 00 00 00 00 00 02 50 56 ff fe a3 53 fe 00 09 00 c4 0c 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 fe 80 00 00 00 00 00 00 02 50 56 ff fe a3 53 fe 00 12 00 1c 4c 41 42 4f 4c 54 32 20 65 74 68 20 31 2f 31 2f 30 35 2f 30 31 2f 32 38 2f 31 2f 31 00 09 00 7e 01 11 41 d7 00 01 00 0e 00 01 00 01 26 b1 b7 f1 00 50 56 a3 53 fe 00 12 00 1c 4c 41 42 4f 4c 54 32 20 65 74 68 20 31 2f 31 2f 30 35 2f 30 31 2f 32 38 2f 31 2f 31 00 06 00 02 00 18 00 08 00 02 00 00 00 03 00 28 56 a3 53 fe 00 00 0e 10 00 00 15 18 00 05 00 18 26 05 86 00 00 06 40 00 00 00 00 00 00 00 00 01 00 00 1c 20 00 00 2a 30 00 19 00 0c 56 a3 53 fe 00 00 0e 10 00 00 15 18 00 25 00 12 00 00 19 7f 00 01 00 01 26 b1 b7 f1 00 50 56 a3 53 fe 00 11 00 12 00 00 19 7f 00 01 00 0a 4c 41 42 4f 4c 54 32 2d 6e 61 00 11 00 12 00 00 19 7f 00 02 00 0a 4c 41 42 4f 4c 54 32 2d 70 64 00 11 00 09 00 00 19 7f 00 03 00 01 3f 00 11 00 09 00 00 19 7f 00 04 00 01 40
-match Packet-Type = Relay-Forward, Hop-Count = 1, Relay-Link-Address = 2605:8600:6:8000::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Relay-Message = { Packet-Type = Relay-Forward, Hop-Count = 0, Relay-Link-Address = ::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Relay-Message = { Packet-Type = Solicit, Transaction-ID = 0x1141d7, Client-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2020-07-27T16:06:09Z", Hardware-Type.Ethernet = { Address = 00:50:56:a3:53:fe } } }, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA = { IAID = 1453544446, T1 = 3600, T2 = 5400, Options = { IA-Addr = { IPv6-Address = 2605:8600:6:4000::1, Preferred-Lifetime = 7200, Valid-Lifetime = 10800 } } }, IA-PD = { IAID = 1453544446, T1 = 3600, T2 = 5400 } } }, Relay-Agent-Remote-ID = { Vendor = 6527, Value = 0x0001000126b1b7f1005056a353fe }, Vendor-Opts = { Nokia-SR = { WAN-Pool = "LABOLT2-na", PFX-Pool = "LABOLT2-pd", PFX-Len = 63, Reserved-NA-Len = 64 } }
+match Packet-Type = ::Relay-Forward, Hop-Count = 1, Relay-Link-Address = 2605:8600:6:8000::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Relay-Message = { Packet-Type = ::Relay-Forward, Hop-Count = 0, Relay-Link-Address = ::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Relay-Message = { Packet-Type = ::Solicit, Transaction-ID = 0x1141d7, Client-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2020-07-27T16:06:09Z", Hardware-Type.Ethernet = { Address = 00:50:56:a3:53:fe } } }, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Option-Request = ::Domain-List, Elapsed-Time = 0, IA-NA = { IAID = 1453544446, T1 = 3600, T2 = 5400, Options = { IA-Addr = { IPv6-Address = 2605:8600:6:4000::1, Preferred-Lifetime = 7200, Valid-Lifetime = 10800 } } }, IA-PD = { IAID = 1453544446, T1 = 3600, T2 = 5400 } } }, Relay-Agent-Remote-ID = { Vendor = 6527, Value = 0x0001000126b1b7f1005056a353fe }, Vendor-Opts = { Nokia-SR = { WAN-Pool = "LABOLT2-na", PFX-Pool = "LABOLT2-pd", PFX-Len = 63, Reserved-NA-Len = 64 } }
 
 #
 #  This doesn't encode to the longer string above, as we pack multiple Vendor-Opts into one option
@@ -31,7 +31,7 @@ match  0c 01 26 05 86 00 00 06 80 00 00 00 00 00 00 00 00 00 fe 80 00 00 00 00 0
 #  Yes, this is exactly the same massive text blob as above. :)
 #
 decode-proto -
-match Packet-Type = Relay-Forward, Hop-Count = 1, Relay-Link-Address = 2605:8600:6:8000::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Relay-Message = { Packet-Type = Relay-Forward, Hop-Count = 0, Relay-Link-Address = ::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Relay-Message = { Packet-Type = Solicit, Transaction-ID = 0x1141d7, Client-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2020-07-27T16:06:09Z", Hardware-Type.Ethernet = { Address = 00:50:56:a3:53:fe } } }, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Option-Request = Domain-List, Elapsed-Time = 0, IA-NA = { IAID = 1453544446, T1 = 3600, T2 = 5400, Options = { IA-Addr = { IPv6-Address = 2605:8600:6:4000::1, Preferred-Lifetime = 7200, Valid-Lifetime = 10800 } } }, IA-PD = { IAID = 1453544446, T1 = 3600, T2 = 5400 } } }, Relay-Agent-Remote-ID = { Vendor = 6527, Value = 0x0001000126b1b7f1005056a353fe }, Vendor-Opts = { Nokia-SR = { WAN-Pool = "LABOLT2-na", PFX-Pool = "LABOLT2-pd", PFX-Len = 63, Reserved-NA-Len = 64 } }
+match Packet-Type = ::Relay-Forward, Hop-Count = 1, Relay-Link-Address = 2605:8600:6:8000::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Relay-Message = { Packet-Type = ::Relay-Forward, Hop-Count = 0, Relay-Link-Address = ::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Relay-Message = { Packet-Type = ::Solicit, Transaction-ID = 0x1141d7, Client-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2020-07-27T16:06:09Z", Hardware-Type.Ethernet = { Address = 00:50:56:a3:53:fe } } }, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Option-Request = ::Domain-List, Elapsed-Time = 0, IA-NA = { IAID = 1453544446, T1 = 3600, T2 = 5400, Options = { IA-Addr = { IPv6-Address = 2605:8600:6:4000::1, Preferred-Lifetime = 7200, Valid-Lifetime = 10800 } } }, IA-PD = { IAID = 1453544446, T1 = 3600, T2 = 5400 } } }, Relay-Agent-Remote-ID = { Vendor = 6527, Value = 0x0001000126b1b7f1005056a353fe }, Vendor-Opts = { Nokia-SR = { WAN-Pool = "LABOLT2-na", PFX-Pool = "LABOLT2-pd", PFX-Len = 63, Reserved-NA-Len = 64 } }
 
 count
 match 11

diff --git a/src/tests/unit/protocols/dhcpv6/relay_reply.txt b/src/tests/unit/protocols/dhcpv6/relay_reply.txt
index eb7fb9ad5c5d440be0adc4d307a2477f0333cc2e..aff6de2f05551a809f8cafb6640cb9c361944c4b 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/relay_reply.txt
+++ b/src/tests/unit/protocols/dhcpv6/relay_reply.txt
@@ -15,7 +15,7 @@ encode-proto Packet-Type = Relay-Reply, Hop-Count = 1, Relay-Link-Address = 2605
 match 0d 01 26 05 86 00 00 06 80 00 00 00 00 00 00 00 00 00 fe 80 00 00 00 00 00 00 02 50 56 ff fe a3 53 fe 00 12 00 0d 6c 61 67 2d 37 3a 31 30 35 2e 31 32 38 00 09 00 5c 0d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 fe 80 00 00 00 00 00 00 02 50 56 ff fe a3 53 fe 00 12 00 1c 4c 41 42 4f 4c 54 32 20 65 74 68 20 31 2f 31 2f 30 35 2f 30 31 2f 32 38 2f 31 2f 31 00 09 00 16 02 95 08 06 00 01 00 0e 00 01 00 01 26 b1 b7 f1 00 50 56 a3 53 fe
 
 decode-proto -
-match Packet-Type = Relay-Reply, Hop-Count = 1, Relay-Link-Address = 2605:8600:6:8000::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x6c61672d373a3130352e313238, Relay-Message = { Packet-Type = Relay-Reply, Hop-Count = 0, Relay-Link-Address = ::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Relay-Message = { Packet-Type = Advertise, Transaction-ID = 0x950806, Client-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2020-07-27T16:06:09Z", Hardware-Type.Ethernet = { Address = 00:50:56:a3:53:fe } } } } }
+match Packet-Type = ::Relay-Reply, Hop-Count = 1, Relay-Link-Address = 2605:8600:6:8000::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x6c61672d373a3130352e313238, Relay-Message = { Packet-Type = ::Relay-Reply, Hop-Count = 0, Relay-Link-Address = ::, Relay-Peer-Address = fe80::250:56ff:fea3:53fe, Interface-ID = 0x4c41424f4c54322065746820312f312f30352f30312f32382f312f31, Relay-Message = { Packet-Type = ::Advertise, Transaction-ID = 0x950806, Client-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2020-07-27T16:06:09Z", Hardware-Type.Ethernet = { Address = 00:50:56:a3:53:fe } } } } }
 
 count
 match 7

diff --git a/src/tests/unit/protocols/dhcpv6/rfc3315.txt b/src/tests/unit/protocols/dhcpv6/rfc3315.txt
index 28bc88b1a259adc578ab6c65d892aa673fcd4d11..d22635abdddc1d29d0f3504bcc2274e3adf22b35 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/rfc3315.txt
+++ b/src/tests/unit/protocols/dhcpv6/rfc3315.txt
@@ -47,7 +47,7 @@ encode-pair Client-ID.DUID = LLT, Client-ID.DUID.LLT.Hardware-Type = 1, Client-I
 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 = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2000-01-01T12:00:00Z", Hardware-Type.Ethernet = { Address = aa:bb:cc:dd:ee:ff } } }
+match Client-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2000-01-01T12:00:00Z", Hardware-Type.Ethernet = { Address = aa:bb:cc:dd:ee:ff } } }
 
 #
 #  Server Identifier
@@ -58,7 +58,7 @@ encode-pair Server-ID.DUID = LLT, Server-ID.DUID.LLT.Hardware-Type = Ethernet, S
 match 00 02 00 0e 00 01 00 01 00 00 a8 c0 c0 ff ee c0 ff ee
 
 decode-pair -
-match Server-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2000-01-01T12:00:00Z", Hardware-Type.Ethernet = { Address = c0:ff:ee:c0:ff:ee } } }
+match Server-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2000-01-01T12:00:00Z", Hardware-Type.Ethernet = { Address = c0:ff:ee:c0:ff:ee } } }
 
 #
 #  9.3. DUID Assigned by Vendor Based on Enterprise Number [DUID-EN]
@@ -85,7 +85,7 @@ encode-pair Client-ID.DUID = EN, Client-ID.DUID.EN.Enterprise-Number = 11344, Cl
 match 00 01 00 0c 00 02 00 00 2c 50 aa bb cc dd ee ff
 
 decode-pair -
-match Client-ID = { DUID = EN, DUID.EN = { Enterprise-Number = 11344, Identifier = 0xaabbccddeeff } }
+match Client-ID = { DUID = ::EN, DUID.EN = { Enterprise-Number = 11344, Identifier = 0xaabbccddeeff } }
 
 #
 #  Server Identifier
@@ -96,7 +96,7 @@ encode-pair Server-ID.DUID = EN, Server-ID.DUID.EN.Enterprise-Number = 11344, Se
 match 00 02 00 0c 00 02 00 00 2c 50 c0 ff ee c0 ff ee
 
 decode-pair -
-match Server-ID = { DUID = EN, DUID.EN = { Enterprise-Number = 11344, Identifier = 0xc0ffeec0ffee } }
+match Server-ID = { DUID = ::EN, DUID.EN = { Enterprise-Number = 11344, Identifier = 0xc0ffeec0ffee } }
 
 #
 #  9.4. DUID Based on Link-layer Address [DUID-LL]
@@ -121,7 +121,7 @@ encode-pair Client-ID.DUID = LL, Client-ID.DUID.LL.Hardware-Type = Ethernet, Cli
 match 00 01 00 0a 00 03 00 01 aa bb cc dd ee ff
 
 decode-pair -
-match Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = aa:bb:cc:dd:ee:ff } } }
+match Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = aa:bb:cc:dd:ee:ff } } }
 
 #
 #  Server Identifier
@@ -132,7 +132,7 @@ encode-pair Server-ID.DUID = LL, Server-ID.DUID.LL.Hardware-Type = Ethernet, Ser
 match 00 02 00 0a 00 03 00 01 d3 4d 00 c0 ff ee
 
 decode-pair -
-match Server-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = d3:4d:00:c0:ff:ee } } }
+match Server-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = d3:4d:00:c0:ff:ee } } }
 
 #
 #  And unknown hardware types: hardware type 255 is unassigned
@@ -143,7 +143,7 @@ match Server-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Ty
 #  this will likely be easier to do once we have real nested TLVs / groups
 #
 decode-pair 00 02 00 0a 00 03 00 ff d3 4d 00 c0 ff ee
-match Server-ID = { DUID = LL, raw.DUID.LL = 0x00ffd34d00c0ffee }
+match Server-ID = { DUID = ::LL, raw.DUID.LL = 0x00ffd34d00c0ffee }
 
 count
 match 29

diff --git a/src/tests/unit/protocols/dhcpv6/rfc4776.txt b/src/tests/unit/protocols/dhcpv6/rfc4776.txt
index 1b7e5b54befb0d29fdcbf4717e18e4431122478d..e054f5f666a1c836a9cd02fae2f3a78acd767958 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/rfc4776.txt
+++ b/src/tests/unit/protocols/dhcpv6/rfc4776.txt
@@ -16,7 +16,7 @@ encode-pair Geoconf-Civic = { What = Client-Location, Country-Code = "CA", Civic
 match 00 24 00 07 02 43 41 01 02 4f 4e
 
 decode-pair -
-match Geoconf-Civic = { What = Client-Location, Country-Code = "CA", Civic-Address-Elements = 0x01024f4e }
+match Geoconf-Civic = { What = ::Client-Location, Country-Code = "CA", Civic-Address-Elements = 0x01024f4e }
 
 count
 match 7

diff --git a/src/tests/unit/protocols/dhcpv6/rfc6225.txt b/src/tests/unit/protocols/dhcpv6/rfc6225.txt
index 8e02a39a3ea56b743e866de41f9f710b9d54173a..e3559505659e7697648fa63fdbf5fa78305a04bf 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/rfc6225.txt
+++ b/src/tests/unit/protocols/dhcpv6/rfc6225.txt
@@ -88,6 +88,6 @@ encode-pair GeoLocation.Latitude-Uncertainty = 1, GeoLocation.Latitude = 0x4235a
 match 00 3f 00 10 04 42 35 af a6 04 c2 97 64 f6 10 40 00 00 63 42
 
 decode-pair -
-match Geolocation = { Latitude-Uncertainty = 1, Latitude = 1110814630, Longitude-Uncertainty = 1, Longitude = 3264701686, Altitude-Type = Meters, Altitude-Uncertainty = 1, Altitude = 99, Version = 1, Reserved = 0, Datum = NAD83-NAVD88 }
+match Geolocation = { Latitude-Uncertainty = 1, Latitude = 1110814630, Longitude-Uncertainty = 1, Longitude = 3264701686, Altitude-Type = ::Meters, Altitude-Uncertainty = 1, Altitude = 99, Version = 1, Reserved = 0, Datum = ::NAD83-NAVD88 }
 count
 match 7

diff --git a/src/tests/unit/protocols/dhcpv6/rfc6355.txt b/src/tests/unit/protocols/dhcpv6/rfc6355.txt
index bbe0dcfdef49c339e01168de51d08f0358726508..101b30bb3d1228b5509b2bb93403118a1b40b414 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/rfc6355.txt
+++ b/src/tests/unit/protocols/dhcpv6/rfc6355.txt
@@ -51,14 +51,14 @@ encode-pair Client-ID.DUID = UUID
 match 00 01 00 02 00 04
 
 decode-pair -
-match Client-ID = { DUID = UUID }
+match Client-ID = { DUID = ::UUID }
 
 #  Encode a 16-octet UUID
 encode-pair Client-ID.DUID = UUID, Client-ID.DUID.UUID.Value = 0x000102030405060708090a0b0c0d0e0f
 match 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
 
 decode-pair -
-match Client-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
+match Client-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
 
 #  UUID-Value field is 16 octets.  So we truncate if if it's too long, and pad it with zeros if it's too short.
 encode-pair Client-ID.DUID = UUID, Client-ID.DUID.UUID.Value = 0x000102030405060708090a0b0c0d0e0f1112
@@ -66,7 +66,7 @@ match 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
 
 #  But if we decode something that's too long, we ignore the extra data
 decode-pair -
-match Client-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
+match Client-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
 
 #  Or we pad the UUID to 16 octets if it's too short
 encode-pair Client-ID.DUID = UUID, Client-ID.DUID.UUID.Value = 0x000102030405060708090a0b0c0d
@@ -74,7 +74,7 @@ match 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 00 00
 
 #  And if we see something that's too short, we get a bad attribute.
 decode-pair 00 01 00 10 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d
-match Client-ID = { DUID = UUID, raw.DUID.UUID = 0x000102030405060708090a0b0c0d }
+match Client-ID = { DUID = ::UUID, raw.DUID.UUID = 0x000102030405060708090a0b0c0d }
 
 #
 #  Server Identifier
@@ -85,14 +85,14 @@ encode-pair Server-ID.DUID = UUID
 match 00 02 00 02 00 04
 
 decode-pair -
-match Server-ID = { DUID = UUID }
+match Server-ID = { DUID = ::UUID }
 
 #  Encode a 16-octet UUID
 encode-pair Server-ID.DUID = UUID, Server-ID.DUID.UUID.Value = 0x000102030405060708090a0b0c0d0e0f
 match 00 02 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
 
 decode-pair -
-match Server-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
+match Server-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
 
 #  UUID-Value field is 16 octets.  So we truncate if if it's too long, and pad it with zeros if it's too short.
 encode-pair Server-ID.DUID = UUID, Server-ID.DUID.UUID.Value = 0x000102030405060708090a0b0c0d0e0f1112
@@ -100,18 +100,18 @@ match 00 02 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
 
 #  But if we decode something that's too long, we ignore the extra data
 decode-pair -
-match Server-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
+match Server-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
 
 #  Or we pad the UUID to 16 octets if it's too short
 encode-pair Server-ID.DUID = UUID, Server-ID.DUID.UUID.Value = 0x000102030405060708090a0b0c0d
 match 00 02 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 00 00
 
 decode-pair -
-match Server-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0000 } }
+match Server-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0000 } }
 
 #  And if we see something that's too short, we get a bad attribute.
 decode-pair 00 02 00 10 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d
-match Server-ID = { DUID = UUID, raw.DUID.UUID = 0x000102030405060708090a0b0c0d }
+match Server-ID = { DUID = ::UUID, raw.DUID.UUID = 0x000102030405060708090a0b0c0d }
 
 count
 match 37

diff --git a/src/tests/unit/protocols/dhcpv6/rfc6731.txt b/src/tests/unit/protocols/dhcpv6/rfc6731.txt
index fdbe9ddfb05e149370b1b01ee26c23a071768a86..2558607153abf40ffa95662156e815b0409f25f3 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/rfc6731.txt
+++ b/src/tests/unit/protocols/dhcpv6/rfc6731.txt
@@ -32,7 +32,7 @@ encode-pair RDNSS-Selection = { DNS-Recursive-Name-Server = ::1, Preference = Hi
 match 00 4a 00 22 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 01 03 6e 73 31 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00
 
 decode-pair -
-match RDNSS-Selection = { DNS-Recursive-Name-Server = ::1, Preference = High, FQDN = "ns1.example.com" }
+match RDNSS-Selection = { DNS-Recursive-Name-Server = ::1, Preference = ::High, FQDN = "ns1.example.com" }
 
 #
 #  RFC 8415 Section 10 says that DNS labels MUST NOT be stored in compressed form.
@@ -41,7 +41,7 @@ encode-pair RDNSS-Selection = { DNS-Recursive-Name-Server = ::1, Preference = Hi
 match 00 4a 00 33 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 01 03 6e 73 31 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00 03 6e 73 32 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00
 
 decode-pair -
-match RDNSS-Selection = { DNS-Recursive-Name-Server = ::1, Preference = High, FQDN = "ns1.example.com", FQDN = "ns2.example.com" }
+match RDNSS-Selection = { DNS-Recursive-Name-Server = ::1, Preference = ::High, FQDN = "ns1.example.com", FQDN = "ns2.example.com" }
 
 count
 match 11

diff --git a/src/tests/unit/protocols/dhcpv6/rfc6939.txt b/src/tests/unit/protocols/dhcpv6/rfc6939.txt
index 8ac1a871484ef5b024e8407c941b27938ef371a5..7f56e621aa8c52a9ecb332d5e5266f694a633d4b 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/rfc6939.txt
+++ b/src/tests/unit/protocols/dhcpv6/rfc6939.txt
@@ -43,14 +43,14 @@ encode-pair Client-Link-Layer.Type = Ethernet, Client-Link-Layer.Type.Ethernet.A
 match 00 4f 00 08 00 01 c0 ff ee c0 ff ee
 
 decode-pair 00 4f 00 08 00 01 c0 ff ee c0 ff ee
-match Client-Link-Layer = { Type = Ethernet, Type.Ethernet = { Address = c0:ff:ee:c0:ff:ee } }
+match Client-Link-Layer = { Type = ::Ethernet, Type.Ethernet = { Address = c0:ff:ee:c0:ff:ee } }
 
 # type: Lanstar
 encode-pair Client-Link-Layer.Type = Lanstar, Client-Link-Layer.Type.Lanstar.Address = 0xc0ffeec0ffee
 match 00 4f 00 08 00 09 c0 ff ee c0 ff ee
 
 decode-pair -
-match Client-Link-Layer = { Type = Lanstar, Type.Lanstar = { Address = 0xc0ffeec0ffee } }
+match Client-Link-Layer = { Type = ::Lanstar, Type.Lanstar = { Address = 0xc0ffeec0ffee } }
 
 count
 match 11

diff --git a/src/tests/unit/protocols/dhcpv6/rfc8415.txt b/src/tests/unit/protocols/dhcpv6/rfc8415.txt
index 96fc064eacd3ed540df7b3c8ed19a387008808a7..d566188689ad9eef365c1ae3c38a1ad6a9452ca8 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/rfc8415.txt
+++ b/src/tests/unit/protocols/dhcpv6/rfc8415.txt
@@ -109,7 +109,7 @@ encode-pair Client-ID.DUID = UUID, Client-ID.DUID.UUID.Value = 0x000102030405060
 match 00 01 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
 
 decode-pair -
-match Client-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
+match Client-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
 
 #
 #  21.3. Server Identifier Option
@@ -141,7 +141,7 @@ encode-pair Server-ID.DUID = UUID, Server-ID.DUID.UUID.Value = 0x000102030405060
 match 00 02 00 12 00 04 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
 
 decode-pair -
-match Server-ID = { DUID = UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
+match Server-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000102030405060708090a0b0c0d0e0f } }
 
 #
 #  21.4. Identity Association for Non-temporary Addresses Option
@@ -335,7 +335,7 @@ encode-pair Option-Request = Unicast, Option-Request = IA-Addr
 match 00 06 00 04 00 0c 00 05
 
 decode-pair -
-match Option-Request = Unicast, Option-Request = IA-Addr
+match Option-Request = ::Unicast, Option-Request = ::IA-Addr
 
 #
 #  21.8.  Preference Option
@@ -456,7 +456,7 @@ encode-pair Auth.Protocol = Reconfigure-Key, Auth.Algorithm = HMAC-MD5, Auth.Rep
 match 00 0b 00 1a 03 01 00 00 00 00 00 49 96 02 d2 01 02 03 04 05 06 07 08 09 10 11 12 13 14 15
 
 decode-pair -
-match Auth = { Protocol = Reconfigure-Key, Algorithm = HMAC-MD5, Replay-Detection-Method = Monotonicly-Increasing-Value, Replay-Detection = 1234567890, Information = 0x010203040506070809101112131415 }
+match Auth = { Protocol = ::Reconfigure-Key, Algorithm = ::HMAC-MD5, Replay-Detection-Method = ::Monotonicly-Increasing-Value, Replay-Detection = 1234567890, Information = 0x010203040506070809101112131415 }
 
 #
 #  21.12.  Server Unicast Option
@@ -530,7 +530,7 @@ encode-pair Status-Code.Value = NoPrefixAvail, Status-Code.Message = "Tapioca co
 match 00 0d 00 14 00 06 54 61 70 69 6f 63 61 20 63 6f 6d 20 71 75 65 69 6a 6f
 
 decode-pair -
-match Status-Code = { Value = NoPrefixAvail, Message = "Tapioca com queijo" }
+match Status-Code = { Value = ::NoPrefixAvail, Message = "Tapioca com queijo" }
 
 #
 #  21.14.  Rapid Commit Option
@@ -744,7 +744,7 @@ encode-pair Reconf-Msg = InformationRequest
 match 00 13 00 01 0b
 
 decode-pair -
-match Reconf-Msg = InformationRequest
+match Reconf-Msg = ::InformationRequest
 
 #
 #  21.20.  Reconfigure Accept Option

diff --git a/src/tests/unit/protocols/dhcpv6/server.txt b/src/tests/unit/protocols/dhcpv6/server.txt
index 11b5930e1f2cc238f32151eace5422d44c22279e..8958ae8a3313e4e173803664161a0a4156581517 100644 (file)
--- a/src/tests/unit/protocols/dhcpv6/server.txt
+++ b/src/tests/unit/protocols/dhcpv6/server.txt
@@ -16,14 +16,14 @@ encode-pair Client-ID.DUID = UUID, Client-ID.DUID.UUID.Value = 0x000100012750f52
 match 00 01 00 12 00 04 00 01 00 01 27 50 f5 27 02 42 0a 00 00 09 00 00
 
 decode-pair -
-match Client-ID = { DUID = UUID, DUID.UUID = { Value = 0x000100012750f52702420a0000090000 } }
+match Client-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000100012750f52702420a0000090000 } }
 
 
 encode-pair Server-ID.DUID = UUID, Server-ID.DUID.UUID.Value = 0x000100012750f52702420a0000090000
 match 00 02 00 12 00 04 00 01 00 01 27 50 f5 27 02 42 0a 00 00 09 00 00
 
 decode-pair -
-match Server-ID = { DUID = UUID, DUID.UUID = { Value = 0x000100012750f52702420a0000090000 } }
+match Server-ID = { DUID = ::UUID, DUID.UUID = { Value = 0x000100012750f52702420a0000090000 } }
 
 #
 #  We SHOULD be adding a sub-struct with Client-ID.DUID.LLT.Hardware-Type.Ethernet.Address,
@@ -36,7 +36,7 @@ encode-pair Client-ID.DUID = LLT, Client-ID.DUID.LLT.Hardware-Type = Ethernet, C
 match 00 01 00 0e 00 01 00 01 00 00 00 02 00 01 02 03 04 05
 
 decode-pair -
-match Client-ID = { DUID = LLT, DUID.LLT = { Hardware-Type = Ethernet, Time = "2000-01-01T00:00:02Z", Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }
+match Client-ID = { DUID = ::LLT, DUID.LLT = { Hardware-Type = ::Ethernet, Time = "2000-01-01T00:00:02Z", Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }
 
 #
 #  sub-struct LL is LLT, but without the T
@@ -47,7 +47,7 @@ encode-pair Client-ID.DUID = LL, Client-ID.DUID.LL.Hardware-Type = Ethernet, Cli
 match 00 01 00 0a 00 03 00 01 00 01 02 03 04 05
 
 decode-pair -
-match Client-ID = { DUID = LL, DUID.LL = { Hardware-Type = Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }
+match Client-ID = { DUID = ::LL, DUID.LL = { Hardware-Type = ::Ethernet, Hardware-Type.Ethernet = { Address = 00:01:02:03:04:05 } } }
 
 count
 match 21

diff --git a/src/tests/unit/protocols/dns/bad-cookie.txt b/src/tests/unit/protocols/dns/bad-cookie.txt
index d97cf1eff7a8ef78e72662c57063f7511a0ce316..930af41d7cf330950b95e8278c9c45e668e85108 100644 (file)
--- a/src/tests/unit/protocols/dns/bad-cookie.txt
+++ b/src/tests/unit/protocols/dns/bad-cookie.txt
@@ -51,7 +51,7 @@ fuzzer-out dns
 #
 
 decode-proto f6 ab 01 20 00 01 00 00 00 00 00 01 00 00 06 00 01 00 00 29 10 00 00 00 00 00 00 0c 00 0a 00 08 36 bf 11 1f ef 2e 01 09
-match Header = { ID = 63147, Query = Query, Opcode = Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = yes, Recursion-Available = no, Reserved = no, Authentic-Data = yes, Checking-Disabled = no, Rcode = No-Error, Question-Count = 1, Answer-Count = 0, Name-Server-Count = 0, Additional-Records-Count = 1 }, Question = { Name = ".", Type = 6, Class = Internet }, Additional-Record = { Name = ".", Type = Opt, Class = 4096, TTL = 0, Type.Opt = { Options = { Cookie = { Client = 0x36bf111fef2e0109 } } } }
+match Header = { ID = 63147, Query = ::Query, Opcode = ::Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = yes, Recursion-Available = no, Reserved = no, Authentic-Data = yes, Checking-Disabled = no, Rcode = ::No-Error, Question-Count = 1, Answer-Count = 0, Name-Server-Count = 0, Additional-Records-Count = 1 }, Question = { Name = ".", Type = 6, Class = ::Internet }, Additional-Record = { Name = ".", Type = ::Opt, Class = 4096, TTL = 0, Type.Opt = { Options = { Cookie = { Client = 0x36bf111fef2e0109 } } } }
 
 encode-proto -
 match f6 ab 01 20 00 01 00 00 00 00 00 01 00 00 06 00 01 00 00 29 10 00 00 00 00 00 00 0c 00 0a 00 08 36 bf 11 1f ef 2e 01 09
@@ -98,7 +98,7 @@ match f6 ab 01 20 00 01 00 00 00 00 00 01 00 00 06 00 01 00 00 29 10 00 00 00 00
 #    |   |  optdata   = '6\xbf\x11\x1f\xef.\x01\t}\x8f\xfe\x06\\co\xfb\x14-vt\x94@zs'
 #
 decode-proto f6 ab 81 87 00 01 00 00 00 00 00 01  00 00 06 00 01  00 00 29 10 00 01 00 00 00  00 1c  00 0a 00 18 36 bf 11 1f ef 2e 01 09 7d 8f fe 06 5c 63 6f fb 14 2d 76 74 94 40 7a 73
-match Header = { ID = 63147, Query = Response, Opcode = Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = yes, Recursion-Available = yes, Reserved = no, Authentic-Data = no, Checking-Disabled = no, Rcode = YX-Resource-Record-Set, Question-Count = 1, Answer-Count = 0, Name-Server-Count = 0, Additional-Records-Count = 1 }, Question = { Name = ".", Type = 6, Class = Internet }, Additional-Record = { Name = ".", Type = Opt, Class = 4096, TTL = 16777216, Type.Opt = { Options = { Cookie = { Client = 0x36bf111fef2e0109, Server = 0x7d8ffe065c636ffb142d767494407a73 } } } }
+match Header = { ID = 63147, Query = ::Response, Opcode = ::Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = yes, Recursion-Available = yes, Reserved = no, Authentic-Data = no, Checking-Disabled = no, Rcode = ::YX-Resource-Record-Set, Question-Count = 1, Answer-Count = 0, Name-Server-Count = 0, Additional-Records-Count = 1 }, Question = { Name = ".", Type = 6, Class = ::Internet }, Additional-Record = { Name = ".", Type = ::Opt, Class = 4096, TTL = 16777216, Type.Opt = { Options = { Cookie = { Client = 0x36bf111fef2e0109, Server = 0x7d8ffe065c636ffb142d767494407a73 } } } }
 encode-proto -
 match f6 ab 81 87 00 01 00 00 00 00 00 01 00 00 06 00 01 00 00 29 10 00 01 00 00 00 00 1c 00 0a 00 18 36 bf 11 1f ef 2e 01 09 7d 8f fe 06 5c 63 6f fb 14 2d 76 74 94 40 7a 73
 
@@ -144,7 +144,7 @@ match f6 ab 81 87 00 01 00 00 00 00 00 01 00 00 06 00 01 00 00 29 10 00 01 00 00
 #    |   |  optdata   = '6\xbf\x11\x1f\xef.\x01\t}\x8f\xfe\x06\\co\xfb\x14-vt\x94@zs'
 #
 decode-proto b4 33 01 20 00 01 00 00 00 00 00 01 00 00 06 00 01 00 00 29 10 00 00 00 00 00 00 1c 00 0a 00 18 36 bf 11 1f ef 2e 01 09 7d 8f fe 06 5c 63 6f fb 14 2d 76 74 94 40 7a 73
-match Header = { ID = 46131, Query = Query, Opcode = Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = yes, Recursion-Available = no, Reserved = no, Authentic-Data = yes, Checking-Disabled = no, Rcode = No-Error, Question-Count = 1, Answer-Count = 0, Name-Server-Count = 0, Additional-Records-Count = 1 }, Question = { Name = ".", Type = 6, Class = Internet }, Additional-Record = { Name = ".", Type = Opt, Class = 4096, TTL = 0, Type.Opt = { Options = { Cookie = { Client = 0x36bf111fef2e0109, Server = 0x7d8ffe065c636ffb142d767494407a73 } } } }
+match Header = { ID = 46131, Query = ::Query, Opcode = ::Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = yes, Recursion-Available = no, Reserved = no, Authentic-Data = yes, Checking-Disabled = no, Rcode = ::No-Error, Question-Count = 1, Answer-Count = 0, Name-Server-Count = 0, Additional-Records-Count = 1 }, Question = { Name = ".", Type = 6, Class = ::Internet }, Additional-Record = { Name = ".", Type = ::Opt, Class = 4096, TTL = 0, Type.Opt = { Options = { Cookie = { Client = 0x36bf111fef2e0109, Server = 0x7d8ffe065c636ffb142d767494407a73 } } } }
 encode-proto -
 match b4 33 01 20 00 01 00 00 00 00 00 01 00 00 06 00 01 00 00 29 10 00 00 00 00 00 00 1c 00 0a 00 18 36 bf 11 1f ef 2e 01 09 7d 8f fe 06 5c 63 6f fb 14 2d 76 74 94 40 7a 73
 
@@ -204,7 +204,7 @@ match b4 33 01 20 00 01 00 00 00 00 00 01 00 00 06 00 01 00 00 29 10 00 00 00 00
 #    |   |  optdata   = '6\xbf\x11\x1f\xef.\x01\t\n/\x9d\xa2\\co\xfbI\xc3[\xb1O\xa4(\xb4'
 #
 decode-proto b4 33 81 a0 00 01 00 01 00 00 00 01 00 00 06 00 01 00 00 06 00 01 00 01 4e fe 00 40 01 61 0c 72 6f 6f 74 2d 73 65 72 76 65 72 73 03 6e 65 74 00 05 6e 73 74 6c 64 0c 76 65 72 69 73 69 67 6e 2d 67 72 73 03 63 6f 6d 00 78 57 d1 92 00 00 07 08 00 00 03 84 00 09 3a 80 00 01 51 80 00 00 29 10 00 00 00 00 00 00 1c 00 0a 00 18 36 bf 11 1f ef 2e 01 09 0a 2f 9d a2 5c 63 6f fb 49 c3 5b b1 4f a4 28 b4
-match Header = { ID = 46131, Query = Response, Opcode = Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = yes, Recursion-Available = yes, Reserved = no, Authentic-Data = yes, Checking-Disabled = no, Rcode = No-Error, Question-Count = 1, Answer-Count = 1, Name-Server-Count = 0, Additional-Records-Count = 1 }, Question = { Name = ".", Type = 6, Class = Internet }, Resource-Record = { Name = ".", Type = SOA, Class = Internet, TTL = 85758, Type.SOA = { Master-Name = "a.root-servers.net", Responsible-Name = "nstld.verisign-grs.com", Serial = 2019021202, Refresh = 1800, Retry = 900, Expire = 604800, Minimum = 86400 } }, Additional-Record = { Name = ".", Type = Opt, Class = 4096, TTL = 0, Type.Opt = { Options = { Cookie = { Client = 0x36bf111fef2e0109, Server = 0x0a2f9da25c636ffb49c35bb14fa428b4 } } } }
+match Header = { ID = 46131, Query = ::Response, Opcode = ::Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = yes, Recursion-Available = yes, Reserved = no, Authentic-Data = yes, Checking-Disabled = no, Rcode = ::No-Error, Question-Count = 1, Answer-Count = 1, Name-Server-Count = 0, Additional-Records-Count = 1 }, Question = { Name = ".", Type = 6, Class = ::Internet }, Resource-Record = { Name = ".", Type = ::SOA, Class = ::Internet, TTL = 85758, Type.SOA = { Master-Name = "a.root-servers.net", Responsible-Name = "nstld.verisign-grs.com", Serial = 2019021202, Refresh = 1800, Retry = 900, Expire = 604800, Minimum = 86400 } }, Additional-Record = { Name = ".", Type = ::Opt, Class = 4096, TTL = 0, Type.Opt = { Options = { Cookie = { Client = 0x36bf111fef2e0109, Server = 0x0a2f9da25c636ffb49c35bb14fa428b4 } } } }
 
 encode-proto -
 match b4 33 81 a0 00 01 00 01 00 00 00 01 00 00 06 00 01 00 00 06 00 01 00 01 4e fe 00 40 01 61 0c 72 6f 6f 74 2d 73 65 72 76 65 72 73 03 6e 65 74 00 05 6e 73 74 6c 64 0c 76 65 72 69 73 69 67 6e 2d 67 72 73 03 63 6f 6d 00 78 57 d1 92 00 00 07 08 00 00 03 84 00 09 3a 80 00 01 51 80 00 00 29 10 00 00 00 00 00 00 1c 00 0a 00 18 36 bf 11 1f ef 2e 01 09 0a 2f 9d a2 5c 63 6f fb 49 c3 5b b1 4f a4 28 b4

diff --git a/src/tests/unit/protocols/dns/base.txt b/src/tests/unit/protocols/dns/base.txt
index b7ec03a017b40cdf05bfebe2bf74b8e94a76c8ac..1b1899dd6dae79e708b53fa7fd58d6bc2c0d2f96 100644 (file)
--- a/src/tests/unit/protocols/dns/base.txt
+++ b/src/tests/unit/protocols/dns/base.txt
@@ -17,14 +17,14 @@ fuzzer-out dns
 
 #                                                 Z  type   class   TTL
 decode-proto 00 00 80 00 00 00 00 01 00 00 00 00  00 00 01   00 01  00 00 00 10  00 04 7f 00 00 01
-match Header = { ID = 0, Query = Response, Opcode = Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = no, Recursion-Available = no, Reserved = no, Authentic-Data = no, Checking-Disabled = no, Rcode = No-Error, Question-Count = 0, Answer-Count = 1, Name-Server-Count = 0, Additional-Records-Count = 0 }, Resource-Record = { Name = ".", Type = A, Class = Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }
+match Header = { ID = 0, Query = ::Response, Opcode = ::Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = no, Recursion-Available = no, Reserved = no, Authentic-Data = no, Checking-Disabled = no, Rcode = ::No-Error, Question-Count = 0, Answer-Count = 1, Name-Server-Count = 0, Additional-Records-Count = 0 }, Resource-Record = { Name = ".", Type = ::A, Class = ::Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }
 encode-proto -
 match  00 00 80 00 00 00 00 01 00 00 00 00 00 00 01 00 01 00 00 00 10 00 04 7f 00 00 01
 
 #  Really "decode RR".
 #           Z  type   class  TTL          length  IPaddr
 decode-pair 00 00 01  00 01  00 00 00 10  00 04   7f 00 00 01
-match Resource-Record = { Name = ".", Type = A, Class = Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }
+match Resource-Record = { Name = ".", Type = ::A, Class = ::Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }
 
 encode-pair -
 match 00 00 01 00 01 00 00 00 10 00 04 7f 00 00 01
@@ -36,7 +36,7 @@ encode-proto Header = { ID = 0, Query = Response, Opcode = Query, Authoritative
 match 00 00 80 00 00 00 00 01 00 00 00 00 03 77 77 77 07 65 78 61 6d 70 6c 65 03 63 6f 6d 00 00 01 00 01 00 00 00 10 00 04 7f 00 00 01
 
 decode-proto -
-match Header = { ID = 0, Query = Response, Opcode = Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = no, Recursion-Available = no, Reserved = no, Authentic-Data = no, Checking-Disabled = no, Rcode = No-Error, Question-Count = 0, Answer-Count = 1, Name-Server-Count = 0, Additional-Records-Count = 0 }, Resource-Record = { Name = "www.example.com", Type = A, Class = Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }
+match Header = { ID = 0, Query = ::Response, Opcode = ::Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = no, Recursion-Available = no, Reserved = no, Authentic-Data = no, Checking-Disabled = no, Rcode = ::No-Error, Question-Count = 0, Answer-Count = 1, Name-Server-Count = 0, Additional-Records-Count = 0 }, Resource-Record = { Name = "www.example.com", Type = ::A, Class = ::Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }
 
 #
 #  Check the encoder can manage counts on its own, and finishes encoding missing count attributes in the header
@@ -57,7 +57,7 @@ match 00 00 80 00 00 00 00 02 00 00 00 00 03 77 77 77 07 65 78 61 6d 70 6c 65 03
 #  and then "ftp" with a pointer c010 to "example.com"
 #
 decode-proto -
-match Header = { ID = 0, Query = Response, Opcode = Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = no, Recursion-Available = no, Reserved = no, Authentic-Data = no, Checking-Disabled = no, Rcode = No-Error, Question-Count = 0, Answer-Count = 2, Name-Server-Count = 0, Additional-Records-Count = 0 }, Resource-Record = { Name = "www.example.com", Type = A, Class = Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }, Resource-Record = { Name = "ftp.example.com", Type = A, Class = Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }
+match Header = { ID = 0, Query = ::Response, Opcode = ::Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = no, Recursion-Available = no, Reserved = no, Authentic-Data = no, Checking-Disabled = no, Rcode = ::No-Error, Question-Count = 0, Answer-Count = 2, Name-Server-Count = 0, Additional-Records-Count = 0 }, Resource-Record = { Name = "www.example.com", Type = ::A, Class = ::Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }, Resource-Record = { Name = "ftp.example.com", Type = ::A, Class = ::Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }
 
 #
 #  multiple labels (3), but with all counts removed.  The counts will
@@ -76,7 +76,7 @@ match 00 00 80 00 00 00 00 03 00 00 00 00 03 77 77 77 07 65 78 61 6d 70 6c 65 03
 #  and then "ftp" with a pointer c010 to "example.com"
 #
 decode-proto -
-match Header = { ID = 0, Query = Response, Opcode = Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = no, Recursion-Available = no, Reserved = no, Authentic-Data = no, Checking-Disabled = no, Rcode = No-Error, Question-Count = 0, Answer-Count = 3, Name-Server-Count = 0, Additional-Records-Count = 0 }, Resource-Record = { Name = "www.example.com", Type = A, Class = Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }, Resource-Record = { Name = "ftp.example.com", Type = A, Class = Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }, Resource-Record = { Name = "ns.example.com", Type = A, Class = Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }
+match Header = { ID = 0, Query = ::Response, Opcode = ::Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = no, Recursion-Available = no, Reserved = no, Authentic-Data = no, Checking-Disabled = no, Rcode = ::No-Error, Question-Count = 0, Answer-Count = 3, Name-Server-Count = 0, Additional-Records-Count = 0 }, Resource-Record = { Name = "www.example.com", Type = ::A, Class = ::Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }, Resource-Record = { Name = "ftp.example.com", Type = ::A, Class = ::Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }, Resource-Record = { Name = "ns.example.com", Type = ::A, Class = ::Internet, TTL = 16, Type.A = { IP = 127.0.0.1 } }
 
 count
 match 25

diff --git a/src/tests/unit/protocols/dns/opt41.txt b/src/tests/unit/protocols/dns/opt41.txt
index 0100d8edcd0a843adbd54037edec06af2680ec11..be297ce5a4e9a06daae17a100dbd202e6c5df722 100644 (file)
--- a/src/tests/unit/protocols/dns/opt41.txt
+++ b/src/tests/unit/protocols/dns/opt41.txt
@@ -6,7 +6,7 @@ proto-dictionary dns
 fuzzer-out dns
 
 decode-proto f6 ab 01 20 00 01 00 00 00 00 00 01 00 00 06 00 01 00 00 29 10 00 00 00 00 00 00 0c 00 0a 00 08 36 bf 11 1f ef 2e 01 09
-match Header = { ID = 63147, Query = Query, Opcode = Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = yes, Recursion-Available = no, Reserved = no, Authentic-Data = yes, Checking-Disabled = no, Rcode = No-Error, Question-Count = 1, Answer-Count = 0, Name-Server-Count = 0, Additional-Records-Count = 1 }, Question = { Name = ".", Type = 6, Class = Internet }, Additional-Record = { Name = ".", Type = Opt, Class = 4096, TTL = 0, Type.Opt = { Options = { Cookie = { Client = 0x36bf111fef2e0109 } } } }
+match Header = { ID = 63147, Query = ::Query, Opcode = ::Query, Authoritative = no, Truncated-Response = no, Recursion-Desired = yes, Recursion-Available = no, Reserved = no, Authentic-Data = yes, Checking-Disabled = no, Rcode = ::No-Error, Question-Count = 1, Answer-Count = 0, Name-Server-Count = 0, Additional-Records-Count = 1 }, Question = { Name = ".", Type = 6, Class = ::Internet }, Additional-Record = { Name = ".", Type = ::Opt, Class = 4096, TTL = 0, Type.Opt = { Options = { Cookie = { Client = 0x36bf111fef2e0109 } } } }
 
 encode-proto -
 match f6 ab 01 20 00 01 00 00 00 00 00 01 00 00 06 00 01 00 00 29 10 00 00 00 00 00 00 0c 00 0a 00 08 36 bf 11 1f ef 2e 01 09

diff --git a/src/tests/unit/protocols/eap/sim/decode.txt b/src/tests/unit/protocols/eap/sim/decode.txt
index d7aa7e2038685d8ce2d15e8dd376292dcd68a461..a049b919d1062b3c3737e70b46c91816316605c5 100644 (file)
--- a/src/tests/unit/protocols/eap/sim/decode.txt
+++ b/src/tests/unit/protocols/eap/sim/decode.txt
@@ -28,7 +28,7 @@ match RAND = 0x00112233445566770011223344556677, RAND = 0x0011223344556677001122
 
 # Aliased (found)
 decode-pair.sim_tp_decode 0c 01 04 02
-match Notification = Temporarily-Denied
+match Notification = ::Temporarily-Denied
 
 # Aliased (notfound)
 decode-pair.sim_tp_decode 0c 01 ff ff

diff --git a/src/tests/unit/protocols/internal/decode.txt b/src/tests/unit/protocols/internal/decode.txt
index c63226a5aadcc8a0d29084416fb790af04968eec..47cde44754d6091d8e5af716dffef08489f4371b 100644 (file)
--- a/src/tests/unit/protocols/internal/decode.txt
+++ b/src/tests/unit/protocols/internal/decode.txt
@@ -27,7 +27,7 @@ match 7
 
 # Internal attribute (tests the variable length type encoding)
 decode-pair 20 03 E8 04 00 00 00 0D
-match Packet-Type = Status-Client
+match Packet-Type = ::Status-Client
 returned
 match 8
 

diff --git a/src/tests/unit/protocols/radius/eapol_msg.txt b/src/tests/unit/protocols/radius/eapol_msg.txt
index 83f65fb31a4066090e88de2bd52d219658a6d325..c1a937542101180ef6293e3fbee8cd248485a351 100644 (file)
--- a/src/tests/unit/protocols/radius/eapol_msg.txt
+++ b/src/tests/unit/protocols/radius/eapol_msg.txt
@@ -7,7 +7,7 @@ fuzzer-out radius
 #  Snip of packet extracted from eapol_test (GET_RADIUS_REPLY -RAW)
 #
 decode-proto 020200eb8b7a26bee11f1ca308233d49733187720506000030391217506f776572656420627920467265655241444955531a0c000004d23806deadbeef1a0c000000141e06cafecafe1a0c000000141e06cadecade1a1200000be1130c6d792070726f66696c651a0c00000be11006000000051a0c000001370706000000011a2a0000013711248701b3e481d72fa1333b9838a3cd448837eaed62a843295f1c9dd153c6866e499f201a2a0000013710249385f7dc0fd758b02dd0dc43f68266508ec93c678a5fa38525749016edede8eeea0e4f0603fc0004501200e9e565eb053138254850edb41fc013
-match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0x8b7a26bee11f1ca308233d4973318772, NAS-Port = 12345, Reply-Message = "Powered by FreeRADIUS", Vendor-Specific = { raw.1234 = { raw.56 = 0xdeadbeef }, raw.20 = { raw.30 = 0xcafecafe }, raw.20 = { raw.30 = 0xcadecade }, Alcatel = { FR-Direct-Profile = "my profile", Home-Agent-UDP-Port = 5 }, Microsoft = { MPPE-Encryption-Policy = Encryption-Allowed, raw.MPPE-Recv-Key = 0x8701b3e481d72fa1333b9838a3cd448837eaed62a843295f1c9dd153c6866e499f20, raw.MPPE-Send-Key = 0x9385f7dc0fd758b02dd0dc43f68266508ec93c678a5fa38525749016edede8eeea0e } }, EAP-Message = 0x03fc0004, Message-Authenticator = 0x00e9e565eb053138254850edb41fc013
+match Packet-Type = ::Access-Accept, Packet-Authentication-Vector = 0x8b7a26bee11f1ca308233d4973318772, NAS-Port = 12345, Reply-Message = "Powered by FreeRADIUS", Vendor-Specific = { raw.1234 = { raw.56 = 0xdeadbeef }, raw.20 = { raw.30 = 0xcafecafe }, raw.20 = { raw.30 = 0xcadecade }, Alcatel = { FR-Direct-Profile = "my profile", Home-Agent-UDP-Port = 5 }, Microsoft = { MPPE-Encryption-Policy = ::Encryption-Allowed, raw.MPPE-Recv-Key = 0x8701b3e481d72fa1333b9838a3cd448837eaed62a843295f1c9dd153c6866e499f20, raw.MPPE-Send-Key = 0x9385f7dc0fd758b02dd0dc43f68266508ec93c678a5fa38525749016edede8eeea0e } }, EAP-Message = 0x03fc0004, Message-Authenticator = 0x00e9e565eb053138254850edb41fc013
 
 pair Vendor-Specific = { raw.1234 = { raw.56 = 0xdeadbeef } }
 match Vendor-Specific = { raw.1234 = { raw.56 = 0xdeadbeef } }

diff --git a/src/tests/unit/protocols/radius/enum.txt b/src/tests/unit/protocols/radius/enum.txt
index eb6708d2c04ca57318d5a9854273d39deae74cb8..efb2e378f1f52d34aa254b5d3471fa405678e880 100644 (file)
--- a/src/tests/unit/protocols/radius/enum.txt
+++ b/src/tests/unit/protocols/radius/enum.txt
@@ -12,7 +12,7 @@ encode-pair Unit-TLV = { Test-Enum-Integer64 = one }
 match fe 0c 0c 0a 00 00 00 00 00 00 00 01
 
 decode-pair -
-match Unit-TLV = { Test-Enum-Integer64 = one }
+match Unit-TLV = { Test-Enum-Integer64 = ::one }
 
 #
 #  Same enum names, different attribute.
@@ -22,7 +22,7 @@ match fe 08 0d 06 00 00 00 01
 
 #  This value is looked up as an an enum!
 decode-pair -
-match Unit-TLV = { Test-Enum-Integer32 = one }
+match Unit-TLV = { Test-Enum-Integer32 = ::one }
 
 count
 match 11

diff --git a/src/tests/unit/protocols/radius/foreign.txt b/src/tests/unit/protocols/radius/foreign.txt
index 6fa2f537173501ee5029ea51d9a49e4d4d5aed82..1833f242a195241b8ea0e94964050e4c4c412936 100644 (file)
--- a/src/tests/unit/protocols/radius/foreign.txt
+++ b/src/tests/unit/protocols/radius/foreign.txt
@@ -55,18 +55,18 @@ match Extended-Attribute-5 = { DHCPv6-Options = { Rapid-Commit = yes, Informatio
 #  Various cross-protocol tests taken from fuzzer output.
 #
 decode-proto 04ac00edf504000060800402f50303f5040403f5040402f50302d604040202046000f30303f5040402f502f50302d604040202046000f30303f5040402f50302040202046000f303040402280303f54404029e0200037d2c0404040404400404040402024404029e0200007d2c04040404044004210404020202046000f30303f50202046000f303029e2c7d0402040400000303f5040402f50302040202046000f303040402280303f54404029e0200037d2c040404040440040404040404020202046000f3000000e902046000f303029eaaaaaaaaaaaaaaaaaaaaaaaa2c7d04020404009004ffff60d000032ae00400000004040303f50404
-match Packet-Type = Accounting-Request, Packet-Authentication-Vector = 0xf504000060800402f50303f5040403f5, raw.NAS-IP-Address = 0x02f5, raw.214 = 0x0402, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x02, raw.214 = 0x0402, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x02, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x04, raw.Acct-Status-Type = 0x03, Extended-Attribute-5 = { DHCPv4-Options = { PCP-IPv4-Server-Addresses = { server = { }, raw.server = 0x03 }, raw.V-I-Vendor-Specific = 0x0404040404400404040402024404029e0200007d2c04040404044004210404020202046000f30303f5020204, raw.96 = 0x, Site-specific-19 = 0x029e2c, raw.V-I-Vendor-Specific = 0x02040400 }, raw.DHCPv4-Options = 0x9e0200037d2c040404040440040404040404020202046000f3000000e902046000f303029eaaaaaaaaaaaaaaaaaaaaaaaa2c7d04020404009004ffff60d00003 }, CHAP-Password = 0xf5, raw.NAS-IP-Address = 0x02f5, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x04, raw.Acct-Status-Type = 0x03
+match Packet-Type = ::Accounting-Request, Packet-Authentication-Vector = 0xf504000060800402f50303f5040403f5, raw.NAS-IP-Address = 0x02f5, raw.214 = 0x0402, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x02, raw.214 = 0x0402, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x02, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x04, raw.Acct-Status-Type = 0x03, Extended-Attribute-5 = { DHCPv4-Options = { PCP-IPv4-Server-Addresses = { server = { }, raw.server = 0x03 }, raw.V-I-Vendor-Specific = 0x0404040404400404040402024404029e0200007d2c04040404044004210404020202046000f30303f5020204, raw.96 = 0x, Site-specific-19 = 0x029e2c, raw.V-I-Vendor-Specific = 0x02040400 }, raw.DHCPv4-Options = 0x9e0200037d2c040404040440040404040404020202046000f3000000e902046000f303029eaaaaaaaaaaaaaaaaaaaaaaaa2c7d04020404009004ffff60d00003 }, CHAP-Password = 0xf5, raw.NAS-IP-Address = 0x02f5, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x04, raw.Acct-Status-Type = 0x03
 
 
 decode-proto 03 12 02 00 00 00 00 00 00 03 03 03 03 02 fc 03 02 d7 00 04 04 02 02 02 03 02 3d 04 60 00 f3 03 03 f5 04 04 02 f5 03 03 04 02 02 04 60 00 f3 03 03 f5 04 04 02 f5 03 03 f5 04 04 02 02 02 04 04 04 03 f5 04 04 02 f5 03 02 d6 04 04 02 02 04 60 00 f3 03 03 f5 04 04 02 f5 03 03 04 02 02 04 60 00 f3 03 03 f5 04 04 02 f5 03 03 f5 04 04 02 02 02 04 04 04 04 04 04 04 04 f3 03 03 f5 04 04 02 f5 03 03 04 02 02 04 60 00 f3 03 03 f5 04 04 02 f5 03 03 f5 04 02 02 04 04 04 04 04 04 04 04 f3 03 03 f5 04 04 02 f5 03 03 04 02 02 04 60 00 f3 03 03 f5 9a 04 02 f5 03 03 f5 f1 04 04 04 03 f5 03 02 03 03 04 02 02 00 f3 04 60 03 03 f5 04 04 02 f5 03 03 f5 04 04 02 02 02 03 02 3d 04 60 00 f3 03 03 f5 04 03 03 f5 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 03 e8 03 03 02 5c 03 03 03 03 03 03 02 5c 04 04 02 f5 03 03 04 02 02 04 60 00 f3 03 03 f5 04 04 02 f5 03 03 f5 04 02 02 04 04 04 04 04 04 04 04 f3 03 03 f5 04 04 02 f5 03 03 04 02 02 04 60 00 f3 03 03 f5 04 04 02 f5 03 03 f5 04 03 03 f5 04 04 02 f5 03 03 04 02 02 02 3d 04 60 00 f3 03 03 f5 04 04 02 f5 03 03 04 02 02 04 60 00 f5 04 02 f3 03 03 04 f5 03 03 f5 04 04 02 02 02 04 04 04 03 f5 04 04 02 f5 03 02 d6 04 04 02 02 04 60 00 f3 03 03 f5 04 04 02 f5 03 03 04 02 02 04 60 00 f3 03 03 f5 04 04 02 f5 03 03 f5 04 04 02 02 02 04 04 04 04 04 04 04 04 f3 03 03 f5 04 04 02 f5 03 03 04 02 02 04 60 00 f3 03 03 f5 04 04 02 f5 03 03 f5 04 03 03 f5 04 04 02 f5 03 03 04 02 02 04 60 00 f3 03 03 f5 04 04 02 f5 03 03 f5 04 04 02 02 02 03 02 46 04 2a 04 04 04 44 03 03 03 03 03 03 03 03 03 72
-match Packet-Type = Access-Reject, Packet-Authentication-Vector = 0x00000000000303030302fc0302d70004, raw.NAS-Port-Type = 0x6000, raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.NAS-IP-Address = 0x0403, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x02, raw.214 = 0x0402, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.NAS-IP-Address = 0x0404, raw.NAS-IP-Address = 0x0404, raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0202, raw.NAS-IP-Address = 0x0404, raw.NAS-IP-Address = 0x0404, raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, Extended-Attribute-5 = { raw.DHCPv4-Options = 0xf50303f5f104040403f50302030304020200f304600303f5040402f50303f5040402020203023d046000f30303f5040303f503030303030303030303030303030303030303e80303025c030303030303025c040402f50303040202046000f30303f5040402f50303f50402020404040404040404f30303f5040402f50303040202046000f30303f5040402f50303f5040303f5040402 }, raw.Extended-Attribute-5 = 0x03, raw.NAS-Port-Type = 0x6000, raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-5 = 0x02f3, CHAP-Password = 0x04, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.NAS-IP-Address = 0x0403, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x02, raw.214 = 0x0402, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.NAS-IP-Address = 0x0404, raw.NAS-IP-Address = 0x0404, raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0303, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.ARAP-Password = 0x2a04, raw.NAS-IP-Address = 0x4403, CHAP-Password = 0x03, CHAP-Password = 0x03, CHAP-Password = 0x72
+match Packet-Type = ::Access-Reject, Packet-Authentication-Vector = 0x00000000000303030302fc0302d70004, raw.NAS-Port-Type = 0x6000, raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.NAS-IP-Address = 0x0403, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x02, raw.214 = 0x0402, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.NAS-IP-Address = 0x0404, raw.NAS-IP-Address = 0x0404, raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0202, raw.NAS-IP-Address = 0x0404, raw.NAS-IP-Address = 0x0404, raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, Extended-Attribute-5 = { raw.DHCPv4-Options = 0xf50303f5f104040403f50302030304020200f304600303f5040402f50303f5040402020203023d046000f30303f5040303f503030303030303030303030303030303030303e80303025c030303030303025c040402f50303040202046000f30303f5040402f50303f50402020404040404040404f30303f5040402f50303040202046000f30303f5040402f50303f5040303f5040402 }, raw.Extended-Attribute-5 = 0x03, raw.NAS-Port-Type = 0x6000, raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-5 = 0x02f3, CHAP-Password = 0x04, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.NAS-IP-Address = 0x0403, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x02, raw.214 = 0x0402, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.NAS-IP-Address = 0x0404, raw.NAS-IP-Address = 0x0404, raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0303, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.ARAP-Password = 0x2a04, raw.NAS-IP-Address = 0x4403, CHAP-Password = 0x03, CHAP-Password = 0x03, CHAP-Password = 0x72
 
 
 decode-proto 04ac00edd604040404040404040404040302d700f30303f5040402f50303f5040303f5040402f50303040202046000f30303f5040402f50303f504040202046000f30303f5040402f50303040202046000f30303f5040402f50303f5040403f5040402f50302d604040202046000f30303f5040402f50303040202046000f30303f5040402f50303f55d04002a006004040404040404f30303f5040402f50303040202046000f30303f5040402f50303f5040303f5040402f50303040202046000f30303f5040402f50303f5040402020203023d046000f30303f5040303f50304020404040404040404040404
-match Packet-Type = Accounting-Request, Packet-Authentication-Vector = 0xd604040404040404040404040302d700, raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0303, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0402, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0403, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x02, raw.214 = 0x0402, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, Extended-Attribute-5 = { raw.DHCPv4-Options = 0x2a006004040404040404f30303f5040402f50303040202046000f30303f5040402f50303f5040303f5040402f50303040202046000f30303f5040402f50303f5040402020203023d046000f30303f5040303f5030402040404 }, raw.NAS-IP-Address = 0x0404, raw.NAS-IP-Address = 0x0404
+match Packet-Type = ::Accounting-Request, Packet-Authentication-Vector = 0xd604040404040404040404040302d700, raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0303, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0402, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, raw.Extended-Attribute-5 = 0x0403, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x02, raw.214 = 0x0402, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, User-Password = "\366\356", raw.Extended-Attribute-3 = 0x03, raw.Extended-Attribute-5 = 0x0402, raw.Extended-Attribute-5 = 0x03, Extended-Attribute-5 = { raw.DHCPv4-Options = 0x2a006004040404040404f30303f5040402f50303040202046000f30303f5040402f50303f5040303f5040402f50303040202046000f30303f5040402f50303f5040402020203023d046000f30303f5040303f5030402040404 }, raw.NAS-IP-Address = 0x0404, raw.NAS-IP-Address = 0x0404
 
 decode-proto 1f000260b50307ffededdef5ff04f504da0000026004ffedf53cfffffdff13daf504ffed000000000c0000180000000000000076e504ffdaf504ffecf504ffddf500ffed8104ffdaf504ff82f504ffda0bfaffdaf504ffdaf504ffecf504ff73f504ffddf504ffedf504ffdaf5ff04f5ed249e0038fffe0002ff2b3100bd001f000000810f02010004000f1b00549e00e402ef046b02cf04c05400046b02cf047d41cf04e7cf02040002fe147c02cf040205cf7d02cf00047d02cf04e802cf067d02cf7a007c02027dcfcf020404e8cf067d02cf04cf02040002fe147c02cf040205cf7d02cf00047d02cf04e802cf067d02cf7a047c02027dcfcf020404e8cf067d02cf047c02cf040302cf04e8023d02cf0024151c2a160000000000000000018303d67b0303023002cf03025902cf0306bd000014fb02cf03000000000076e504ffdaf504ffecf504ffddf500ff82f504ffda0bfaffdaf504ffdaf504ffecf504ff73f504ffddf504ffedf504ffdaf5ff04f5ed249e0038fffe0002ff2b3100bd0000000000810ffeff0000000f1b00549e00e402ef046b02cf04c05400046b02cf047d41cf040000000000000076e504ffdaf504ffecf504ffddf500ffed8104ffdaf504ff82f504ffda0bfaffdaf504ffdaf504ffecf504ff73f504ffddf504ffedf504ffdaf5ff04f5ed249e0038fffe0002ff2b3100bd0000000000810ffeff0000000f1b00549e00e402ef046b02cf04c05400046b02cf047d41cf04e7cf02040002fe147c02cf040205cf7d02cf06bd02cf0302cc03030302cf03435d03594302cf02cf03025902cf03063d02cf2b063d0302cf03435902cf030302029e9e9e9e9e9e9e9e9e9e9e9e9e9e9e46160000000000000000c2c2c2c2c2c2c2e6f604ffedf104045a
-match Packet-Type = Terminate-Session, Packet-Authentication-Vector = 0xb50307ffededdef5ff04f504da000002, raw.Framed-Interface-Id = 0xffed, Extended-Attribute-5 = { raw.255 = 0xfdff13daf504ffed000000000c0000180000000000000076e504ffdaf504ffecf504ffddf500ffed8104ffdaf504ff82f504ffda0bfaffda, raw.DHCPv4-Options = 0xed249e0038fffe0002ff2b3100bd001f000000810f02010004000f1b00549e00e402ef046b02cf04c05400046b02cf047d41cf04e7cf02040002fe147c02cf040205cf7d02cf00047d02cf04e802cf067d02cf7a007c02027dcfcf020404e8cf067d02cf04cf02040002fe147c02cf040205cf7d02cf00047d02cf04e802cf067d02cf7a047c02027dcfcf020404e8cf067d02cf047c02cf040302cf04e8023d02cf0024151c2a160000000000000000018303d67b0303023002cf03025902cf0306bd000014fb02cf03000000000076e504ffdaf504ffecf504ffddf500ff82f504ffda0bfaffdaf504ffdaf504ffecf504ff73f504ffddf504ff }, raw.Extended-Attribute-5 = 0xffdd, raw.Extended-Attribute-5 = 0xffed, raw.Extended-Attribute-5 = 0xffda, raw.237 = 0x04ffdaf5ff04f5ed249e0038fffe0002ff2b3100bd0000000000810ffeff0000000f1b00549e00e402ef046b02cf04c05400046b02cf047d41cf040000000000000076e504ffdaf504ffecf504ffddf500ffed8104ffdaf504ff82f504ffda0bfaffdaf504ffdaf504ffecf504ff73f504ffddf504ffedf504ffdaf5ff04f5ed249e0038fffe0002ff2b3100bd0000000000810ffeff0000000f1b00549e00e402ef046b02cf04c05400046b02cf047d41cf04e7cf02040002fe147c02cf040205cf7d02cf06bd02cf0302cc03030302cf03435d03594302cf02cf03025902cf03063d02cf2b063d0302cf03435902cf030302
+match Packet-Type = ::Terminate-Session, Packet-Authentication-Vector = 0xb50307ffededdef5ff04f504da000002, raw.Framed-Interface-Id = 0xffed, Extended-Attribute-5 = { raw.255 = 0xfdff13daf504ffed000000000c0000180000000000000076e504ffdaf504ffecf504ffddf500ffed8104ffdaf504ff82f504ffda0bfaffda, raw.DHCPv4-Options = 0xed249e0038fffe0002ff2b3100bd001f000000810f02010004000f1b00549e00e402ef046b02cf04c05400046b02cf047d41cf04e7cf02040002fe147c02cf040205cf7d02cf00047d02cf04e802cf067d02cf7a007c02027dcfcf020404e8cf067d02cf04cf02040002fe147c02cf040205cf7d02cf00047d02cf04e802cf067d02cf7a047c02027dcfcf020404e8cf067d02cf047c02cf040302cf04e8023d02cf0024151c2a160000000000000000018303d67b0303023002cf03025902cf0306bd000014fb02cf03000000000076e504ffdaf504ffecf504ffddf500ff82f504ffda0bfaffdaf504ffdaf504ffecf504ff73f504ffddf504ff }, raw.Extended-Attribute-5 = 0xffdd, raw.Extended-Attribute-5 = 0xffed, raw.Extended-Attribute-5 = 0xffda, raw.237 = 0x04ffdaf5ff04f5ed249e0038fffe0002ff2b3100bd0000000000810ffeff0000000f1b00549e00e402ef046b02cf04c05400046b02cf047d41cf040000000000000076e504ffdaf504ffecf504ffddf500ffed8104ffdaf504ff82f504ffda0bfaffdaf504ffdaf504ffecf504ff73f504ffddf504ffedf504ffdaf5ff04f5ed249e0038fffe0002ff2b3100bd0000000000810ffeff0000000f1b00549e00e402ef046b02cf04c05400046b02cf047d41cf04e7cf02040002fe147c02cf040205cf7d02cf06bd02cf0302cc03030302cf03435d03594302cf02cf03025902cf03063d02cf2b063d0302cf03435902cf030302
 
 count
 match 25

diff --git a/src/tests/unit/protocols/radius/packet_port1700.txt b/src/tests/unit/protocols/radius/packet_port1700.txt
index 58de7f023360cc626bf106ef2ebdb181757bb56f..ac34c2f621d2f366bce2995a683a5e93cb0dedf2 100644 (file)
--- a/src/tests/unit/protocols/radius/packet_port1700.txt
+++ b/src/tests/unit/protocols/radius/packet_port1700.txt
@@ -20,7 +20,7 @@ fuzzer-out radius
 #   load      = '+\xa6\x00\x19\x7f\xbf\x02\xc6f+Y\x90\x83\x8a^n3\x1b?\xf0\x01\x05bob'
 #
 decode-proto 2b a6 00 19 7f bf 02 c6 66 2b 59 90 83 8a 5e 6e 33 1b 3f f0 01 05 62 6f 62
-match Packet-Type = CoA-Request, Packet-Authentication-Vector = 0x7fbf02c6662b5990838a5e6e331b3ff0, User-Name = "bob"
+match Packet-Type = ::CoA-Request, Packet-Authentication-Vector = 0x7fbf02c6662b5990838a5e6e331b3ff0, User-Name = "bob"
 
 count
 match 5

diff --git a/src/tests/unit/protocols/radius/packet_radius.txt b/src/tests/unit/protocols/radius/packet_radius.txt
index 430bc1fc4bf23983f3b55dbb0fe6ef52c06f36e9..02e4c209de939474326cb8cd9190fe6c69558a17 100644 (file)
--- a/src/tests/unit/protocols/radius/packet_radius.txt
+++ b/src/tests/unit/protocols/radius/packet_radius.txt
@@ -70,7 +70,7 @@ fuzzer-out radius
 #    |  value     = 28c5beb8842486da70db51316f9d7889
 #
 decode-proto 01 05 00 8b ec fe 3d 2f e4 47 3e c6 29 90 95 ee 46 ae df 77 04 06 0a 00 00 01 05 06 00 00 c3 5c 3d 06 00 00 00 0f 01 0e 4a 6f 68 6e 2e 4d 63 47 75 69 72 6b 1e 13 30 30 2d 31 39 2d 30 36 2d 45 41 2d 42 38 2d 38 43 1f 13 30 30 2d 31 34 2d 32 32 2d 45 39 2d 35 34 2d 35 45 06 06 00 00 00 02 0c 06 00 00 05 dc 4f 13 02 00 00 11 01 4a 6f 68 6e 2e 4d 63 47 75 69 72 6b 50 12 28 c5 be b8 84 24 86 da 70 db 51 31 6f 9d 78 89
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0xecfe3d2fe4473ec6299095ee46aedf77, NAS-IP-Address = 10.0.0.1, NAS-Port = 50012, NAS-Port-Type = Ethernet, User-Name = "John.McGuirk", Called-Station-Id = "00-19-06-EA-B8-8C", Calling-Station-Id = "00-14-22-E9-54-5E", Service-Type = Framed-User, Framed-MTU = 1500, EAP-Message = 0x02000011014a6f686e2e4d63477569726b, Message-Authenticator = 0x28c5beb8842486da70db51316f9d7889
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0xecfe3d2fe4473ec6299095ee46aedf77, NAS-IP-Address = 10.0.0.1, NAS-Port = 50012, NAS-Port-Type = ::Ethernet, User-Name = "John.McGuirk", Called-Station-Id = "00-19-06-EA-B8-8C", Calling-Station-Id = "00-14-22-E9-54-5E", Service-Type = ::Framed-User, Framed-MTU = 1500, EAP-Message = 0x02000011014a6f686e2e4d63477569726b, Message-Authenticator = 0x28c5beb8842486da70db51316f9d7889
 
 #
 #  2.
@@ -119,7 +119,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0xecfe3d2fe44
 #    |  value     = c6d195032fdc30240f7313b231ef1d77
 #
 decode-proto 0b 05 00 6d f0 50 64 91 84 62 5d 36 f1 4c 90 75 b7 a4 8b 83 08 06 ff ff ff fe 0c 06 00 00 02 40 06 06 00 00 00 02 12 0b 48 65 6c 6c 6f 2c 20 25 75 4f 18 01 01 00 16 04 10 26 6b 0e 9a 58 32 2f 4d 01 ab 25 b3 5f 87 94 64 50 12 11 b5 04 3c 8a 28 87 58 17 31 33 a5 e0 74 34 cf 18 12 c6 d1 95 03 2f dc 30 24 0f 73 13 b2 31 ef 1d 77
-match Packet-Type = Access-Challenge, Packet-Authentication-Vector = 0xf050649184625d36f14c9075b7a48b83, Framed-IP-Address = 255.255.255.254, Framed-MTU = 576, Service-Type = Framed-User, Reply-Message = "Hello, \%u", EAP-Message = 0x010100160410266b0e9a58322f4d01ab25b35f879464, Message-Authenticator = 0x11b5043c8a288758173133a5e07434cf, State = 0xc6d195032fdc30240f7313b231ef1d77
+match Packet-Type = ::Access-Challenge, Packet-Authentication-Vector = 0xf050649184625d36f14c9075b7a48b83, Framed-IP-Address = 255.255.255.254, Framed-MTU = 576, Service-Type = ::Framed-User, Reply-Message = "Hello, \%u", EAP-Message = 0x010100160410266b0e9a58322f4d01ab25b35f879464, Message-Authenticator = 0x11b5043c8a288758173133a5e07434cf, State = 0xc6d195032fdc30240f7313b231ef1d77
 
 #
 #  3.
@@ -184,7 +184,7 @@ match Packet-Type = Access-Challenge, Packet-Authentication-Vector = 0xf05064918
 #    |  value     = 2726e2713194ebf2bc894f6a6202af38
 #
 decode-proto 01 06 00 ae 6a 6f 38 e6 da e8 30 30 4d 23 33 e5 d5 36 46 43 04 06 0a 00 00 01 05 06 00 00 c3 5c 3d 06 00 00 00 0f 01 0e 4a 6f 68 6e 2e 4d 63 47 75 69 72 6b 1e 13 30 30 2d 31 39 2d 30 36 2d 45 41 2d 42 38 2d 38 43 1f 13 30 30 2d 31 34 2d 32 32 2d 45 39 2d 35 34 2d 35 45 06 06 00 00 00 02 0c 06 00 00 05 dc 18 12 c6 d1 95 03 2f dc 30 24 0f 73 13 b2 31 ef 1d 77 4f 24 02 01 00 22 04 10 c9 f9 76 95 97 e3 20 84 3f 5f 2a f7 b8 f1 c9 bd 4a 6f 68 6e 2e 4d 63 47 75 69 72 6b 50 12 27 26 e2 71 31 94 eb f2 bc 89 4f 6a 62 02 af 38
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x6a6f38e6dae830304d2333e5d5364643, NAS-IP-Address = 10.0.0.1, NAS-Port = 50012, NAS-Port-Type = Ethernet, User-Name = "John.McGuirk", Called-Station-Id = "00-19-06-EA-B8-8C", Calling-Station-Id = "00-14-22-E9-54-5E", Service-Type = Framed-User, Framed-MTU = 1500, State = 0xc6d195032fdc30240f7313b231ef1d77, EAP-Message = 0x020100220410c9f9769597e320843f5f2af7b8f1c9bd4a6f686e2e4d63477569726b, Message-Authenticator = 0x2726e2713194ebf2bc894f6a6202af38
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x6a6f38e6dae830304d2333e5d5364643, NAS-IP-Address = 10.0.0.1, NAS-Port = 50012, NAS-Port-Type = ::Ethernet, User-Name = "John.McGuirk", Called-Station-Id = "00-19-06-EA-B8-8C", Calling-Station-Id = "00-14-22-E9-54-5E", Service-Type = ::Framed-User, Framed-MTU = 1500, State = 0xc6d195032fdc30240f7313b231ef1d77, EAP-Message = 0x020100220410c9f9769597e320843f5f2af7b8f1c9bd4a6f686e2e4d63477569726b, Message-Authenticator = 0x2726e2713194ebf2bc894f6a6202af38
 
 #
 #  4.
@@ -229,7 +229,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x6a6f38e6dae
 #    |  value     = 'John.McGuirk'
 #
 decode-proto 02 06 00 61 fb ba 6a 78 4c 7d ec b3 14 ca f0 f2 79 44 a3 7b 08 06 ff ff ff fe 0c 06 00 00 02 40 06 06 00 00 00 02 12 15 48 65 6c 6c 6f 2c 20 4a 6f 68 6e 2e 4d 63 47 75 69 72 6b 4f 06 03 01 00 04 50 12 b9 c4 ae 62 13 a7 1d 32 12 5e f7 ca 4e 4c 63 60 01 0e 4a 6f 68 6e 2e 4d 63 47 75 69 72 6b
-match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0xfbba6a784c7decb314caf0f27944a37b, Framed-IP-Address = 255.255.255.254, Framed-MTU = 576, Service-Type = Framed-User, Reply-Message = "Hello, John.McGuirk", EAP-Message = 0x03010004, Message-Authenticator = 0xb9c4ae6213a71d32125ef7ca4e4c6360, User-Name = "John.McGuirk"
+match Packet-Type = ::Access-Accept, Packet-Authentication-Vector = 0xfbba6a784c7decb314caf0f27944a37b, Framed-IP-Address = 255.255.255.254, Framed-MTU = 576, Service-Type = ::Framed-User, Reply-Message = "Hello, John.McGuirk", EAP-Message = 0x03010004, Message-Authenticator = 0xb9c4ae6213a71d32125ef7ca4e4c6360, User-Name = "John.McGuirk"
 
 count
 match 11

diff --git a/src/tests/unit/protocols/radius/packet_rfc3162.txt b/src/tests/unit/protocols/radius/packet_rfc3162.txt
index 4f9969289abcbacc93dc16fa3781eb9d0c07c71a..ede549ef2a7be2e8fa1bb6b559a63afcffdfc665 100644 (file)
--- a/src/tests/unit/protocols/radius/packet_rfc3162.txt
+++ b/src/tests/unit/protocols/radius/packet_rfc3162.txt
@@ -90,12 +90,12 @@ match raw.Framed-IPv6-Prefix = 0x004020010db80a0b12f00000000000000001
 #    |  value     = '\x00\x81 \x01\r\xb8\n\x0b\x12\xf0\x00\x00\x00\x00\x00\x00\x00\x01'
 #
 decode-proto 01 f0 00 8d 2a fd b0 90 41 8a c6 36 52 98 fb bb 15 e0 fd 2e 01 05 62 6f 62 02 12 45 e8 d5 da ea d8 7e 40 15 e0 fc c0 ec 0f 08 a1 5f 12 20 01 0d b8 0a 0b 12 f0 00 00 00 00 00 00 00 01 61 14 00 40 20 01 0d b8 0a 0b 12 f0 00 00 00 00 00 00 00 00 61 0c 00 40 20 01 0d b8 0a 0b 12 f0 61 04 00 00 61 03 00 61 15 00 40 20 01 0d b8 0a 0b 12 f0 00 00 00 00 00 00 00 00 00 61 14 00 81 20 01 0d b8 0a 0b 12 f0 00 00 00 00 00 00 00 01
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x2afdb090418ac6365298fbbb15e0fd2e, User-Name = "bob", User-Password = "\323\006\334\020\236\%\004Z\005\246\373\344\354\033\212*", NAS-IPv6-Address = 2001:db8:a0b:12f0::1, Framed-IPv6-Prefix = 2001:db8:a0b:12f0::/64, Framed-IPv6-Prefix = 2001:db8:a0b:12f0::/64, Framed-IPv6-Prefix = ::/0, raw.Framed-IPv6-Prefix = 0x00, raw.Framed-IPv6-Prefix = 0x004020010db80a0b12f0000000000000000000, raw.Framed-IPv6-Prefix = 0x008120010db80a0b12f00000000000000001
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x2afdb090418ac6365298fbbb15e0fd2e, User-Name = "bob", User-Password = "\323\006\334\020\236\%\004Z\005\246\373\344\354\033\212*", NAS-IPv6-Address = 2001:db8:a0b:12f0::1, Framed-IPv6-Prefix = 2001:db8:a0b:12f0::/64, Framed-IPv6-Prefix = 2001:db8:a0b:12f0::/64, Framed-IPv6-Prefix = ::/0, raw.Framed-IPv6-Prefix = 0x00, raw.Framed-IPv6-Prefix = 0x004020010db80a0b12f0000000000000000000, raw.Framed-IPv6-Prefix = 0x008120010db80a0b12f00000000000000001
 encode-proto -
 match 01 00 00 85 2a fd b0 90 41 8a c6 36 52 98 fb bb 15 e0 fd 2e 01 05 62 6f 62 02 12 fe 8b 65 a6 1b fd 7a 1a 10 46 07 24 00 14 82 8b 5f 12 20 01 0d b8 0a 0b 12 f0 00 00 00 00 00 00 00 01 61 0c 00 40 20 01 0d b8 0a 0b 12 f0 61 0c 00 40 20 01 0d b8 0a 0b 12 f0 61 04 00 00 61 03 00 61 15 00 40 20 01 0d b8 0a 0b 12 f0 00 00 00 00 00 00 00 00 00 61 14 00 81 20 01 0d b8 0a 0b 12 f0 00 00 00 00 00 00 00 01
 
 decode-proto -
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x2afdb090418ac6365298fbbb15e0fd2e, User-Name = "bob", User-Password = "hello", NAS-IPv6-Address = 2001:db8:a0b:12f0::1, Framed-IPv6-Prefix = 2001:db8:a0b:12f0::/64, Framed-IPv6-Prefix = 2001:db8:a0b:12f0::/64, Framed-IPv6-Prefix = ::/0, raw.Framed-IPv6-Prefix = 0x00, raw.Framed-IPv6-Prefix = 0x004020010db80a0b12f0000000000000000000, raw.Framed-IPv6-Prefix = 0x008120010db80a0b12f00000000000000001
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x2afdb090418ac6365298fbbb15e0fd2e, User-Name = "bob", User-Password = "hello", NAS-IPv6-Address = 2001:db8:a0b:12f0::1, Framed-IPv6-Prefix = 2001:db8:a0b:12f0::/64, Framed-IPv6-Prefix = 2001:db8:a0b:12f0::/64, Framed-IPv6-Prefix = ::/0, raw.Framed-IPv6-Prefix = 0x00, raw.Framed-IPv6-Prefix = 0x004020010db80a0b12f0000000000000000000, raw.Framed-IPv6-Prefix = 0x008120010db80a0b12f00000000000000001
 
 count
 match 19

diff --git a/src/tests/unit/protocols/radius/packet_rfc4675.txt b/src/tests/unit/protocols/radius/packet_rfc4675.txt
index db5dac48c3b8b6ba9f074e99e6b4f76ec51debc3..54d72a263c6b32a9eaadf4a70e82ff7e10154ec6 100644 (file)
--- a/src/tests/unit/protocols/radius/packet_rfc4675.txt
+++ b/src/tests/unit/protocols/radius/packet_rfc4675.txt
@@ -44,7 +44,7 @@ fuzzer-out radius
 #    |  value     = ffb19e8ea9620aec372d7fa3b2c76287
 #
 decode-proto 01 46 00 50 f4 47 57 bc 49 8c 33 93 76 3a 27 d0 b2 39 37 02 01 0c 62 6f 62 2d 74 61 67 67 65 64 02 12 a3 0e 22 b0 36 9e 89 f8 9e b6 e0 61 2c 2c 3c 23 04 06 7f 00 00 01 05 06 00 00 00 01 50 12 ff b1 9e 8e a9 62 0a ec 37 2d 7f a3 b2 c7 62 87
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0xf44757bc498c3393763a27d0b2393702, User-Name = "bob-tagged", User-Password = "5\340+zBc\363\342\216\360\347E,8\276\250", NAS-IP-Address = 127.0.0.1, NAS-Port = 1, Message-Authenticator = 0xffb19e8ea9620aec372d7fa3b2c76287
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0xf44757bc498c3393763a27d0b2393702, User-Name = "bob-tagged", User-Password = "5\340+zBc\363\342\216\360\347E,8\276\250", NAS-IP-Address = 127.0.0.1, NAS-Port = 1, Message-Authenticator = 0xffb19e8ea9620aec372d7fa3b2c76287
 
 #
 #  2.
@@ -73,7 +73,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0xf44757bc498
 #    |  value     = 'abcdabcd'
 #
 decode-proto 02 46 00 35 76 6a 03 14 ea f4 b9 5f 1e c2 71 ae 19 cb 3b dc 38 06 31 00 00 7b 39 06 00 00 00 01 3a 0b 31 76 6c 61 6e 6e 61 6d 65 3b 0a 61 62 63 64 61 62 63 64
-match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0x766a0314eaf4b95f1ec271ae19cb3bdc, Egress-VLANID = 822083707, Ingress-Filters = Enabled, Egress-VLAN-Name = "1vlanname", User-Priority-Table = 0x6162636461626364
+match Packet-Type = ::Access-Accept, Packet-Authentication-Vector = 0x766a0314eaf4b95f1ec271ae19cb3bdc, Egress-VLANID = 822083707, Ingress-Filters = ::Enabled, Egress-VLAN-Name = "1vlanname", User-Priority-Table = 0x6162636461626364
 
 #
 #  3.
@@ -106,7 +106,7 @@ match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0x766a0314eaf4
 #    |  value     = af8f6f9bd87d66d1c364ad3bfe9e525b
 #
 decode-proto 01 b5 00 52 11 85 1d 8b 1b 48 3f 54 a8 64 b7 03 ea 21 f4 dc 01 0e 62 6f 62 2d 75 6e 74 61 67 67 65 64 02 12 f9 69 a0 07 45 3d 0f 91 bb 58 6e 8e d6 79 bf 46 04 06 7f 00 00 01 05 06 00 00 00 01 50 12 af 8f 6f 9b d8 7d 66 d1 c3 64 ad 3b fe 9e 52 5b
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x11851d8b1b483f54a864b703ea21f4dc, User-Name = "bob-untagged", User-Password = "o\207\251\3151\300u\213\253\036i\252\326m=\315", NAS-IP-Address = 127.0.0.1, NAS-Port = 1, Message-Authenticator = 0xaf8f6f9bd87d66d1c364ad3bfe9e525b
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x11851d8b1b483f54a864b703ea21f4dc, User-Name = "bob-untagged", User-Password = "o\207\251\3151\300u\213\253\036i\252\326m=\315", NAS-IP-Address = 127.0.0.1, NAS-Port = 1, Message-Authenticator = 0xaf8f6f9bd87d66d1c364ad3bfe9e525b
 
 #
 #  4.
@@ -131,7 +131,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x11851d8b1b4
 #    |  value     = '2vlanname'
 #
 decode-proto 02 b5 00 2b e2 23 a6 63 82 3b 20 cc c1 8b cf 90 c3 ec be 27 38 06 32 00 00 7b 39 06 00 00 00 02 3a 0b 32 76 6c 61 6e 6e 61 6d 65
-match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0xe223a663823b20ccc18bcf90c3ecbe27, Egress-VLANID = 838860923, Ingress-Filters = Disabled, Egress-VLAN-Name = "2vlanname"
+match Packet-Type = ::Access-Accept, Packet-Authentication-Vector = 0xe223a663823b20ccc18bcf90c3ecbe27, Egress-VLANID = 838860923, Ingress-Filters = ::Disabled, Egress-VLAN-Name = "2vlanname"
 
 #
 #  5.
@@ -164,7 +164,7 @@ match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0xe223a663823b
 #    |  value     = c39fb2d328b7a55e41cc66bf89f1acd5
 #
 decode-proto 01 5a 00 51 8d d6 85 f5 0f 83 7e 8a d2 9e 9c c0 95 26 11 72 01 0d 62 6f 62 2d 69 6e 76 61 6c 69 64 02 12 5a 72 c9 16 f6 f4 9b be 89 ce 23 6e 0a 59 69 fe 04 06 7f 00 00 01 05 06 00 00 00 01 50 12 c3 9f b2 d3 28 b7 a5 5e 41 cc 66 bf 89 f1 ac d5
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x8dd685f50f837e8ad29e9cc095261172, User-Name = "bob-invalid", User-Password = "̜\300܂\tᤙ\210$J\nM\353u", NAS-IP-Address = 127.0.0.1, NAS-Port = 1, Message-Authenticator = 0xc39fb2d328b7a55e41cc66bf89f1acd5
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x8dd685f50f837e8ad29e9cc095261172, User-Name = "bob-invalid", User-Password = "̜\300܂\tᤙ\210$J\nM\353u", NAS-IP-Address = 127.0.0.1, NAS-Port = 1, Message-Authenticator = 0xc39fb2d328b7a55e41cc66bf89f1acd5
 
 #
 #  6.
@@ -189,7 +189,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x8dd685f50f8
 #    |  value     = '3vlanname'
 #
 decode-proto 02 5a 00 2b fb aa 7d 05 d0 09 95 35 14 d0 06 97 da 4d 1d fc 38 06 33 00 00 7b 39 06 00 00 00 03 3a 0b 33 76 6c 61 6e 6e 61 6d 65
-match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0xfbaa7d05d009953514d00697da4d1dfc, Egress-VLANID = 855638139, Ingress-Filters = 3, Egress-VLAN-Name = "3vlanname"
+match Packet-Type = ::Access-Accept, Packet-Authentication-Vector = 0xfbaa7d05d009953514d00697da4d1dfc, Egress-VLANID = 855638139, Ingress-Filters = 3, Egress-VLAN-Name = "3vlanname"
 
 count
 match 15

diff --git a/src/tests/unit/protocols/radius/packet_rfc5176-2.txt b/src/tests/unit/protocols/radius/packet_rfc5176-2.txt
index 2d06f70375fc4b80efcf95f4db878cbba48885be..45d96b50f3c0670b9d1bd184ed3a4ebad0d74a32 100644 (file)
--- a/src/tests/unit/protocols/radius/packet_rfc5176-2.txt
+++ b/src/tests/unit/protocols/radius/packet_rfc5176-2.txt
@@ -40,7 +40,7 @@ fuzzer-out radius
 #    |  value     = '\x00\x00\x00\xd1'
 #
 decode-proto 01 c8 00 37 bc 6e 70 22 44 5e 35 98 35 69 2c 8c 12 1c 19 85 01 05 62 6f 62 02 12 12 f4 1b ff 81 0d be 22 94 a8 ee dc 62 c5 7d 03 65 06 00 00 00 c9 65 06 00 00 00 d1
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0xbc6e7022445e359835692c8c121c1985, User-Name = "bob", User-Password = "\204\032\0225\365\360\3048\204\356\351\370b\321\377\210", Error-Cause = Residual-Context-Removed, Error-Cause = 209
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0xbc6e7022445e359835692c8c121c1985, User-Name = "bob", User-Password = "\204\032\0225\365\360\3048\204\356\351\370b\321\377\210", Error-Cause = ::Residual-Context-Removed, Error-Cause = 209
 
 count
 match 5

diff --git a/src/tests/unit/protocols/radius/packet_rfc5176.txt b/src/tests/unit/protocols/radius/packet_rfc5176.txt
index 1def6fd9cedaa56a5fc65fb661e6a38e9b9a55a0..23b801c990e117c4ed0f728c910076287a958186 100644 (file)
--- a/src/tests/unit/protocols/radius/packet_rfc5176.txt
+++ b/src/tests/unit/protocols/radius/packet_rfc5176.txt
@@ -28,7 +28,7 @@ fuzzer-out radius
 #    |  value     = 58513d662847e5f8734a30dbdac8e4af
 #
 decode-proto 28 01 00 26 e1 79 2d 2b 4a b3 49 f1 a4 c0 fc c7 33 d0 91 c1 50 12 58 51 3d 66 28 47 e5 f8 73 4a 30 db da c8 e4 af
-match Packet-Type = Disconnect-Request, Packet-Authentication-Vector = 0xe1792d2b4ab349f1a4c0fcc733d091c1, Message-Authenticator = 0x58513d662847e5f8734a30dbdac8e4af
+match Packet-Type = ::Disconnect-Request, Packet-Authentication-Vector = 0xe1792d2b4ab349f1a4c0fcc733d091c1, Message-Authenticator = 0x58513d662847e5f8734a30dbdac8e4af
 
 #
 #  2.
@@ -45,7 +45,7 @@ match Packet-Type = Disconnect-Request, Packet-Authentication-Vector = 0xe1792d2
 #    |  value     = a74fa4bea5e08c870edb69432c277d17
 #
 decode-proto 29 02 00 26 3b c9 c3 43 f6 89 99 07 56 b9 6c 58 3a 56 89 0a 50 12 a7 4f a4 be a5 e0 8c 87 0e db 69 43 2c 27 7d 17
-match Packet-Type = Disconnect-ACK, Packet-Authentication-Vector = 0x3bc9c343f689990756b96c583a56890a, Message-Authenticator = 0xa74fa4bea5e08c870edb69432c277d17
+match Packet-Type = ::Disconnect-ACK, Packet-Authentication-Vector = 0x3bc9c343f689990756b96c583a56890a, Message-Authenticator = 0xa74fa4bea5e08c870edb69432c277d17
 
 #
 #  3.
@@ -62,7 +62,7 @@ match Packet-Type = Disconnect-ACK, Packet-Authentication-Vector = 0x3bc9c343f68
 #    |  value     = 1bdbc1709249ede4da288122a087b8ae
 #
 decode-proto 2a 03 00 26 d8 67 c3 08 c9 c4 31 12 b3 a6 69 a0 e8 c0 ab 8c 50 12 1b db c1 70 92 49 ed e4 da 28 81 22 a0 87 b8 ae
-match Packet-Type = Disconnect-NAK, Packet-Authentication-Vector = 0xd867c308c9c43112b3a669a0e8c0ab8c, Message-Authenticator = 0x1bdbc1709249ede4da288122a087b8ae
+match Packet-Type = ::Disconnect-NAK, Packet-Authentication-Vector = 0xd867c308c9c43112b3a669a0e8c0ab8c, Message-Authenticator = 0x1bdbc1709249ede4da288122a087b8ae
 
 #
 #  4.
@@ -79,7 +79,7 @@ match Packet-Type = Disconnect-NAK, Packet-Authentication-Vector = 0xd867c308c9c
 #    |  value     = 2703ee367cd046d1dfbc5fe5b3cf5bbf
 #
 decode-proto 2b 04 00 26 5f 18 30 9b e6 7c d6 15 0f e4 c3 a0 b9 35 36 c9 50 12 27 03 ee 36 7c d0 46 d1 df bc 5f e5 b3 cf 5b bf
-match Packet-Type = CoA-Request, Packet-Authentication-Vector = 0x5f18309be67cd6150fe4c3a0b93536c9, Message-Authenticator = 0x2703ee367cd046d1dfbc5fe5b3cf5bbf
+match Packet-Type = ::CoA-Request, Packet-Authentication-Vector = 0x5f18309be67cd6150fe4c3a0b93536c9, Message-Authenticator = 0x2703ee367cd046d1dfbc5fe5b3cf5bbf
 
 #
 #  5.
@@ -96,7 +96,7 @@ match Packet-Type = CoA-Request, Packet-Authentication-Vector = 0x5f18309be67cd6
 #    |  value     = e4dfa9eeddf9d216de2be1780adcbb73
 #
 decode-proto 2c 05 00 26 55 ab 6c b7 8a a1 61 d6 92 75 3f a9 13 0c 50 19 50 12 e4 df a9 ee dd f9 d2 16 de 2b e1 78 0a dc bb 73
-match Packet-Type = CoA-ACK, Packet-Authentication-Vector = 0x55ab6cb78aa161d692753fa9130c5019, Message-Authenticator = 0xe4dfa9eeddf9d216de2be1780adcbb73
+match Packet-Type = ::CoA-ACK, Packet-Authentication-Vector = 0x55ab6cb78aa161d692753fa9130c5019, Message-Authenticator = 0xe4dfa9eeddf9d216de2be1780adcbb73
 
 #
 #  6.
@@ -113,7 +113,7 @@ match Packet-Type = CoA-ACK, Packet-Authentication-Vector = 0x55ab6cb78aa161d692
 #    |  value     = 852579e8e2e5dcbd781a9007266a06a7
 #
 decode-proto 2d 06 00 26 40 f2 1b de e2 7a 87 a5 d7 57 a3 0b fe d6 2f 28 50 12 85 25 79 e8 e2 e5 dc bd 78 1a 90 07 26 6a 06 a7
-match Packet-Type = CoA-NAK, Packet-Authentication-Vector = 0x40f21bdee27a87a5d757a30bfed62f28, Message-Authenticator = 0x852579e8e2e5dcbd781a9007266a06a7
+match Packet-Type = ::CoA-NAK, Packet-Authentication-Vector = 0x40f21bdee27a87a5d757a30bfed62f28, Message-Authenticator = 0x852579e8e2e5dcbd781a9007266a06a7
 
 count
 match 15

diff --git a/src/tests/unit/protocols/radius/packet_wireshark01.txt b/src/tests/unit/protocols/radius/packet_wireshark01.txt
index e7ea9d981019f6687de2a338cc3103f9f3881bdb..ae34bd28a6902a4083ed37afee07a306f8d7402f 100644 (file)
--- a/src/tests/unit/protocols/radius/packet_wireshark01.txt
+++ b/src/tests/unit/protocols/radius/packet_wireshark01.txt
@@ -55,7 +55,7 @@ fuzzer-out radius
 #    |   |  identity  = 'steve'
 #
 decode-proto 01 67 00 57 40 b6 64 db f5 d6 81 b2 ad bd 17 69 51 51 18 c8 01 07 73 74 65 76 65 02 12 db c6 c4 b7 58 be 14 f0 05 b3 87 7c 9e 2f b6 01 04 06 c0 a8 00 1c 05 06 00 00 00 7b 50 12 5f 0f 86 47 e8 c8 9b d8 81 36 42 68 fc d0 45 32 4f 0c 02 66 00 0a 01 73 74 65 76 65
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x40b664dbf5d681b2adbd1769515118c8, User-Name = "steve", User-Password = "M(\315},Cn\352\025\365\200X\236;4\212", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0x5f0f8647e8c89bd881364268fcd04532, EAP-Message = 0x0266000a017374657665
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x40b664dbf5d681b2adbd1769515118c8, User-Name = "steve", User-Password = "M(\315},Cn\352\025\365\200X\236;4\212", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0x5f0f8647e8c89bd881364268fcd04532, EAP-Message = 0x0266000a017374657665
 
 #
 #  2.
@@ -120,7 +120,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x40b664dbf5d
 #    |  value     = 736f868573088277414ae3f31eac34e9
 #
 decode-proto 0b 67 00 83 83 ec e7 07 a2 f3 1b b6 5b ad fb 22 a6 40 23 d9 06 06 00 00 00 02 07 06 00 00 00 01 08 06 ac 10 03 21 09 06 ff ff ff 00 0a 06 00 00 00 03 0b 09 73 74 64 2e 70 70 70 0c 06 00 00 05 dc 0d 06 00 00 00 01 4f 18 01 67 00 16 04 10 ff 0b f1 d6 e4 01 a9 cb e5 b4 6e b9 43 e5 54 9a 50 12 6e 79 4a 02 0c 45 c6 6f 42 47 ba 8c 5f f0 4e d1 18 12 73 6f 86 85 73 08 82 77 41 4a e3 f3 1e ac 34 e9
-match Packet-Type = Access-Challenge, Packet-Authentication-Vector = 0x83ece707a2f31bb65badfb22a64023d9, Service-Type = Framed-User, Framed-Protocol = PPP, Framed-IP-Address = 172.16.3.33, Framed-IP-Netmask = 255.255.255.0, Framed-Routing = Broadcast-Listen, Filter-Id = "std.ppp", Framed-MTU = 1500, Framed-Compression = Van-Jacobson-TCP-IP, EAP-Message = 0x016700160410ff0bf1d6e401a9cbe5b46eb943e5549a, Message-Authenticator = 0x6e794a020c45c66f4247ba8c5ff04ed1, State = 0x736f868573088277414ae3f31eac34e9
+match Packet-Type = ::Access-Challenge, Packet-Authentication-Vector = 0x83ece707a2f31bb65badfb22a64023d9, Service-Type = ::Framed-User, Framed-Protocol = ::PPP, Framed-IP-Address = 172.16.3.33, Framed-IP-Netmask = 255.255.255.0, Framed-Routing = ::Broadcast-Listen, Filter-Id = "std.ppp", Framed-MTU = 1500, Framed-Compression = ::Van-Jacobson-TCP-IP, EAP-Message = 0x016700160410ff0bf1d6e401a9cbe5b46eb943e5549a, Message-Authenticator = 0x6e794a020c45c66f4247ba8c5ff04ed1, State = 0x736f868573088277414ae3f31eac34e9
 
 #
 #  3.
@@ -169,7 +169,7 @@ match Packet-Type = Access-Challenge, Packet-Authentication-Vector = 0x83ece707a
 #    |   |  optional_name= b''
 #
 decode-proto 01 68 00 75 b3 e2 2f f8 55 a6 90 28 0e 6c 34 44 c4 6e 66 3b 01 07 73 74 65 76 65 02 12 fb 92 fb 79 8e d9 d6 30 27 50 18 e4 5c 6c 8b a2 04 06 c0 a8 00 1c 05 06 00 00 00 7b 50 12 8f 34 af d1 19 60 af 92 25 82 ab ea 64 ff c2 f3 18 12 73 6f 86 85 73 08 82 77 41 4a e3 f3 1e ac 34 e9 4f 18 02 67 00 16 04 10 c7 6e 1d 28 72 6f d1 c0 cb 67 1a 54 24 16 8d 26
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0xb3e22ff855a690280e6c3444c46e663b, User-Name = "steve", User-Password = "m|\362\263\372$\254*7\026\037\300\\x\t)", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0x8f34afd11960af922582abea64ffc2f3, State = 0x736f868573088277414ae3f31eac34e9, EAP-Message = 0x026700160410c76e1d28726fd1c0cb671a5424168d26
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0xb3e22ff855a690280e6c3444c46e663b, User-Name = "steve", User-Password = "m|\362\263\372$\254*7\026\037\300\\x\t)", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0x8f34afd11960af922582abea64ffc2f3, State = 0x736f868573088277414ae3f31eac34e9, EAP-Message = 0x026700160410c76e1d28726fd1c0cb671a5424168d26
 
 #
 #  4.
@@ -194,7 +194,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0xb3e22ff855a
 #    |  value     = ce70fe87a997b44de583cd19bea29321
 #
 decode-proto 03 68 00 2c 71 62 4d a2 5c 0b 58 97 f7 05 39 e0 19 a8 1e ae 4f 06 04 67 00 04 50 12 ce 70 fe 87 a9 97 b4 4d e5 83 cd 19 be a2 93 21
-match Packet-Type = Access-Reject, Packet-Authentication-Vector = 0x71624da25c0b5897f70539e019a81eae, EAP-Message = 0x04670004, Message-Authenticator = 0xce70fe87a997b44de583cd19bea29321
+match Packet-Type = ::Access-Reject, Packet-Authentication-Vector = 0x71624da25c0b5897f70539e019a81eae, EAP-Message = 0x04670004, Message-Authenticator = 0xce70fe87a997b44de583cd19bea29321
 
 #
 #  5.
@@ -237,7 +237,7 @@ match Packet-Type = Access-Reject, Packet-Authentication-Vector = 0x71624da25c0b
 #    |   |  identity  = 'steve'
 #
 decode-proto 01 71 00 57 a4 e4 80 05 35 8c af a1 bd d4 fc 63 eb 8b c4 76 01 07 73 74 65 76 65 02 12 15 b2 ec 9a 8d cf 3e 08 03 73 84 aa c1 61 a8 b5 04 06 c0 a8 00 1c 05 06 00 00 00 7b 50 12 4f 0d 82 ff 36 05 61 8a a3 86 5f 5a 72 90 14 79 4f 0c 02 70 00 0a 01 73 74 65 76 65
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0xa4e48005358cafa1bdd4fc63eb8bc476, User-Name = "steve", User-Password = "\203\\\345P\3712D\022\0235\203\216\301u*>", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0x4f0d82ff3605618aa3865f5a72901479, EAP-Message = 0x0270000a017374657665
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0xa4e48005358cafa1bdd4fc63eb8bc476, User-Name = "steve", User-Password = "\203\\\345P\3712D\022\0235\203\216\301u*>", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0x4f0d82ff3605618aa3865f5a72901479, EAP-Message = 0x0270000a017374657665
 
 #
 #  6.
@@ -302,7 +302,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0xa4e48005358
 #    |  value     = dbe0f49fdb91f0d023718fe66f2de007
 #
 decode-proto 0b 71 00 83 33 fd 82 fc 52 1b 41 a4 14 e3 f8 e4 18 27 5d 45 06 06 00 00 00 02 07 06 00 00 00 01 08 06 ac 10 03 21 09 06 ff ff ff 00 0a 06 00 00 00 03 0b 09 73 74 64 2e 70 70 70 0c 06 00 00 05 dc 0d 06 00 00 00 01 4f 18 01 71 00 16 04 10 ba 0b f4 a7 e7 17 73 59 ca a5 2e 7e b1 0d 9d 0b 50 12 59 fd f2 34 54 4b 48 d7 c9 32 e7 bd 72 1a a8 d4 18 12 db e0 f4 9f db 91 f0 d0 23 71 8f e6 6f 2d e0 07
-match Packet-Type = Access-Challenge, Packet-Authentication-Vector = 0x33fd82fc521b41a414e3f8e418275d45, Service-Type = Framed-User, Framed-Protocol = PPP, Framed-IP-Address = 172.16.3.33, Framed-IP-Netmask = 255.255.255.0, Framed-Routing = Broadcast-Listen, Filter-Id = "std.ppp", Framed-MTU = 1500, Framed-Compression = Van-Jacobson-TCP-IP, EAP-Message = 0x017100160410ba0bf4a7e7177359caa52e7eb10d9d0b, Message-Authenticator = 0x59fdf234544b48d7c932e7bd721aa8d4, State = 0xdbe0f49fdb91f0d023718fe66f2de007
+match Packet-Type = ::Access-Challenge, Packet-Authentication-Vector = 0x33fd82fc521b41a414e3f8e418275d45, Service-Type = ::Framed-User, Framed-Protocol = ::PPP, Framed-IP-Address = 172.16.3.33, Framed-IP-Netmask = 255.255.255.0, Framed-Routing = ::Broadcast-Listen, Filter-Id = "std.ppp", Framed-MTU = 1500, Framed-Compression = ::Van-Jacobson-TCP-IP, EAP-Message = 0x017100160410ba0bf4a7e7177359caa52e7eb10d9d0b, Message-Authenticator = 0x59fdf234544b48d7c932e7bd721aa8d4, State = 0xdbe0f49fdb91f0d023718fe66f2de007
 
 #
 #  7.
@@ -351,7 +351,7 @@ match Packet-Type = Access-Challenge, Packet-Authentication-Vector = 0x33fd82fc5
 #    |   |  optional_name= b''
 #
 decode-proto 01 72 00 75 8a b0 86 d6 0a e5 7c a0 46 52 a6 87 10 e6 30 de 01 07 73 74 65 76 65 02 12 c0 23 8d af 7e a4 99 d4 8b e3 25 12 a0 ae 5b c7 04 06 c0 a8 00 1c 05 06 00 00 00 7b 50 12 c5 0b 17 d5 46 cd f7 c0 a0 bf ff bd d3 5a 72 80 18 12 db e0 f4 9f db 91 f0 d0 23 71 8f e6 6f 2d e0 07 4f 18 02 71 00 16 04 10 36 d9 3b 94 f1 42 71 4e 95 06 16 13 64 0e d3 6d
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x8ab086d60ae57ca04652a68710e630de, User-Name = "steve", User-Password = "V̈́e\nY\343Λ\245\"6\240\272\331L", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0xc50b17d546cdf7c0a0bfffbdd35a7280, State = 0xdbe0f49fdb91f0d023718fe66f2de007, EAP-Message = 0x02710016041036d93b94f142714e95061613640ed36d
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x8ab086d60ae57ca04652a68710e630de, User-Name = "steve", User-Password = "V̈́e\nY\343Λ\245\"6\240\272\331L", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0xc50b17d546cdf7c0a0bfffbdd35a7280, State = 0xdbe0f49fdb91f0d023718fe66f2de007, EAP-Message = 0x02710016041036d93b94f142714e95061613640ed36d
 
 #
 #  8.
@@ -412,7 +412,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x8ab086d60ae
 #    |  value     = 'steve'
 #
 decode-proto 02 72 00 66 e6 c4 59 f6 07 63 14 87 65 35 51 64 ac 59 94 14 06 06 00 00 00 02 07 06 00 00 00 01 08 06 ac 10 03 21 09 06 ff ff ff 00 0a 06 00 00 00 03 0b 09 73 74 64 2e 70 70 70 0c 06 00 00 05 dc 0d 06 00 00 00 01 4f 06 03 71 00 04 50 12 69 ff 0a ab 72 16 68 cd 28 25 6d e5 75 73 b9 bd 01 07 73 74 65 76 65
-match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0xe6c459f60763148765355164ac599414, Service-Type = Framed-User, Framed-Protocol = PPP, Framed-IP-Address = 172.16.3.33, Framed-IP-Netmask = 255.255.255.0, Framed-Routing = Broadcast-Listen, Filter-Id = "std.ppp", Framed-MTU = 1500, Framed-Compression = Van-Jacobson-TCP-IP, EAP-Message = 0x03710004, Message-Authenticator = 0x69ff0aab721668cd28256de57573b9bd, User-Name = "steve"
+match Packet-Type = ::Access-Accept, Packet-Authentication-Vector = 0xe6c459f60763148765355164ac599414, Service-Type = ::Framed-User, Framed-Protocol = ::PPP, Framed-IP-Address = 172.16.3.33, Framed-IP-Netmask = 255.255.255.0, Framed-Routing = ::Broadcast-Listen, Filter-Id = "std.ppp", Framed-MTU = 1500, Framed-Compression = ::Van-Jacobson-TCP-IP, EAP-Message = 0x03710004, Message-Authenticator = 0x69ff0aab721668cd28256de57573b9bd, User-Name = "steve"
 
 #
 #  9.
@@ -445,7 +445,7 @@ match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0xe6c459f60763
 #    |  value     = 5e3adc9efc352420e8ca852cdfd202dd
 #
 decode-proto 01 61 00 4b 27 89 6a a2 d9 71 9b b1 36 ca 6d 51 d9 25 ea 83 01 07 73 74 65 76 65 02 12 e4 7f ed f8 e6 6d 2b 62 11 40 70 90 b9 29 f0 03 04 06 c0 a8 00 1c 05 06 00 00 00 7b 50 12 5e 3a dc 9e fc 35 24 20 e8 ca 85 2c df d2 02 dd
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x27896aa2d9719bb136ca6d51d925ea83, User-Name = "steve", User-Password = "r\221\3442\222\220Qx\001\006w\264\271=r\210", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0x5e3adc9efc352420e8ca852cdfd202dd
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x27896aa2d9719bb136ca6d51d925ea83, User-Name = "steve", User-Password = "r\221\3442\222\220Qx\001\006w\264\271=r\210", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0x5e3adc9efc352420e8ca852cdfd202dd
 
 #
 #  10.
@@ -490,7 +490,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x27896aa2d97
 #    |  value     = '\x00\x00\x00\x01'
 #
 decode-proto 02 61 00 47 8f 2f 54 cf bb 2b 5e 38 6e 6d 25 2c ab d4 68 91 06 06 00 00 00 02 07 06 00 00 00 01 08 06 ac 10 03 21 09 06 ff ff ff 00 0a 06 00 00 00 03 0b 09 73 74 64 2e 70 70 70 0c 06 00 00 05 dc 0d 06 00 00 00 01
-match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0x8f2f54cfbb2b5e386e6d252cabd46891, Service-Type = Framed-User, Framed-Protocol = PPP, Framed-IP-Address = 172.16.3.33, Framed-IP-Netmask = 255.255.255.0, Framed-Routing = Broadcast-Listen, Filter-Id = "std.ppp", Framed-MTU = 1500, Framed-Compression = Van-Jacobson-TCP-IP
+match Packet-Type = ::Access-Accept, Packet-Authentication-Vector = 0x8f2f54cfbb2b5e386e6d252cabd46891, Service-Type = ::Framed-User, Framed-Protocol = ::PPP, Framed-IP-Address = 172.16.3.33, Framed-IP-Netmask = 255.255.255.0, Framed-Routing = ::Broadcast-Listen, Filter-Id = "std.ppp", Framed-MTU = 1500, Framed-Compression = ::Van-Jacobson-TCP-IP
 
 #
 #  11.
@@ -523,7 +523,7 @@ match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0x8f2f54cfbb2b
 #    |  value     = 9da0af08542770931216d4a4cf110bf3
 #
 decode-proto 01 a8 00 4c 95 bb e8 5b 56 ad 0a a3 6d d8 0f 9b 7c 59 06 7d 01 07 73 74 65 76 65 03 13 a8 05 74 ae 2c 41 3a 39 3f 07 b5 56 49 84 bd a7 40 04 06 c0 a8 00 1c 05 06 00 00 00 7b 50 12 9d a0 af 08 54 27 70 93 12 16 d4 a4 cf 11 0b f3
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x95bbe85b56ad0aa36dd80f9b7c59067d, User-Name = "steve", CHAP-Password = 0xa80574ae2c413a393f07b5564984bda740, NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0x9da0af08542770931216d4a4cf110bf3
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x95bbe85b56ad0aa36dd80f9b7c59067d, User-Name = "steve", CHAP-Password = 0xa80574ae2c413a393f07b5564984bda740, NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0x9da0af08542770931216d4a4cf110bf3
 
 #
 #  12.
@@ -568,7 +568,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x95bbe85b56a
 #    |  value     = '\x00\x00\x00\x01'
 #
 decode-proto 02 a8 00 47 76 d7 0f 96 ce 40 5e 45 7b db 08 61 cc 33 ea cc 06 06 00 00 00 02 07 06 00 00 00 01 08 06 ac 10 03 21 09 06 ff ff ff 00 0a 06 00 00 00 03 0b 09 73 74 64 2e 70 70 70 0c 06 00 00 05 dc 0d 06 00 00 00 01
-match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0x76d70f96ce405e457bdb0861cc33eacc, Service-Type = Framed-User, Framed-Protocol = PPP, Framed-IP-Address = 172.16.3.33, Framed-IP-Netmask = 255.255.255.0, Framed-Routing = Broadcast-Listen, Filter-Id = "std.ppp", Framed-MTU = 1500, Framed-Compression = Van-Jacobson-TCP-IP
+match Packet-Type = ::Access-Accept, Packet-Authentication-Vector = 0x76d70f96ce405e457bdb0861cc33eacc, Service-Type = ::Framed-User, Framed-Protocol = ::PPP, Framed-IP-Address = 172.16.3.33, Framed-IP-Netmask = 255.255.255.0, Framed-Routing = ::Broadcast-Listen, Filter-Id = "std.ppp", Framed-MTU = 1500, Framed-Compression = ::Van-Jacobson-TCP-IP
 
 #
 #  13.
@@ -601,7 +601,7 @@ match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0x76d70f96ce40
 #    |  value     = aa5dcc5ab695fb6baf1cec851f601e22
 #
 decode-proto 01 2b 00 4b 6f 75 df 88 62 88 8f 90 d4 f6 ff 19 ae 4f 38 fb 01 07 73 74 65 76 65 02 12 1a 6c 45 1b c3 a8 45 7e 4a 50 39 e3 6c 48 43 b6 04 06 c0 a8 00 1c 05 06 00 00 00 7b 50 12 aa 5d cc 5a b6 95 fb 6b af 1c ec 85 1f 60 1e 22
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x6f75df8862888f90d4f6ff19ae4f38fb, User-Name = "steve", User-Password = "\214\202LѷU?dZ\026>\307l\\\301=", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0xaa5dcc5ab695fb6baf1cec851f601e22
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x6f75df8862888f90d4f6ff19ae4f38fb, User-Name = "steve", User-Password = "\214\202LѷU?dZ\026>\307l\\\301=", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0xaa5dcc5ab695fb6baf1cec851f601e22
 
 #
 #  14.
@@ -614,7 +614,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x6f75df88628
 #   \attributes\
 #
 decode-proto 03 2b 00 14 42 d5 fe 68 69 9d e5 32 2f 63 6f 56 6b dd 10 f3
-match Packet-Type = Access-Reject, Packet-Authentication-Vector = 0x42d5fe68699de5322f636f566bdd10f3
+match Packet-Type = ::Access-Reject, Packet-Authentication-Vector = 0x42d5fe68699de5322f636f566bdd10f3
 
 #
 #  15.
@@ -647,7 +647,7 @@ match Packet-Type = Access-Reject, Packet-Authentication-Vector = 0x42d5fe68699d
 #    |  value     = c8f4e9e54928fbaec3bb91f76a43684c
 #
 decode-proto 01 b8 00 4b 00 ef a0 45 6c 07 55 d2 c0 50 93 38 be ff 48 40 01 07 73 74 65 76 65 02 12 46 b9 07 61 ed 64 b6 28 35 c1 66 d0 70 fb 53 eb 04 06 c0 a8 00 1c 05 06 00 00 00 7b 50 12 c8 f4 e9 e5 49 28 fb ae c3 bb 91 f7 6a 43 68 4c
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x00efa0456c0755d2c0509338beff4840, User-Name = "steve", User-Password = "\320W\016\253\231\231\3142\%\207a\364p\357\321`", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0xc8f4e9e54928fbaec3bb91f76a43684c
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x00efa0456c0755d2c0509338beff4840, User-Name = "steve", User-Password = "\320W\016\253\231\231\3142\%\207a\364p\357\321`", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0xc8f4e9e54928fbaec3bb91f76a43684c
 
 #
 #  16.
@@ -680,7 +680,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x00efa0456c0
 #    |  value     = c8f4e9e54928fbaec3bb91f76a43684c
 #
 decode-proto 01 b8 00 4b 00 ef a0 45 6c 07 55 d2 c0 50 93 38 be ff 48 40 01 07 73 74 65 76 65 02 12 46 b9 07 61 ed 64 b6 28 35 c1 66 d0 70 fb 53 eb 04 06 c0 a8 00 1c 05 06 00 00 00 7b 50 12 c8 f4 e9 e5 49 28 fb ae c3 bb 91 f7 6a 43 68 4c
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x00efa0456c0755d2c0509338beff4840, User-Name = "steve", User-Password = "\320W\016\253\231\231\3142\%\207a\364p\357\321`", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0xc8f4e9e54928fbaec3bb91f76a43684c
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x00efa0456c0755d2c0509338beff4840, User-Name = "steve", User-Password = "\320W\016\253\231\231\3142\%\207a\364p\357\321`", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0xc8f4e9e54928fbaec3bb91f76a43684c
 
 #
 #  17.
@@ -713,7 +713,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x00efa0456c0
 #    |  value     = c8f4e9e54928fbaec3bb91f76a43684c
 #
 decode-proto 01 b8 00 4b 00 ef a0 45 6c 07 55 d2 c0 50 93 38 be ff 48 40 01 07 73 74 65 76 65 02 12 46 b9 07 61 ed 64 b6 28 35 c1 66 d0 70 fb 53 eb 04 06 c0 a8 00 1c 05 06 00 00 00 7b 50 12 c8 f4 e9 e5 49 28 fb ae c3 bb 91 f7 6a 43 68 4c
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x00efa0456c0755d2c0509338beff4840, User-Name = "steve", User-Password = "\320W\016\253\231\231\3142\%\207a\364p\357\321`", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0xc8f4e9e54928fbaec3bb91f76a43684c
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x00efa0456c0755d2c0509338beff4840, User-Name = "steve", User-Password = "\320W\016\253\231\231\3142\%\207a\364p\357\321`", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0xc8f4e9e54928fbaec3bb91f76a43684c
 
 #
 #  18.
@@ -746,7 +746,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x00efa0456c0
 #    |  value     = da2e52a7d91ff9f1355c01206033d610
 #
 decode-proto 01 94 00 4b 49 b9 2b 10 6a 47 5b 3d 86 68 7e 51 15 14 e5 ac 01 07 73 74 65 76 65 02 12 00 2d 28 37 53 6d 16 29 1d e2 18 b4 6c a0 bd 92 04 06 c0 a8 00 1c 05 06 00 00 00 7b 50 12 da 2e 52 a7 d9 1f f9 f1 35 5c 01 20 60 33 d6 10
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x49b92b106a475b3d86687e511514e5ac, User-Name = "steve", User-Password = "\226\303!\375'\220l3\r\244\037\220l\264?\031", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0xda2e52a7d91ff9f1355c01206033d610
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x49b92b106a475b3d86687e511514e5ac, User-Name = "steve", User-Password = "\226\303!\375'\220l3\r\244\037\220l\264?\031", NAS-IP-Address = 192.168.0.28, NAS-Port = 123, Message-Authenticator = 0xda2e52a7d91ff9f1355c01206033d610
 
 #
 #  19.
@@ -791,7 +791,7 @@ match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x49b92b106a4
 #    |  value     = '\x00\x00\x00\x01'
 #
 decode-proto 02 94 00 47 f8 ee 56 2e d9 f5 5c 3a 66 81 98 24 99 07 0d 57 06 06 00 00 00 02 07 06 00 00 00 01 08 06 ac 10 03 21 09 06 ff ff ff 00 0a 06 00 00 00 03 0b 09 73 74 64 2e 70 70 70 0c 06 00 00 05 dc 0d 06 00 00 00 01
-match Packet-Type = Access-Accept, Packet-Authentication-Vector = 0xf8ee562ed9f55c3a6681982499070d57, Service-Type = Framed-User, Framed-Protocol = PPP, Framed-IP-Address = 172.16.3.33, Framed-IP-Netmask = 255.255.255.0, Framed-Routing = Broadcast-Listen, Filter-Id = "std.ppp", Framed-MTU = 1500, Framed-Compression = Van-Jacobson-TCP-IP
+match Packet-Type = ::Access-Accept, Packet-Authentication-Vector = 0xf8ee562ed9f55c3a6681982499070d57, Service-Type = ::Framed-User, Framed-Protocol = ::PPP, Framed-IP-Address = 172.16.3.33, Framed-IP-Netmask = 255.255.255.0, Framed-Routing = ::Broadcast-Listen, Filter-Id = "std.ppp", Framed-MTU = 1500, Framed-Compression = ::Van-Jacobson-TCP-IP
 
 count
 match 41

diff --git a/src/tests/unit/protocols/radius/rfc2868.txt b/src/tests/unit/protocols/radius/rfc2868.txt
index 689c20d015c27c9c9fc80f480e3d9304c1b9824a..611a0c422504dabc2002784fa271fb9a9d570a37 100644 (file)
--- a/src/tests/unit/protocols/radius/rfc2868.txt
+++ b/src/tests/unit/protocols/radius/rfc2868.txt
@@ -44,10 +44,10 @@ encode-pair Tunnel-Type = PPTP
 match 40 06 00 00 00 01
 
 decode-pair -
-match Tunnel-Type = PPTP
+match Tunnel-Type = ::PPTP
 
 decode-pair 40 06 01 00 00 01
-match Tag-1 = { Tunnel-Type = PPTP }
+match Tag-1 = { Tunnel-Type = ::PPTP }
 
 encode-pair -
 match 40 06 01 00 00 01
@@ -56,7 +56,7 @@ match 40 06 01 00 00 01
 #  Two of the same tags, they're grouped together.
 #
 decode-pair 40 06 01 00 00 01 41 06 01 00 00 01
-match Tag-1 = { Tunnel-Type = PPTP, Tunnel-Medium-Type = IPv4 }
+match Tag-1 = { Tunnel-Type = ::PPTP, Tunnel-Medium-Type = ::IPv4 }
 
 encode-pair -
 match 40 06 01 00 00 01 41 06 01 00 00 01
@@ -65,7 +65,7 @@ match 40 06 01 00 00 01 41 06 01 00 00 01
 # tag1, tag2, tag1 --> { tag1, tag1 }, tag2
 #
 decode-pair 40 06 01 00 00 01 40 06 02 00 00 01 41 06 01 00 00 01
-match Tag-1 = { Tunnel-Type = PPTP, Tunnel-Medium-Type = IPv4 }, Tag-2 = { Tunnel-Type = PPTP }
+match Tag-1 = { Tunnel-Type = ::PPTP, Tunnel-Medium-Type = ::IPv4 }, Tag-2 = { Tunnel-Type = ::PPTP }
 
 #
 #  The "encode" will group attributes by tag value, unlike the input packet.
@@ -77,7 +77,7 @@ match 40 06 01 00 00 01 41 06 01 00 00 01 40 06 02 00 00 01
 #  Tags are aggregated across the entire packet, too.
 #
 decode-proto 01 01 00 26 00000000000000000000000000000000 40 06 01 00 00 01 40 06 02 00 00 01 41 06 01 00 00 01
-match Packet-Type = Access-Request, Packet-Authentication-Vector = 0x00000000000000000000000000000000, Tag-1 = { Tunnel-Type = PPTP, Tunnel-Medium-Type = IPv4 }, Tag-2 = { Tunnel-Type = PPTP }
+match Packet-Type = ::Access-Request, Packet-Authentication-Vector = 0x00000000000000000000000000000000, Tag-1 = { Tunnel-Type = ::PPTP, Tunnel-Medium-Type = ::IPv4 }, Tag-2 = { Tunnel-Type = ::PPTP }
 
 #
 #  and we encode the tags in order in the packet.

diff --git a/src/tests/unit/protocols/radius/struct.txt b/src/tests/unit/protocols/radius/struct.txt
index 8572bd1b70daeadac069a04ea92b3a6226a451ad..208110aedba466e76b6203f732a62c8cfb4e17d8 100644 (file)
--- a/src/tests/unit/protocols/radius/struct.txt
+++ b/src/tests/unit/protocols/radius/struct.txt
@@ -74,7 +74,7 @@ decode-pair f1 0e fa 00 00 00 01 00 00 00 02 00 04 00
 match Extended-Attribute-1 = { Unit-Ext-241-Struct4 = { Unit-Struct4-Int1 = 1, Unit-Struct4-Int2 = 2, Unit-Struct4-Short = 4 } }
 
 decode-pair ff 09 01 00 00 1a 99 05 06
-match Test-Struct = { Key-Field = Sub-Struct, Filler = 6809, Key-Field.Sub-Struct = { Nested-Sub1 = 5, Nested-Sub2 = 6 } }
+match Test-Struct = { Key-Field = ::Sub-Struct, Filler = 6809, Key-Field.Sub-Struct = { Nested-Sub1 = 5, Nested-Sub2 = 6 } }
 
 encode-pair -
 match ff 09 01 00 00 1a 99 05 06

diff --git a/src/tests/unit/protocols/radius/unit.txt b/src/tests/unit/protocols/radius/unit.txt
index 3aac37a22bd2f2b7111fa4fa258784af35a3d483..14cf0c78277e7763d55a7a1ac15dcd1e65bac8b0 100644 (file)
--- a/src/tests/unit/protocols/radius/unit.txt
+++ b/src/tests/unit/protocols/radius/unit.txt
@@ -22,7 +22,7 @@ match Extended-Attribute-1 = { Unit-Ext-241-Integer = 6809 }
 #  The server *reads* Alive, but *canonicalizes* it to Interim-Update
 #
 pair Acct-Status-Type = Alive
-match Acct-Status-Type = Interim-Update
+match Acct-Status-Type = ::Interim-Update
 
 #
 #  Encoded as two different top-level attributes.

diff --git a/src/tests/unit/protocols/radius/vendor.txt b/src/tests/unit/protocols/radius/vendor.txt
index d556b877c3371842ea0b7c4fa916d89ae073ef79..812f16c5ca11fcff00b21472c91c4baeb2d210d8 100644 (file)
--- a/src/tests/unit/protocols/radius/vendor.txt
+++ b/src/tests/unit/protocols/radius/vendor.txt
@@ -26,16 +26,16 @@ encode-pair Vendor-Specific.3com.User-Access-Level = Visitor, Vendor-Specific.3c
 match 1a 0c 00 00 00 2b 01 06 00 00 00 00 1a 26 00 00 00 2b 3c 20 31 35 35 2e 34 2e 31 32 2e 31 30 30 20 30 30 3a 30 30 3a 30 30 3a 30 30 3a 30 30 3a 30 30
 
 decode-pair -
-match Vendor-Specific = { 3com = { User-Access-Level = Visitor, Ip-Host-Addr = "155.4.12.100 00:00:00:00:00:00" } }
+match Vendor-Specific = { 3com = { User-Access-Level = ::Visitor, Ip-Host-Addr = "155.4.12.100 00:00:00:00:00:00" } }
 
 #
 #  The VSAs could also be packed into one Vendor-Specific
 #
 decode-pair 1a 2e 00 00 00 2b 1c 02 01 06 00 00 00 00 3c 20 31 35 35 2e 34 2e 31 32 2e 31 30 30 20 30 30 3a 30 30 3a 30 30 3a 30 30 3a 30 30 3a 30 30
-match Vendor-Specific = { 3com = { User-Access-Level = Visitor, Ip-Host-Addr = "155.4.12.100 00:00:00:00:00:00" } }
+match Vendor-Specific = { 3com = { User-Access-Level = ::Visitor, Ip-Host-Addr = "155.4.12.100 00:00:00:00:00:00" } }
 
 decode-pair 1a 2c 00 00 00 2b 01 06 00 00 00 00 3c 20 31 35 35 2e 34 2e 31 32 2e 31 30 30 20 30 30 3a 30 30 3a 30 30 3a 30 30 3a 30 30 3a 30 30
-match Vendor-Specific = { 3com = { User-Access-Level = Visitor, Ip-Host-Addr = "155.4.12.100 00:00:00:00:00:00" } }
+match Vendor-Specific = { 3com = { User-Access-Level = ::Visitor, Ip-Host-Addr = "155.4.12.100 00:00:00:00:00:00" } }
 
 #
 #  Vendor-Specific is of type "vsa", and therefore cannot be assigned values.
@@ -60,7 +60,7 @@ encode-pair Vendor-Specific.Unisphere.LI-Action = off
 match 1a 1a 00 00 13 0a 3a 14 86 2a d5 3d ac 81 44 14 10 34 bc 97 47 38 9a 18 25 e5
 
 decode-pair -
-match Vendor-Specific = { Unisphere = { LI-Action = off } }
+match Vendor-Specific = { Unisphere = { LI-Action = ::off } }
 
 #packet coa_request
 #original null

diff --git a/src/tests/unit/protocols/radius/wimax.txt b/src/tests/unit/protocols/radius/wimax.txt
index 073d9a5f9c8852d3bf7162a3f9b350512d388e23..f328a1d5ebafaee8385d80ad838036322608eb4a 100644 (file)
--- a/src/tests/unit/protocols/radius/wimax.txt
+++ b/src/tests/unit/protocols/radius/wimax.txt
@@ -15,13 +15,13 @@ encode-pair Vendor-Specific.WiMAX.Capability.Accounting-Capabilities = 1
 match 1a 0c 00 00 60 b5 01 06 00 02 03 01
 
 decode-pair -
-match Vendor-Specific = { WiMAX = { Capability = { Accounting-Capabilities = IP-Session-Based } } }
+match Vendor-Specific = { WiMAX = { Capability = { Accounting-Capabilities = ::IP-Session-Based } } }
 
 encode-pair Vendor-Specific.WiMAX.Capability.Release = "1.0", Vendor-Specific.WiMAX.Capability.Accounting-Capabilities = 1
 match 1a 11 00 00 60 b5 01 0b 00 01 05 31 2e 30 02 03 01
 
 decode-pair -
-match Vendor-Specific = { WiMAX = { Capability = { Release = "1.0", Accounting-Capabilities = IP-Session-Based } } }
+match Vendor-Specific = { WiMAX = { Capability = { Release = "1.0", Accounting-Capabilities = ::IP-Session-Based } } }
 
 encode-pair -
 match 1a 11 00 00 60 b5 01 0b 00 01 05 31 2e 30 02 03 01
@@ -201,7 +201,7 @@ match Vendor-Specific = { WiMAX = { Packet-Flow-Descriptor-v2 = { Classifier = {
 #  Simple test for continued attributes
 #
 decode-pair 1a 0e 00 00 60 b5 01 08 80 01 05 31 2e 30 1a 0c 00 00 60 b5 01 06 00 02 03 00
-match Vendor-Specific = { WiMAX = { } }, Vendor-Specific.WiMAX.Capability = { Release = "1.0", Accounting-Capabilities = No-Accounting }
+match Vendor-Specific = { WiMAX = { } }, Vendor-Specific.WiMAX.Capability = { Release = "1.0", Accounting-Capabilities = ::No-Accounting }
 
 #
 #  See if encoding multiple attributes works
@@ -299,7 +299,7 @@ encode-pair Vendor-Specific.WiMAX.Capability = { Release = "1.0", Accounting-Cap
 match 1a 11 00 00 60 b5 01 0b 00 01 05 31 2e 30 02 03 00
 
 decode-pair -
-match Vendor-Specific = { WiMAX = { Capability = { Release = "1.0", Accounting-Capabilities = No-Accounting } } }
+match Vendor-Specific = { WiMAX = { Capability = { Release = "1.0", Accounting-Capabilities = ::No-Accounting } } }
 
 
 count

diff --git a/src/tests/unit/protocols/tacacs/base.txt b/src/tests/unit/protocols/tacacs/base.txt
index b232c1cfc32738ad58d212b4d8043c6c17ec50cb..8ed8411d736a68ad3e880387079991ace4c50356 100644 (file)
--- a/src/tests/unit/protocols/tacacs/base.txt
+++ b/src/tests/unit/protocols/tacacs/base.txt
@@ -17,7 +17,7 @@ fuzzer-out tacacs
 #      Authentication: Start Request: (Client -> Server)
 #
 decode-proto c1 01 01 00 b7 0f c8 0e 00 00 00 22 79 d2 9a 66 67 fe fe 87 04 af 61 7e cb 79 20 bb ca 61 cf 8b 25 ab 70 9e 68 af 9f d5 ae de c5 5d 5e 73
-match Packet = { Version-Major = Plus, Version-Minor = 1, Packet-Type = Authentication, Sequence-Number = 1, Flags = None, Session-Id = 3071264782, Length = 34 }, Packet-Body-Type = Start, Action = LOGIN, Privilege-Level = Minimum, Authentication-Type = PAP, Authentication-Service = PPP, User-Name = "bob", Client-Port = "tapioca/0", Remote-Address = "localhost", User-Password = "hello"
+match Packet = { Version-Major = ::Plus, Version-Minor = 1, Packet-Type = ::Authentication, Sequence-Number = 1, Flags = ::None, Session-Id = 3071264782, Length = 34 }, Packet-Body-Type = ::Start, Action = ::LOGIN, Privilege-Level = ::Minimum, Authentication-Type = ::PAP, Authentication-Service = ::PPP, User-Name = "bob", Client-Port = "tapioca/0", Remote-Address = "localhost", User-Password = "hello"
 
 encode-proto -
 match c1 01 01 01 b7 0f c8 0e 00 00 00 22 01 00 02 03 03 09 09 05 62 6f 62 74 61 70 69 6f 63 61 2f 30 6c 6f 63 61 6c 68 6f 73 74 68 65 6c 6c 6f
@@ -26,13 +26,13 @@ match c1 01 01 01 b7 0f c8 0e 00 00 00 22 01 00 02 03 03 09 09 05 62 6f 62 74 61
 #      Authentication: Reply: (Client <- Server)
 #
 decode-proto c1 01 02 00 b7 0f c8 0e 00 00 00 06 39 51 39 56 ef f4
-match Packet = { Version-Major = Plus, Version-Minor = 1, Packet-Type = Authentication, Sequence-Number = 2, Flags = None, Session-Id = 3071264782, Length = 6 }, Packet-Body-Type = Reply, Authentication-Status = Pass, Authentication-Flags = 0, Server-Message = "", Data = 0x
+match Packet = { Version-Major = ::Plus, Version-Minor = 1, Packet-Type = ::Authentication, Sequence-Number = 2, Flags = ::None, Session-Id = 3071264782, Length = 6 }, Packet-Body-Type = ::Reply, Authentication-Status = ::Pass, Authentication-Flags = 0, Server-Message = "", Data = 0x
 
 encode-proto -
 match c1 01 02 01 b7 0f c8 0e 00 00 00 06 01 00 00 00 00 00
 
 pair Packet.Version-Major = Plus, Packet.Version-Minor = 0, Packet.Packet-Type = Authorization, Packet.Sequence-Number = 1, Packet.Flags = None, Packet.Session-Id = 3781589222, Packet.Length = 53, Packet-Body-Type = Request, Authentication-Method = TACACSPLUS, Privilege-Level = Minimum, Authentication-Type = PAP, Authentication-Service = PPP, User-Name = "bob", Client-Port = "tapioca/0", Remote-Address = "localhost", service = "ppp", protocol = "ip"
-match Packet = { Version-Major = Plus, Version-Minor = 0, Packet-Type = Authorization, Sequence-Number = 1, Flags = None, Session-Id = 3781589222, Length = 53 }, Packet-Body-Type = Request, Authentication-Method = TACACSPLUS, Privilege-Level = Minimum, Authentication-Type = PAP, Authentication-Service = PPP, User-Name = "bob", Client-Port = "tapioca/0", Remote-Address = "localhost", service = "ppp", protocol = "ip"
+match Packet = { Version-Major = ::Plus, Version-Minor = 0, Packet-Type = ::Authorization, Sequence-Number = 1, Flags = ::None, Session-Id = 3781589222, Length = 53 }, Packet-Body-Type = ::Request, Authentication-Method = ::TACACSPLUS, Privilege-Level = ::Minimum, Authentication-Type = ::PAP, Authentication-Service = ::PPP, User-Name = "bob", Client-Port = "tapioca/0", Remote-Address = "localhost", service = "ppp", protocol = "ip"
 
 encode-proto -
 match c0 02 01 01 e1 66 78 e6 00 00 00 35 06 00 02 03 03 09 09 02 0b 0b 62 6f 62 74 61 70 69 6f 63 61 2f 30 6c 6f 63 61 6c 68 6f 73 74 73 65 72 76 69 63 65 3d 70 70 70 70 72 6f 74 6f 63 6f 6c 3d 69 70
@@ -41,7 +41,7 @@ match c0 02 01 01 e1 66 78 e6 00 00 00 35 06 00 02 03 03 09 09 02 0b 0b 62 6f 62
 #  Authorization - Request: (Client -> Server)
 #
 decode-proto c0 02 01 00 e1 66 78 e6 00 00 00 35 4b c5 ea 62 13 cc ca a6 6a 03 3c 8e 3f c0 5a aa 46 da 12 cd ee 48 62 69 67 9a b8 b4 db 70 98 30 b7 fc f6 93 09 d4 3f 2c a9 58 9e 3c 6a 0e d5 50 20 e6 a5 39 46
-match Packet = { Version-Major = Plus, Version-Minor = 0, Packet-Type = Authorization, Sequence-Number = 1, Flags = None, Session-Id = 3781589222, Length = 53 }, Packet-Body-Type = Request, Authentication-Method = TACACSPLUS, Privilege-Level = Minimum, Authentication-Type = PAP, Authentication-Service = PPP, User-Name = "bob", Client-Port = "tapioca/0", Remote-Address = "localhost", service = "ppp", protocol = "ip"
+match Packet = { Version-Major = ::Plus, Version-Minor = 0, Packet-Type = ::Authorization, Sequence-Number = 1, Flags = ::None, Session-Id = 3781589222, Length = 53 }, Packet-Body-Type = ::Request, Authentication-Method = ::TACACSPLUS, Privilege-Level = ::Minimum, Authentication-Type = ::PAP, Authentication-Service = ::PPP, User-Name = "bob", Client-Port = "tapioca/0", Remote-Address = "localhost", service = "ppp", protocol = "ip"
 
 encode-proto -
 match c0 02 01 01 e1 66 78 e6 00 00 00 35 06 00 02 03 03 09 09 02 0b 0b 62 6f 62 74 61 70 69 6f 63 61 2f 30 6c 6f 63 61 6c 68 6f 73 74 73 65 72 76 69 63 65 3d 70 70 70 70 72 6f 74 6f 63 6f 6c 3d 69 70
@@ -50,7 +50,7 @@ match c0 02 01 01 e1 66 78 e6 00 00 00 35 06 00 02 03 03 09 09 02 0b 0b 62 6f 62
 #  Authorization - Response: (Client <- Server)
 #
 decode-proto c0 02 02 00 e1 66 78 e6 00 00 00 13 02 59 f9 90 38 81 e1 bb 9d a6 13 93 fc 86 7e 4a 14 1c 24
-match Packet = { Version-Major = Plus, Version-Minor = 0, Packet-Type = Authorization, Sequence-Number = 2, Flags = None, Session-Id = 3781589222, Length = 19 }, Packet-Body-Type = Response, Authorization-Status = Pass-Add, Server-Message = "", Data = 0x, addr = 1.2.3.4
+match Packet = { Version-Major = ::Plus, Version-Minor = 0, Packet-Type = ::Authorization, Sequence-Number = 2, Flags = ::None, Session-Id = 3781589222, Length = 19 }, Packet-Body-Type = ::Response, Authorization-Status = ::Pass-Add, Server-Message = "", Data = 0x, addr = 1.2.3.4
 
 encode-proto -
 match c0 02 02 01 e1 66 78 e6 00 00 00 13 01 01 00 00 00 00 0c 61 64 64 72 3d 31 2e 32 2e 33 2e 34
@@ -59,7 +59,7 @@ match c0 02 02 01 e1 66 78 e6 00 00 00 13 01 01 00 00 00 00 0c 61 64 64 72 3d 31
 #  Accounting - Request: (Client -> Server)
 #
 decode-proto c0 03 01 00 07 9b 35 d9 00 00 00 5b 7c 8a 99 d6 88 f9 32 3c ec 34 6d 23 89 71 72 dd 89 46 75 df 9c 00 a5 96 28 05 fc 57 88 02 0c 11 a3 60 9a 05 8b 71 6d 27 ca 83 b0 ab 2f 00 27 c8 da 58 d3 1a f1 3f 07 17 8d f6 35 c5 7b e2 07 be 29 86 d4 93 16 99 04 01 ef 03 6c 1c 2b ad 3a fb 5b 11 06 61 dc d9 09 1d 6a 08 1e
-match Packet = { Version-Major = Plus, Version-Minor = 0, Packet-Type = Accounting, Sequence-Number = 1, Flags = None, Session-Id = 127612377, Length = 91 }, Packet-Body-Type = Request, Accounting-Flags = Start, Authentication-Method = TACACSPLUS, Privilege-Level = Minimum, Authentication-Type = PAP, Authentication-Service = PPP, User-Name = "bob", Client-Port = "tapioca/0", Remote-Address = "localhost", start_time = "2020-08-04T18:27:24Z", task_id = "17558", service = "ppp", protocol = "ip"
+match Packet = { Version-Major = ::Plus, Version-Minor = 0, Packet-Type = ::Accounting, Sequence-Number = 1, Flags = ::None, Session-Id = 127612377, Length = 91 }, Packet-Body-Type = ::Request, Accounting-Flags = ::Start, Authentication-Method = ::TACACSPLUS, Privilege-Level = ::Minimum, Authentication-Type = ::PAP, Authentication-Service = ::PPP, User-Name = "bob", Client-Port = "tapioca/0", Remote-Address = "localhost", start_time = "2020-08-04T18:27:24Z", task_id = "17558", service = "ppp", protocol = "ip"
 
 encode-proto -
 match c0 03 01 01 07 9b 35 d9 00 00 00 5a 02 06 00 02 03 03 09 09 04 15 0d 0b 0b 62 6f 62 74 61 70 69 6f 63 61 2f 30 6c 6f 63 61 6c 68 6f 73 74 73 74 61 72 74 5f 74 69 6d 65 3d 31 35 39 36 35 36 35 36 34 34 74 61 73 6b 5f 69 64 3d 31 37 35 35 38 73 65 72 76 69 63 65 3d 70 70 70 70 72 6f 74 6f 63 6f 6c 3d 69 70
@@ -68,7 +68,7 @@ match c0 03 01 01 07 9b 35 d9 00 00 00 5a 02 06 00 02 03 03 09 09 04 15 0d 0b 0b
 #  Accounting - Response: (Client <- Server)
 #
 decode-proto c0 03 02 00 07 9b 35 d9 00 00 00 05 49 d8 e5 4a 73
-match Packet = { Version-Major = Plus, Version-Minor = 0, Packet-Type = Accounting, Sequence-Number = 2, Flags = None, Session-Id = 127612377, Length = 5 }, Packet-Body-Type = Reply, Server-Message = "", Data = 0x, Accounting-Status = Success
+match Packet = { Version-Major = ::Plus, Version-Minor = 0, Packet-Type = ::Accounting, Sequence-Number = 2, Flags = ::None, Session-Id = 127612377, Length = 5 }, Packet-Body-Type = ::Reply, Server-Message = "", Data = 0x, Accounting-Status = ::Success
 encode-proto -
 match c0 03 02 01 07 9b 35 d9 00 00 00 05 00 00 00 00 01
 

diff --git a/src/tests/unit/protocols/tacacs/regression.txt b/src/tests/unit/protocols/tacacs/regression.txt
index 128619ac19981ffee03624a15e76947c0612bb78..c462f910de69e3e8a3bf1a6195adf3784579ebc7 100644 (file)
--- a/src/tests/unit/protocols/tacacs/regression.txt
+++ b/src/tests/unit/protocols/tacacs/regression.txt
@@ -17,7 +17,7 @@ encode-proto Packet.Version-Major = Plus, Packet.Version-Minor = 0, Packet.Packe
 match c0 02 02 05 e1 66 78 e6 00 00 00 13 01 01 00 00 00 00 0c 61 64 64 72 3d 31 2e 32 2e 33 2e 34
 
 decode-proto -
-match Packet = { Version-Major = Plus, Version-Minor = 0, Packet-Type = Authorization, Sequence-Number = 2, Flags = Unencrypted-Single-Connect, Session-Id = 3781589222, Length = 19 }, Packet-Body-Type = Response, Authorization-Status = Pass-Add, Server-Message = "", Data = 0x, addr = 1.2.3.4
+match Packet = { Version-Major = ::Plus, Version-Minor = 0, Packet-Type = ::Authorization, Sequence-Number = 2, Flags = ::Unencrypted-Single-Connect, Session-Id = 3781589222, Length = 19 }, Packet-Body-Type = ::Response, Authorization-Status = ::Pass-Add, Server-Message = "", Data = 0x, addr = 1.2.3.4
 
 count
 match 7

diff --git a/src/tests/unit/protocols/tftp/base.txt b/src/tests/unit/protocols/tftp/base.txt
index 5f1153657d5ffbdca503b4d92efdc02c1a9a2c75..1d8228cf6888675f58ad97dfb93710d8d6ed23de 100644 (file)
--- a/src/tests/unit/protocols/tftp/base.txt
+++ b/src/tests/unit/protocols/tftp/base.txt
@@ -10,7 +10,7 @@ fuzzer-out tftp
 #      Client -> Server (Read-Request) - Without block-size
 #
 decode-proto 00 01 73 63 61 6c 64 5f 6c 61 77 2e 74 78 74 00 61 73 63 69 69 00
-match Opcode = Read-Request, Filename = "scald_law.txt", Mode = ASCII
+match Opcode = ::Read-Request, Filename = "scald_law.txt", Mode = ::ASCII
 
 encode-proto -
 match 00 01 73 63 61 6c 64 5f 6c 61 77 2e 74 78 74 00 61 73 63 69 69 00
@@ -19,7 +19,7 @@ match 00 01 73 63 61 6c 64 5f 6c 61 77 2e 74 78 74 00 61 73 63 69 69 00
 #      Client -> Server (Read-Request) - With block-size
 #
 decode-proto 00 01 73 63 61 6c 64 5f 6c 61 77 2e 74 78 74 00 61 73 63 69 69 00 62 6c 6b 73 69 7a 65 00 31 32 33 34 35 00
-match Opcode = Read-Request, Filename = "scald_law.txt", Mode = ASCII, Block-Size = 12345
+match Opcode = ::Read-Request, Filename = "scald_law.txt", Mode = ::ASCII, Block-Size = 12345
 
 encode-proto -
 match 00 01 73 63 61 6c 64 5f 6c 61 77 2e 74 78 74 00 61 73 63 69 69 00 62 6c 6b 73 69 7a 65 00 31 32 33 34 35 00
@@ -28,7 +28,7 @@ match 00 01 73 63 61 6c 64 5f 6c 61 77 2e 74 78 74 00 61 73 63 69 69 00 62 6c 6b
 #      Client -> Server (Write-Request)
 #
 decode-proto 00 02 73 63 61 6c 64 5f 6c 61 77 2e 74 78 74 00 61 73 63 69 69 00
-match Opcode = Write-Request, Filename = "scald_law.txt", Mode = ASCII
+match Opcode = ::Write-Request, Filename = "scald_law.txt", Mode = ::ASCII
 
 encode-proto -
 match 00 02 73 63 61 6c 64 5f 6c 61 77 2e 74 78 74 00 61 73 63 69 69 00
@@ -37,7 +37,7 @@ match 00 02 73 63 61 6c 64 5f 6c 61 77 2e 74 78 74 00 61 73 63 69 69 00
 #      Client -> Server (Data)
 #
 decode-proto 00 03 12 34 31 32 33 34 35
-match Opcode = Data, Block = 4660, Data = 0x3132333435
+match Opcode = ::Data, Block = 4660, Data = 0x3132333435
 
 encode-proto -
 match 00 03 12 34 31 32 33 34 35
@@ -46,7 +46,7 @@ match 00 03 12 34 31 32 33 34 35
 #      Client -> Server (Acknowledgement)
 #
 decode-proto 00 04 12 34
-match Opcode = Acknowledgement, Block = 4660
+match Opcode = ::Acknowledgement, Block = 4660
 
 encode-proto -
 match 00 04 12 34
@@ -55,7 +55,7 @@ match 00 04 12 34
 #      Server -> Client (Error)
 #
 decode-proto 00 05 00 04 4b 61 6c 6f 73 20 46 61 75 6c 74 00
-match Opcode = Error, Error-Code = Illegal-Operation, Error-Message = "Kalos Fault"
+match Opcode = ::Error, Error-Code = ::Illegal-Operation, Error-Message = "Kalos Fault"
 
 encode-proto -
 match 00 05 00 04 4b 61 6c 6f 73 20 46 61 75 6c 74 00

diff --git a/src/tests/unit/protocols/vmps/base.txt b/src/tests/unit/protocols/vmps/base.txt
index e5a3b1b75218aef8ff9395598f6b6a82cd3447ed..732f5d8b8693ff7fb719f8b3697f2cf674a4675f 100644 (file)
--- a/src/tests/unit/protocols/vmps/base.txt
+++ b/src/tests/unit/protocols/vmps/base.txt
@@ -10,7 +10,7 @@ fuzzer-out vmps
 #      decode Join-Request
 #
 decode-proto 01 01 00 06 00 00 12 34 00 00 0c 01 00 04 c0 a8 45 01 00 00 0c 02 00 04 65 74 68 30 00 00 0c 03 00 05 6b 61 6c 6f 73 00 00 0c 04 00 0b 74 61 70 69 6f 63 61 2e 6c 61 6e 00 00 0c 07 00 01 00 00 00 0c 06 00 06 ca fe ca fe ca fe
-match Packet-Type = Join-Request, Error-Code = No-Error, Sequence-Number = 4660, Client-IPv4-Address = 192.168.69.1, Port-Name = "eth0", VLAN-Name = "kalos", Domain-Name = "tapioca.lan", Unknown = 0x00, MAC-Address = ca:fe:ca:fe:ca:fe
+match Packet-Type = ::Join-Request, Error-Code = ::No-Error, Sequence-Number = 4660, Client-IPv4-Address = 192.168.69.1, Port-Name = "eth0", VLAN-Name = "kalos", Domain-Name = "tapioca.lan", Unknown = 0x00, MAC-Address = ca:fe:ca:fe:ca:fe
 
 #
 #      decode Join-Request
@@ -22,7 +22,7 @@ match 01 01 00 06 00 00 12 34 00 00 0c 01 00 04 c0 a8 45 01 00 00 0c 02 00 04 65
 #      decode Join-Response
 #
 decode-proto 01 02 00 02 00 00 12 34 00 00 0c 03 00 08 4d 69 72 61 6b 75 6c 6f 00 00 0c 08 00 06 ca fe ca fe ca fe
-match Packet-Type = Join-Response, Error-Code = No-Error, Sequence-Number = 4660, VLAN-Name = "Mirakulo", Cookie = ca:fe:ca:fe:ca:fe
+match Packet-Type = ::Join-Response, Error-Code = ::No-Error, Sequence-Number = 4660, VLAN-Name = "Mirakulo", Cookie = ca:fe:ca:fe:ca:fe
 
 #
 #      encode Join-Response