mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-24 02:23:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

DHCPv6: Remove a bad ')' in output

Browse Source 
In Vendor-specific Information Option.
This commit is contained in:
Francois-Xavier Le Bail 2024-01-13 17:42:19 +01:00
parent dca99f177d
commit 1ac329adef
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
print-dhcp6.c
View File

@ -897,7 +897,6 @@ dhcp6opt_print(netdissect_options *ndo,
GET_U_1(tp + i));
if (i < subopt_len)
ND_PRINT("...");
ND_PRINT(")");
tp += subopt_len;
remain_len -= subopt_len;
}

12
tests/dhcpv4v6-rfc5970-rfc8572.out
View File

@ -1,7 +1,7 @@
1 13:35:23.334910 IP6 (flowlabel 0x03f85, hlim 1, next-header UDP (17) payload length: 80) fe80::200:1ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 solicit (xid=6aebe6 (vendor-specific-info enterprise 30065 (code 1 len 6 data 417269737461))) (client-ID hwaddr/time type 1 time 701530515 000001010000) (option-request SZTP-redirect DNS-search-list DNS-server) (elapsed-time 703) (IA_NA IAID:16842752 T1:3600 T2:5400))
2 13:35:45.614434 IP6 (flowlabel 0x03f85, hlim 1, next-header UDP (17) payload length: 80) fe80::200:1ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 solicit (xid=aca407 (vendor-specific-info enterprise 30065 (code 1 len 6 data 417269737461))) (client-ID hwaddr/time type 1 time 701530515 000001010000) (option-request SZTP-redirect DNS-search-list DNS-server) (elapsed-time 0) (IA_NA IAID:16842752 T1:3600 T2:5400))
1 13:35:23.334910 IP6 (flowlabel 0x03f85, hlim 1, next-header UDP (17) payload length: 80) fe80::200:1ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 solicit (xid=6aebe6 (vendor-specific-info enterprise 30065 (code 1 len 6 data 417269737461)) (client-ID hwaddr/time type 1 time 701530515 000001010000) (option-request SZTP-redirect DNS-search-list DNS-server) (elapsed-time 703) (IA_NA IAID:16842752 T1:3600 T2:5400))
2 13:35:45.614434 IP6 (flowlabel 0x03f85, hlim 1, next-header UDP (17) payload length: 80) fe80::200:1ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 solicit (xid=aca407 (vendor-specific-info enterprise 30065 (code 1 len 6 data 417269737461)) (client-ID hwaddr/time type 1 time 701530515 000001010000) (option-request SZTP-redirect DNS-search-list DNS-server) (elapsed-time 0) (IA_NA IAID:16842752 T1:3600 T2:5400))
3 13:35:45.618584 IP6 (flowlabel 0xe612c, hlim 64, next-header UDP (17) payload length: 281) fe80::cc0d:b4ff:fe8a:3384.547 > fe80::200:1ff:fe01:0.546: [udp sum ok] dhcp6 advertise (xid=aca407 (IA_NA IAID:16842752 T1:0 T2:0 (IA_ADDR 1234:5678::4 pltime:18000 vltime:28800)) (client-ID hwaddr/time type 1 time 701530515 000001010000) (server-ID hwaddr/time type 1 time 701530524 ce0db48a3384) (SZTP-redirect https://sztp1.download.com,https://sztp2.download.com:8080,https://10.10.0.0,https://10.10.0.0:8000,https://[2001:4860:4860::8888]:8080) (DNS-search-list aristanetworks.com.) (DNS-server 1234:5678::2))
4 13:35:46.635774 IP6 (flowlabel 0x03f85, hlim 1, next-header UDP (17) payload length: 126) fe80::200:1ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 request (xid=5f98e6 (vendor-specific-info enterprise 30065 (code 1 len 6 data 417269737461))) (client-ID hwaddr/time type 1 time 701530515 000001010000) (server-ID hwaddr/time type 1 time 701530524 ce0db48a3384) (option-request SZTP-redirect DNS-search-list DNS-server) (elapsed-time 0) (IA_NA IAID:16842752 T1:3600 T2:5400 (IA_ADDR 1234:5678::4 pltime:7200 vltime:7500)))
4 13:35:46.635774 IP6 (flowlabel 0x03f85, hlim 1, next-header UDP (17) payload length: 126) fe80::200:1ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 request (xid=5f98e6 (vendor-specific-info enterprise 30065 (code 1 len 6 data 417269737461)) (client-ID hwaddr/time type 1 time 701530515 000001010000) (server-ID hwaddr/time type 1 time 701530524 ce0db48a3384) (option-request SZTP-redirect DNS-search-list DNS-server) (elapsed-time 0) (IA_NA IAID:16842752 T1:3600 T2:5400 (IA_ADDR 1234:5678::4 pltime:7200 vltime:7500)))
5 13:35:46.638223 IP6 (flowlabel 0xe612c, hlim 64, next-header UDP (17) payload length: 281) fe80::cc0d:b4ff:fe8a:3384.547 > fe80::200:1ff:fe01:0.546: [udp sum ok] dhcp6 reply (xid=5f98e6 (IA_NA IAID:16842752 T1:0 T2:0 (IA_ADDR 1234:5678::4 pltime:7200 vltime:28800)) (client-ID hwaddr/time type 1 time 701530515 000001010000) (server-ID hwaddr/time type 1 time 701530524 ce0db48a3384) (SZTP-redirect https://sztp1.download.com,https://sztp2.download.com:8080,https://10.10.0.0,https://10.10.0.0:8000,https://[2001:4860:4860::8888]:8080) (DNS-search-list aristanetworks.com.) (DNS-server 1234:5678::2))
6 13:56:39.000073 IP (tos 0x10, ttl 128, id 0, offset 0, flags [none], proto UDP (17), length 328)
0.0.0.0.68 > 255.255.255.255.67: [udp sum ok] BOOTP/DHCP, Request from 00:00:44:01:00:00, length 300, xid 0x796a827d, Flags [none] (0x0000)
@ -69,8 +69,8 @@
length 17: "https://10.10.0.0"
length 22: "https://10.10.0.0:8000"
length 35: "https://[2001:4860:4860::8888]:8080"
10 14:15:10.112658 IP6 (flowlabel 0x03f85, hlim 1, next-header UDP (17) payload length: 80) fe80::200:1ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 solicit (xid=28792a (vendor-specific-info enterprise 30065 (code 1 len 6 data 417269737461))) (client-ID hwaddr/time type 1 time 701792102 000001010000) (option-request Bootfile-URL DNS-search-list DNS-server) (elapsed-time 754) (IA_NA IAID:16842752 T1:3600 T2:5400))
10 14:15:10.112658 IP6 (flowlabel 0x03f85, hlim 1, next-header UDP (17) payload length: 80) fe80::200:1ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 solicit (xid=28792a (vendor-specific-info enterprise 30065 (code 1 len 6 data 417269737461)) (client-ID hwaddr/time type 1 time 701792102 000001010000) (option-request Bootfile-URL DNS-search-list DNS-server) (elapsed-time 754) (IA_NA IAID:16842752 T1:3600 T2:5400))
11 14:15:33.148466 IP6 (flowlabel 0x1570c, hlim 64, next-header UDP (17) payload length: 157) fe80::40d3:61ff:fe62:3810.547 > fe80::200:1ff:fe01:0.546: [udp sum ok] dhcp6 advertise (xid=654242 (IA_NA IAID:16842752 T1:0 T2:0 (IA_ADDR 1234:5678::4 pltime:18000 vltime:28800)) (client-ID hwaddr/time type 1 time 701792102 000001010000) (server-ID hwaddr/time type 1 time 701792110 42d361623810) (Bootfile-URL my-startup-config) (DNS-search-list aristanetworks.com.) (DNS-server 1234:5678::2))
12 14:15:34.152941 IP6 (flowlabel 0x03f85, hlim 1, next-header UDP (17) payload length: 126) fe80::200:1ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 request (xid=becafa (vendor-specific-info enterprise 30065 (code 1 len 6 data 417269737461))) (client-ID hwaddr/time type 1 time 701792102 000001010000) (server-ID hwaddr/time type 1 time 701792110 42d361623810) (option-request Bootfile-URL DNS-search-list DNS-server) (elapsed-time 0) (IA_NA IAID:16842752 T1:3600 T2:5400 (IA_ADDR 1234:5678::4 pltime:7200 vltime:7500)))
12 14:15:34.152941 IP6 (flowlabel 0x03f85, hlim 1, next-header UDP (17) payload length: 126) fe80::200:1ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 request (xid=becafa (vendor-specific-info enterprise 30065 (code 1 len 6 data 417269737461)) (client-ID hwaddr/time type 1 time 701792102 000001010000) (server-ID hwaddr/time type 1 time 701792110 42d361623810) (option-request Bootfile-URL DNS-search-list DNS-server) (elapsed-time 0) (IA_NA IAID:16842752 T1:3600 T2:5400 (IA_ADDR 1234:5678::4 pltime:7200 vltime:7500)))
13 14:15:34.156427 IP6 (flowlabel 0x1570c, hlim 64, next-header UDP (17) payload length: 157) fe80::40d3:61ff:fe62:3810.547 > fe80::200:1ff:fe01:0.546: [udp sum ok] dhcp6 reply (xid=becafa (IA_NA IAID:16842752 T1:0 T2:0 (IA_ADDR 1234:5678::4 pltime:7200 vltime:28800)) (client-ID hwaddr/time type 1 time 701792102 000001010000) (server-ID hwaddr/time type 1 time 701792110 42d361623810) (Bootfile-URL my-startup-config) (DNS-search-list aristanetworks.com.) (DNS-server 1234:5678::2))
14 08:08:32.009292 IP6 (flowlabel 0x09903, hlim 1, next-header UDP (17) payload length: 138) fe80::200:44ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 inf-req (xid=b5fcf (vendor-specific-info enterprise 30065 (code 1 len 44 data 4172697374613b546573742d446863707636446973636f7665723b30312e30303b4853483134343235313438))) (client-ID hwaddr type 1 000044010000) (option-request Bootfile-URL DNS-search-list DNS-server) (elapsed-time 331) (user-class Arista;Test-Dhcpv6Discover;4.21.XX))
14 08:08:32.009292 IP6 (flowlabel 0x09903, hlim 1, next-header UDP (17) payload length: 138) fe80::200:44ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 inf-req (xid=b5fcf (vendor-specific-info enterprise 30065 (code 1 len 44 data 4172697374613b546573742d446863707636446973636f7665723b30312e30303b4853483134343235313438)) (client-ID hwaddr type 1 000044010000) (option-request Bootfile-URL DNS-search-list DNS-server) (elapsed-time 331) (user-class Arista;Test-Dhcpv6Discover;4.21.XX))

