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-rfc5859-v.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-rfc5859-v.out')
| -rw-r--r-- | tests/dhcp-rfc5859-v.out | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/tests/dhcp-rfc5859-v.out b/tests/dhcp-rfc5859-v.out index 403d1f4d..cfec4882 100644 --- a/tests/dhcp-rfc5859-v.out +++ b/tests/dhcp-rfc5859-v.out @@ -3,42 +3,42 @@ Client-Ethernet-Address 00:0c:29:1f:74:06 Vendor-rfc1048 Extensions Magic Cookie 0x63825363 - DHCP-Message Option 53, length 1: Discover - Parameter-Request Option 55, length 8: - Subnet-Mask, BR, Time-Zone, Default-Gateway - Domain-Name, Domain-Name-Server, Hostname, TFTP-Server-Address + DHCP-Message (53), length 1: Discover + Parameter-Request (55), length 8: + Subnet-Mask (1), BR (28), Time-Zone (2), Default-Gateway (3) + Domain-Name (15), Domain-Name-Server (6), Hostname (12), TFTP-Server-Address (150) 2 15:36:13.061643 IP (tos 0x10, ttl 128, id 0, offset 0, flags [none], proto UDP (17), length 328) 192.168.1.1.67 > 192.168.1.4.68: BOOTP/DHCP, Reply, length 300, xid 0xde549277, Flags [none] Your-IP 192.168.1.4 Client-Ethernet-Address 00:0c:29:1f:74:06 Vendor-rfc1048 Extensions Magic Cookie 0x63825363 - DHCP-Message Option 53, length 1: Offer - Server-ID Option 54, length 4: 192.168.1.1 - Lease-Time Option 51, length 4: 43200 - Subnet-Mask Option 1, length 4: 255.255.255.0 - Default-Gateway Option 3, length 4: 192.168.1.1 - TFTP-Server-Address Option 150, length 8: 192.168.1.10,192.168.1.11 + DHCP-Message (53), length 1: Offer + Server-ID (54), length 4: 192.168.1.1 + Lease-Time (51), length 4: 43200 + Subnet-Mask (1), length 4: 255.255.255.0 + Default-Gateway (3), length 4: 192.168.1.1 + TFTP-Server-Address (150), length 8: 192.168.1.10,192.168.1.11 3 15:36:13.061643 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: BOOTP/DHCP, Request from 00:0c:29:1f:74:06, length 300, xid 0xde549277, Flags [none] Client-Ethernet-Address 00:0c:29:1f:74:06 Vendor-rfc1048 Extensions Magic Cookie 0x63825363 - DHCP-Message Option 53, length 1: Request - Server-ID Option 54, length 4: 192.168.1.1 - Requested-IP Option 50, length 4: 192.168.1.4 - Parameter-Request Option 55, length 8: - Subnet-Mask, BR, Time-Zone, Default-Gateway - Domain-Name, Domain-Name-Server, Hostname, TFTP-Server-Address + DHCP-Message (53), length 1: Request + Server-ID (54), length 4: 192.168.1.1 + Requested-IP (50), length 4: 192.168.1.4 + Parameter-Request (55), length 8: + Subnet-Mask (1), BR (28), Time-Zone (2), Default-Gateway (3) + Domain-Name (15), Domain-Name-Server (6), Hostname (12), TFTP-Server-Address (150) 4 15:36:13.065643 IP (tos 0x10, ttl 128, id 0, offset 0, flags [none], proto UDP (17), length 328) 192.168.1.1.67 > 192.168.1.4.68: BOOTP/DHCP, Reply, length 300, xid 0xde549277, Flags [none] Your-IP 192.168.1.4 Client-Ethernet-Address 00:0c:29:1f:74:06 Vendor-rfc1048 Extensions Magic Cookie 0x63825363 - DHCP-Message Option 53, length 1: ACK - Server-ID Option 54, length 4: 192.168.1.1 - Lease-Time Option 51, length 4: 43200 - Subnet-Mask Option 1, length 4: 255.255.255.0 - Default-Gateway Option 3, length 4: 192.168.1.1 - TFTP-Server-Address Option 150, length 8: 192.168.1.10,192.168.1.11 + DHCP-Message (53), length 1: ACK + Server-ID (54), length 4: 192.168.1.1 + Lease-Time (51), length 4: 43200 + Subnet-Mask (1), length 4: 255.255.255.0 + Default-Gateway (3), length 4: 192.168.1.1 + TFTP-Server-Address (150), length 8: 192.168.1.10,192.168.1.11 |