diff options
| author | Denis Ovsienko <denis@ovsienko.info> | 2020-08-07 19:00:06 +0100 |
|---|---|---|
| committer | Denis Ovsienko <denis@ovsienko.info> | 2020-08-07 19:04:31 +0100 |
| commit | 34ec5e5f3f7fe5cbe1a5a0d2f9166467476caecd (patch) | |
| tree | c50b1abada0ae86abc61880ce0af918489d33066 /tests/dhcp-mud.out | |
| parent | 776ebde21a2c19b12d498d09bbaeac16426a7983 (diff) | |
| download | tcpdump-34ec5e5f3f7fe5cbe1a5a0d2f9166467476caecd.tar.gz | |
DHCP: Make option printing format more consistent.
rfc1048_print() used to print DHCP options in a few different formats
depending on the context (see GH issue #866):
* at the top of an RFC 1048 block:
* known options: [string] name and [decimal] tag
* unknown options: tag twice
* inside a Parameter Request (55) block:
* known options: name
* unknown options: tag
Change it to use the "Name (tag)" format (as in TCP, BGP, etc) in all
contexts. Update output for 8 tests.
Diffstat (limited to 'tests/dhcp-mud.out')
| -rw-r--r-- | tests/dhcp-mud.out | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/tests/dhcp-mud.out b/tests/dhcp-mud.out index ad974675..90e12df6 100644 --- a/tests/dhcp-mud.out +++ b/tests/dhcp-mud.out @@ -5,18 +5,18 @@ Client-Ethernet-Address b8:27:eb:b8:53:c8 Vendor-rfc1048 Extensions Magic Cookie 0x63825363 - DHCP-Message Option 53, length 1: Request - Client-ID Option 61, length 7: ether b8:27:eb:b8:53:c8 - MSZ Option 57, length 2: 1472 - MUD-URL Option 161, length 54: "https://mudctl.example.com/.well-known/mud/v1/rasbp101" - Vendor-Class Option 60, length 45: "dhcpcd-6.11.5:Linux-4.1.18-v7+:armv7l:BCM2709" - Hostname Option 12, length 11: "raspberrypi" - T145 Option 145, length 1: 1 - Parameter-Request Option 55, length 16: - Subnet-Mask, Classless-Static-Route, Static-Route, Default-Gateway - Domain-Name-Server, Hostname, Domain-Name, BR - NTP, Lease-Time, Server-ID, RN - RB, POSIX-TZ, TZ-Name, Option 119 + DHCP-Message (53), length 1: Request + Client-ID (61), length 7: ether b8:27:eb:b8:53:c8 + MSZ (57), length 2: 1472 + MUD-URL (161), length 54: "https://mudctl.example.com/.well-known/mud/v1/rasbp101" + Vendor-Class (60), length 45: "dhcpcd-6.11.5:Linux-4.1.18-v7+:armv7l:BCM2709" + Hostname (12), length 11: "raspberrypi" + Unknown (145), length 1: 1 + Parameter-Request (55), length 16: + Subnet-Mask (1), Classless-Static-Route (121), Static-Route (33), Default-Gateway (3) + Domain-Name-Server (6), Hostname (12), Domain-Name (15), BR (28) + NTP (42), Lease-Time (51), Server-ID (54), RN (58) + RB (59), POSIX-TZ (100), TZ-Name (101), Unknown (119) 2 12:28:41.318491 IP (tos 0x0, ttl 64, id 10305, offset 0, flags [DF], proto UDP (17), length 338) 62.12.173.114.67 > 62.12.173.121.67: [udp sum ok] BOOTP/DHCP, Reply, length 310, hops 1, xid 0x68c4847, Flags [none] (0x0000) Client-IP 62.12.173.123 @@ -26,11 +26,11 @@ Client-Ethernet-Address b8:27:eb:b8:53:c8 Vendor-rfc1048 Extensions Magic Cookie 0x63825363 - DHCP-Message Option 53, length 1: ACK - Server-ID Option 54, length 4: 62.12.173.114 - Lease-Time Option 51, length 4: 600 - Subnet-Mask Option 1, length 4: 255.255.255.248 - Default-Gateway Option 3, length 4: 62.12.173.121 - Domain-Name-Server Option 6, length 4: 62.12.173.114 - Domain-Name Option 15, length 19: "ofcourseimright.com" - TZ-Name Option 101, length 13: "Europe/Berlin" + DHCP-Message (53), length 1: ACK + Server-ID (54), length 4: 62.12.173.114 + Lease-Time (51), length 4: 600 + Subnet-Mask (1), length 4: 255.255.255.248 + Default-Gateway (3), length 4: 62.12.173.121 + Domain-Name-Server (6), length 4: 62.12.173.114 + Domain-Name (15), length 19: "ofcourseimright.com" + TZ-Name (101), length 13: "Europe/Berlin" |