2
tests/dhcpv6-rfc8415-duid-type2.out
View File

@ -1 +1 @@
1 16:59:07.188393 IP6 (flowlabel 0x38898, hlim 1, next-header UDP (17) payload length: 155) fe80::200:1ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 request (xid=e4a4a3 (vendor-specific-info enterprise 30065 (code 1 len 18 data 4172697374613b485348...))) (client-ID enterprise 30065 4853483134343235313438) (server-ID hwaddr/time type 1 time 721155524 828662a1defd) (option-request Bootfile-URL SZTP-redirect DNS-search-list DNS-server) (elapsed-time 0) (user-class Arista) (IA_NA IAID:16842752 T1:3600 T2:5400 (IA_ADDR 1234:5678::4 pltime:7200 vltime:7500)))
1 16:59:07.188393 IP6 (flowlabel 0x38898, hlim 1, next-header UDP (17) payload length: 155) fe80::200:1ff:fe01:0.546 > ff02::1:2.547: [udp sum ok] dhcp6 request (xid=e4a4a3 (vendor-specific-info enterprise 30065 (code 1 len 18 data 4172697374613b485348...)) (client-ID enterprise 30065 4853483134343235313438) (server-ID hwaddr/time type 1 time 721155524 828662a1defd) (option-request Bootfile-URL SZTP-redirect DNS-search-list DNS-server) (elapsed-time 0) (user-class Arista) (IA_NA IAID:16842752 T1:3600 T2:5400 (IA_ADDR 1234:5678::4 pltime:7200 vltime:7500)))

2
tests/dhcpv6-vendor-specific-information-vv.out
View File

@ -1 +1 @@
1 23:25:55.136477 IP6 (hlim 64, next-header UDP (17) payload length: 595) fc00:502:411:1::1.546 > fc00:502:400:0:10:32:0:69.547: [udp sum ok] dhcp6 relay-fwd (linkaddr=fc00:502:411:1::1 peeraddr=fc00:502:411:1::1 (interface-ID 54d46ffa109a) (vendor-specific-info enterprise 4491 (code 38 len 4 data 01020300)) (code 39 len 6 data 54d46ffa109a))) (relay-message (dhcp6 request (xid=d98c5d (reconfigure-accept) (vendor-class) (option-request vendor-specific-info) (vendor-specific-info enterprise 4491 (code 1 len 16 data 00200021002200250026087a087b0027)) (code 2 len 3 data 45434d)) (code 3 len 12 data 45434d3a454d54413a455053)) (code 4 len 10 data 445247373930382d3533)) (code 5 len 3 data 312e30)) (code 6 len 26 data 647267373930382d5031352d31342d7633303272313231313161)) (code 7 len 5 data 322e332e31)) (code 8 len 6 data 353444343646)) (code 9 len 7 data 44524737393038)) (code 10 len 5 data 436973636f)) (code 35 len 122 data 057801010102010303010104010105010106010107010f0801100901000a01010b01180c01010d0200400e02000a0f010110040000000611010014010015013f1601011701011801041901041a01041b01201c01021d01081e01201f0110200110210102220101230100240100250101260200ff270101280100)) (code 36 len 6 data 54d46ffa109a))) (client-ID hwaddr type 1 54d46ffa109a) (server-ID hwaddr/time type 1 time 336091266 000c290f1c3b) (IA_NA IAID:1878659226 T1:0 T2:0 (IA_ADDR fc00:502:411:1::31 pltime:27000 vltime:43200) (vendor-specific-info enterprise 4491 (code 32 len 16 data fc000502040000000010003200000069)) (code 2170 len 16 data 000200040a200045000100040a200045)) (code 3 len 4 data 00000001)) (code 37 len 16 data fc000502040000000010003200000069)) (code 38 len 4 data 00000000)) (code 33 len 13 data 73616d706c65636d362e62696e)) (code 34 len 16 data fc000502040000000010003200000069)))) (elapsed-time 0))))
1 23:25:55.136477 IP6 (hlim 64, next-header UDP (17) payload length: 595) fc00:502:411:1::1.546 > fc00:502:400:0:10:32:0:69.547: [udp sum ok] dhcp6 relay-fwd (linkaddr=fc00:502:411:1::1 peeraddr=fc00:502:411:1::1 (interface-ID 54d46ffa109a) (vendor-specific-info enterprise 4491 (code 38 len 4 data 01020300) (code 39 len 6 data 54d46ffa109a)) (relay-message (dhcp6 request (xid=d98c5d (reconfigure-accept) (vendor-class) (option-request vendor-specific-info) (vendor-specific-info enterprise 4491 (code 1 len 16 data 00200021002200250026087a087b0027) (code 2 len 3 data 45434d) (code 3 len 12 data 45434d3a454d54413a455053) (code 4 len 10 data 445247373930382d3533) (code 5 len 3 data 312e30) (code 6 len 26 data 647267373930382d5031352d31342d7633303272313231313161) (code 7 len 5 data 322e332e31) (code 8 len 6 data 353444343646) (code 9 len 7 data 44524737393038) (code 10 len 5 data 436973636f) (code 35 len 122 data 057801010102010303010104010105010106010107010f0801100901000a01010b01180c01010d0200400e02000a0f010110040000000611010014010015013f1601011701011801041901041a01041b01201c01021d01081e01201f0110200110210102220101230100240100250101260200ff270101280100) (code 36 len 6 data 54d46ffa109a)) (client-ID hwaddr type 1 54d46ffa109a) (server-ID hwaddr/time type 1 time 336091266 000c290f1c3b) (IA_NA IAID:1878659226 T1:0 T2:0 (IA_ADDR fc00:502:411:1::31 pltime:27000 vltime:43200) (vendor-specific-info enterprise 4491 (code 32 len 16 data fc000502040000000010003200000069) (code 2170 len 16 data 000200040a200045000100040a200045) (code 3 len 4 data 00000001) (code 37 len 16 data fc000502040000000010003200000069) (code 38 len 4 data 00000000) (code 33 len 13 data 73616d706c65636d362e62696e) (code 34 len 16 data fc000502040000000010003200000069))) (elapsed-time 0))))

2
tests/dhcpv6-vendor-specific-information.out
View File

@ -1 +1 @@
1 23:25:55.136477 IP6 (hlim 64, next-header UDP (17) payload length: 595) fc00:502:411:1::1.546 > fc00:502:400:0:10:32:0:69.547: [udp sum ok] dhcp6 relay-fwd (linkaddr=fc00:502:411:1::1 peeraddr=fc00:502:411:1::1 (interface-ID 54d46ffa109a) (vendor-specific-info enterprise 4491 (code 38 len 4 data 01020300)) (code 39 len 6 data 54d46ffa109a))) (relay-message (dhcp6 request (xid=d98c5d (reconfigure-accept) (vendor-class) (option-request vendor-specific-info) (vendor-specific-info enterprise 4491 (code 1 len 16 data 00200021002200250026...)) (code 2 len 3 data 45434d)) (code 3 len 12 data 45434d3a454d54413a45...)) (code 4 len 10 data 445247373930382d3533)) (code 5 len 3 data 312e30)) (code 6 len 26 data 647267373930382d5031...)) (code 7 len 5 data 322e332e31)) (code 8 len 6 data 353444343646)) (code 9 len 7 data 44524737393038)) (code 10 len 5 data 436973636f)) (code 35 len 122 data 05780101010201030301...)) (code 36 len 6 data 54d46ffa109a))) (client-ID hwaddr type 1 54d46ffa109a) (server-ID hwaddr/time type 1 time 336091266 000c290f1c3b) (IA_NA IAID:1878659226 T1:0 T2:0 (IA_ADDR fc00:502:411:1::31 pltime:27000 vltime:43200) (vendor-specific-info enterprise 4491 (code 32 len 16 data fc000502040000000010...)) (code 2170 len 16 data 000200040a2000450001...)) (code 3 len 4 data 00000001)) (code 37 len 16 data fc000502040000000010...)) (code 38 len 4 data 00000000)) (code 33 len 13 data 73616d706c65636d362e...)) (code 34 len 16 data fc000502040000000010...)))) (elapsed-time 0))))
1 23:25:55.136477 IP6 (hlim 64, next-header UDP (17) payload length: 595) fc00:502:411:1::1.546 > fc00:502:400:0:10:32:0:69.547: [udp sum ok] dhcp6 relay-fwd (linkaddr=fc00:502:411:1::1 peeraddr=fc00:502:411:1::1 (interface-ID 54d46ffa109a) (vendor-specific-info enterprise 4491 (code 38 len 4 data 01020300) (code 39 len 6 data 54d46ffa109a)) (relay-message (dhcp6 request (xid=d98c5d (reconfigure-accept) (vendor-class) (option-request vendor-specific-info) (vendor-specific-info enterprise 4491 (code 1 len 16 data 00200021002200250026...) (code 2 len 3 data 45434d) (code 3 len 12 data 45434d3a454d54413a45...) (code 4 len 10 data 445247373930382d3533) (code 5 len 3 data 312e30) (code 6 len 26 data 647267373930382d5031...) (code 7 len 5 data 322e332e31) (code 8 len 6 data 353444343646) (code 9 len 7 data 44524737393038) (code 10 len 5 data 436973636f) (code 35 len 122 data 05780101010201030301...) (code 36 len 6 data 54d46ffa109a)) (client-ID hwaddr type 1 54d46ffa109a) (server-ID hwaddr/time type 1 time 336091266 000c290f1c3b) (IA_NA IAID:1878659226 T1:0 T2:0 (IA_ADDR fc00:502:411:1::31 pltime:27000 vltime:43200) (vendor-specific-info enterprise 4491 (code 32 len 16 data fc000502040000000010...) (code 2170 len 16 data 000200040a2000450001...) (code 3 len 4 data 00000001) (code 37 len 16 data fc000502040000000010...) (code 38 len 4 data 00000000) (code 33 len 13 data 73616d706c65636d362e...) (code 34 len 16 data fc000502040000000010...))) (elapsed-time 0))))