cdp: show the TLV type as a 4-digit hex number.

It's 2 bytes long.

4 files changed, 130 insertions, 130 deletions

diff --git a/print-cdp.c b/print-cdp.c
index d3bce2e9..62eeed45 100644
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -297,7 +297,7 @@ cdp_print(netdissect_options *ndo,
 		    (info ? (info->when_to_print == VERBOSE_OR_NOT_VERBOSE) : 0);
 		if (len < CDP_TLV_HEADER_LEN) {
 			if (ndo->ndo_vflag)
-				ND_PRINT("\n\t%s (0x%02x), TLV length: %u byte%s (too short)",
+				ND_PRINT("\n\t%s (0x%04x), TLV length: %u byte%s (too short)",
 				         name, type, len, PLURAL_SUFFIX(len));
 			else
 				ND_PRINT(", %s TLV length %u too short",
@@ -314,7 +314,7 @@ cdp_print(netdissect_options *ndo,
 
 		if (ndo->ndo_vflag) {
 			/* Print all TLVs when in verbose mode */
-			ND_PRINT("\n\t%s (0x%02x), value length: %u byte%s: ",
+			ND_PRINT("\n\t%s (0x%04x), value length: %u byte%s: ",
 			         name, type, len, PLURAL_SUFFIX(len));
 		} else {
 			/* Print only some TLVs when not in verbose mode */
diff --git a/tests/cdp-v.out b/tests/cdp-v.out
index 00376348..e2cff059 100644
--- a/tests/cdp-v.out
+++ b/tests/cdp-v.out
@@ -1,54 +1,54 @@
     1  11:46:08.367761 CDPv2, ttl: 180s, checksum: 0xb0bd (unverified), length 378
-	Device-ID (0x01), value length: 6 bytes: 'Switch'
-	Version String (0x05), value length: 192 bytes: 
+	Device-ID (0x0001), value length: 6 bytes: 'Switch'
+	Version String (0x0005), value length: 192 bytes: 
 	  Cisco IOS Software, C3560 Software (C3560-ADVIPSERVICESK9-M), Version 12.2(25)SEB4, RELEASE SOFTWARE (fc1)
 	  Copyright (c) 1986-2005 by Cisco Systems, Inc.
 	  Compiled Tue 30-Aug-05 17:56 by yenanh
-	Platform (0x06), value length: 20 bytes: 'cisco WS-C3560G-24PS'
-	Address (0x02), value length: 13 bytes: IPv4 (1) 192.168.0.1
-	Port-ID (0x03), value length: 18 bytes: 'GigabitEthernet0/5'
-	Capability (0x04), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-	Protocol-Hello option (0x08), value length: 32 bytes: 
-	VTP Management Domain (0x09), value length: 3 bytes: 'Lab'
-	Native VLAN ID (0x0a), value length: 2 bytes: 1
-	Duplex (0x0b), value length: 1 byte: full
-	AVVID trust bitmap (0x12), value length: 1 byte: 0x00
-	AVVID untrusted ports CoS (0x13), value length: 1 byte: 0x00
-	Management Addresses (0x16), value length: 13 bytes: IPv4 (1) 192.168.0.1
-	Power available (0x1a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
+	Platform (0x0006), value length: 20 bytes: 'cisco WS-C3560G-24PS'
+	Address (0x0002), value length: 13 bytes: IPv4 (1) 192.168.0.1
+	Port-ID (0x0003), value length: 18 bytes: 'GigabitEthernet0/5'
+	Capability (0x0004), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
+	Protocol-Hello option (0x0008), value length: 32 bytes: 
+	VTP Management Domain (0x0009), value length: 3 bytes: 'Lab'
+	Native VLAN ID (0x000a), value length: 2 bytes: 1
+	Duplex (0x000b), value length: 1 byte: full
+	AVVID trust bitmap (0x0012), value length: 1 byte: 0x00
+	AVVID untrusted ports CoS (0x0013), value length: 1 byte: 0x00
+	Management Addresses (0x0016), value length: 13 bytes: IPv4 (1) 192.168.0.1
+	Power available (0x001a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
     2  11:47:08.378706 CDPv2, ttl: 180s, checksum: 0xb0bd (unverified), length 378
-	Device-ID (0x01), value length: 6 bytes: 'Switch'
-	Version String (0x05), value length: 192 bytes: 
+	Device-ID (0x0001), value length: 6 bytes: 'Switch'
+	Version String (0x0005), value length: 192 bytes: 
 	  Cisco IOS Software, C3560 Software (C3560-ADVIPSERVICESK9-M), Version 12.2(25)SEB4, RELEASE SOFTWARE (fc1)
 	  Copyright (c) 1986-2005 by Cisco Systems, Inc.
 	  Compiled Tue 30-Aug-05 17:56 by yenanh
-	Platform (0x06), value length: 20 bytes: 'cisco WS-C3560G-24PS'
-	Address (0x02), value length: 13 bytes: IPv4 (1) 192.168.0.1
-	Port-ID (0x03), value length: 18 bytes: 'GigabitEthernet0/5'
-	Capability (0x04), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-	Protocol-Hello option (0x08), value length: 32 bytes: 
-	VTP Management Domain (0x09), value length: 3 bytes: 'Lab'
-	Native VLAN ID (0x0a), value length: 2 bytes: 1
-	Duplex (0x0b), value length: 1 byte: full
-	AVVID trust bitmap (0x12), value length: 1 byte: 0x00
-	AVVID untrusted ports CoS (0x13), value length: 1 byte: 0x00
-	Management Addresses (0x16), value length: 13 bytes: IPv4 (1) 192.168.0.1
-	Power available (0x1a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
+	Platform (0x0006), value length: 20 bytes: 'cisco WS-C3560G-24PS'
+	Address (0x0002), value length: 13 bytes: IPv4 (1) 192.168.0.1
+	Port-ID (0x0003), value length: 18 bytes: 'GigabitEthernet0/5'
+	Capability (0x0004), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
+	Protocol-Hello option (0x0008), value length: 32 bytes: 
+	VTP Management Domain (0x0009), value length: 3 bytes: 'Lab'
+	Native VLAN ID (0x000a), value length: 2 bytes: 1
+	Duplex (0x000b), value length: 1 byte: full
+	AVVID trust bitmap (0x0012), value length: 1 byte: 0x00
+	AVVID untrusted ports CoS (0x0013), value length: 1 byte: 0x00
+	Management Addresses (0x0016), value length: 13 bytes: IPv4 (1) 192.168.0.1
+	Power available (0x001a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
     3  11:48:08.392643 CDPv2, ttl: 180s, checksum: 0xb0bd (unverified), length 378
-	Device-ID (0x01), value length: 6 bytes: 'Switch'
-	Version String (0x05), value length: 192 bytes: 
+	Device-ID (0x0001), value length: 6 bytes: 'Switch'
+	Version String (0x0005), value length: 192 bytes: 
 	  Cisco IOS Software, C3560 Software (C3560-ADVIPSERVICESK9-M), Version 12.2(25)SEB4, RELEASE SOFTWARE (fc1)
 	  Copyright (c) 1986-2005 by Cisco Systems, Inc.
 	  Compiled Tue 30-Aug-05 17:56 by yenanh
-	Platform (0x06), value length: 20 bytes: 'cisco WS-C3560G-24PS'
-	Address (0x02), value length: 13 bytes: IPv4 (1) 192.168.0.1
-	Port-ID (0x03), value length: 18 bytes: 'GigabitEthernet0/5'
-	Capability (0x04), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-	Protocol-Hello option (0x08), value length: 32 bytes: 
-	VTP Management Domain (0x09), value length: 3 bytes: 'Lab'
-	Native VLAN ID (0x0a), value length: 2 bytes: 1
-	Duplex (0x0b), value length: 1 byte: full
-	AVVID trust bitmap (0x12), value length: 1 byte: 0x00
-	AVVID untrusted ports CoS (0x13), value length: 1 byte: 0x00
-	Management Addresses (0x16), value length: 13 bytes: IPv4 (1) 192.168.0.1
-	Power available (0x1a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
+	Platform (0x0006), value length: 20 bytes: 'cisco WS-C3560G-24PS'
+	Address (0x0002), value length: 13 bytes: IPv4 (1) 192.168.0.1
+	Port-ID (0x0003), value length: 18 bytes: 'GigabitEthernet0/5'
+	Capability (0x0004), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
+	Protocol-Hello option (0x0008), value length: 32 bytes: 
+	VTP Management Domain (0x0009), value length: 3 bytes: 'Lab'
+	Native VLAN ID (0x000a), value length: 2 bytes: 1
+	Duplex (0x000b), value length: 1 byte: full
+	AVVID trust bitmap (0x0012), value length: 1 byte: 0x00
+	AVVID untrusted ports CoS (0x0013), value length: 1 byte: 0x00
+	Management Addresses (0x0016), value length: 13 bytes: IPv4 (1) 192.168.0.1
+	Power available (0x001a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
diff --git a/tests/lldp_cdp-ev.out b/tests/lldp_cdp-ev.out
index 1bd122af..6ae5250a 100644
--- a/tests/lldp_cdp-ev.out
+++ b/tests/lldp_cdp-ev.out
@@ -1,39 +1,39 @@
     1  03:00:34.141848 00:18:ba:98:68:8f > 01:00:0c:cc:cc:cc, 802.3, length 374: LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Cisco (0x00000c), pid CDP (0x2000), length 366: CDPv2, ttl: 180s, checksum: 0x0bea (unverified), length 366
-	Device-ID (0x01), value length: 2 bytes: 'S1'
-	Version String (0x05), value length: 190 bytes: 
+	Device-ID (0x0001), value length: 2 bytes: 'S1'
+	Version String (0x0005), value length: 190 bytes: 
 	  Cisco IOS Software, C3560 Software (C3560-ADVIPSERVICESK9-M), Version 12.2(44)SE, RELEASE SOFTWARE (fc1)
 	  Copyright (c) 1986-2008 by Cisco Systems, Inc.
 	  Compiled Sat 05-Jan-08 00:15 by weiliu
-	Platform (0x06), value length: 19 bytes: 'cisco WS-C3560-24TS'
-	Address (0x02), value length: 13 bytes: IPv4 (1) 0.0.0.0
-	Port-ID (0x03), value length: 16 bytes: 'FastEthernet0/13'
-	Capability (0x04), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-	Protocol-Hello option (0x08), value length: 32 bytes: 
-	VTP Management Domain (0x09), value length: 0 bytes: ''
-	Native VLAN ID (0x0a), value length: 2 bytes: 1
-	Duplex (0x0b), value length: 1 byte: full
-	AVVID trust bitmap (0x12), value length: 1 byte: 0x00
-	AVVID untrusted ports CoS (0x13), value length: 1 byte: 0x00
-	Management Addresses (0x16), value length: 13 bytes: IPv4 (1) 0.0.0.0
-	Power available (0x1a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
+	Platform (0x0006), value length: 19 bytes: 'cisco WS-C3560-24TS'
+	Address (0x0002), value length: 13 bytes: IPv4 (1) 0.0.0.0
+	Port-ID (0x0003), value length: 16 bytes: 'FastEthernet0/13'
+	Capability (0x0004), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
+	Protocol-Hello option (0x0008), value length: 32 bytes: 
+	VTP Management Domain (0x0009), value length: 0 bytes: ''
+	Native VLAN ID (0x000a), value length: 2 bytes: 1
+	Duplex (0x000b), value length: 1 byte: full
+	AVVID trust bitmap (0x0012), value length: 1 byte: 0x00
+	AVVID untrusted ports CoS (0x0013), value length: 1 byte: 0x00
+	Management Addresses (0x0016), value length: 13 bytes: IPv4 (1) 0.0.0.0
+	Power available (0x001a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
     2  03:00:39.208974 00:19:2f:a7:b2:8d > 01:00:0c:cc:cc:cc, 802.3, length 378: LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Cisco (0x00000c), pid CDP (0x2000), length 370: CDPv2, ttl: 180s, checksum: 0x971d (unverified), length 370
-	Device-ID (0x01), value length: 2 bytes: 'S2'
-	Version String (0x05), value length: 190 bytes: 
+	Device-ID (0x0001), value length: 2 bytes: 'S2'
+	Version String (0x0005), value length: 190 bytes: 
 	  Cisco IOS Software, C3560 Software (C3560-ADVIPSERVICESK9-M), Version 12.2(44)SE, RELEASE SOFTWARE (fc1)
 	  Copyright (c) 1986-2008 by Cisco Systems, Inc.
 	  Compiled Sat 05-Jan-08 00:15 by weiliu
-	Platform (0x06), value length: 20 bytes: 'cisco WS-C3560G-24PS'
-	Address (0x02), value length: 13 bytes: IPv4 (1) 0.0.0.0
-	Port-ID (0x03), value length: 19 bytes: 'GigabitEthernet0/13'
-	Capability (0x04), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-	Protocol-Hello option (0x08), value length: 32 bytes: 
-	VTP Management Domain (0x09), value length: 0 bytes: ''
-	Native VLAN ID (0x0a), value length: 2 bytes: 1
-	Duplex (0x0b), value length: 1 byte: full
-	AVVID trust bitmap (0x12), value length: 1 byte: 0x00
-	AVVID untrusted ports CoS (0x13), value length: 1 byte: 0x00
-	Management Addresses (0x16), value length: 13 bytes: IPv4 (1) 0.0.0.0
-	Power available (0x1a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
+	Platform (0x0006), value length: 20 bytes: 'cisco WS-C3560G-24PS'
+	Address (0x0002), value length: 13 bytes: IPv4 (1) 0.0.0.0
+	Port-ID (0x0003), value length: 19 bytes: 'GigabitEthernet0/13'
+	Capability (0x0004), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
+	Protocol-Hello option (0x0008), value length: 32 bytes: 
+	VTP Management Domain (0x0009), value length: 0 bytes: ''
+	Native VLAN ID (0x000a), value length: 2 bytes: 1
+	Duplex (0x000b), value length: 1 byte: full
+	AVVID trust bitmap (0x0012), value length: 1 byte: 0x00
+	AVVID untrusted ports CoS (0x0013), value length: 1 byte: 0x00
+	Management Addresses (0x0016), value length: 13 bytes: IPv4 (1) 0.0.0.0
+	Power available (0x001a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
     3  03:00:41.163180 00:19:2f:a7:b2:8d > 01:80:c2:00:00:0e, ethertype LLDP (0x88cc), length 296: LLDP, length 282
 	Chassis ID TLV (1), length 7
 	  Subtype MAC address (4): 00:19:2f:a7:b2:8d
@@ -123,41 +123,41 @@
 	    MAU type 100BASETX fdx (0x0010)
 	End TLV (0), length 0
     7  03:01:34.144187 00:18:ba:98:68:8f > 01:00:0c:cc:cc:cc, 802.3, length 374: LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Cisco (0x00000c), pid CDP (0x2000), length 366: CDPv2, ttl: 180s, checksum: 0x0be9 (unverified), length 366
-	Device-ID (0x01), value length: 2 bytes: 'S1'
-	Version String (0x05), value length: 190 bytes: 
+	Device-ID (0x0001), value length: 2 bytes: 'S1'
+	Version String (0x0005), value length: 190 bytes: 
 	  Cisco IOS Software, C3560 Software (C3560-ADVIPSERVICESK9-M), Version 12.2(44)SE, RELEASE SOFTWARE (fc1)
 	  Copyright (c) 1986-2008 by Cisco Systems, Inc.
 	  Compiled Sat 05-Jan-08 00:15 by weiliu
-	Platform (0x06), value length: 19 bytes: 'cisco WS-C3560-24TS'
-	Address (0x02), value length: 13 bytes: IPv4 (1) 0.0.0.0
-	Port-ID (0x03), value length: 16 bytes: 'FastEthernet0/13'
-	Capability (0x04), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-	Protocol-Hello option (0x08), value length: 32 bytes: 
-	VTP Management Domain (0x09), value length: 0 bytes: ''
-	Native VLAN ID (0x0a), value length: 2 bytes: 1
-	Duplex (0x0b), value length: 1 byte: full
-	AVVID trust bitmap (0x12), value length: 1 byte: 0x00
-	AVVID untrusted ports CoS (0x13), value length: 1 byte: 0x00
-	Management Addresses (0x16), value length: 13 bytes: IPv4 (1) 0.0.0.0
-	Power available (0x1a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
+	Platform (0x0006), value length: 19 bytes: 'cisco WS-C3560-24TS'
+	Address (0x0002), value length: 13 bytes: IPv4 (1) 0.0.0.0
+	Port-ID (0x0003), value length: 16 bytes: 'FastEthernet0/13'
+	Capability (0x0004), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
+	Protocol-Hello option (0x0008), value length: 32 bytes: 
+	VTP Management Domain (0x0009), value length: 0 bytes: ''
+	Native VLAN ID (0x000a), value length: 2 bytes: 1
+	Duplex (0x000b), value length: 1 byte: full
+	AVVID trust bitmap (0x0012), value length: 1 byte: 0x00
+	AVVID untrusted ports CoS (0x0013), value length: 1 byte: 0x00
+	Management Addresses (0x0016), value length: 13 bytes: IPv4 (1) 0.0.0.0
+	Power available (0x001a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
     8  03:01:39.211811 00:19:2f:a7:b2:8d > 01:00:0c:cc:cc:cc, 802.3, length 378: LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Cisco (0x00000c), pid CDP (0x2000), length 370: CDPv2, ttl: 180s, checksum: 0x971c (unverified), length 370
-	Device-ID (0x01), value length: 2 bytes: 'S2'
-	Version String (0x05), value length: 190 bytes: 
+	Device-ID (0x0001), value length: 2 bytes: 'S2'
+	Version String (0x0005), value length: 190 bytes: 
 	  Cisco IOS Software, C3560 Software (C3560-ADVIPSERVICESK9-M), Version 12.2(44)SE, RELEASE SOFTWARE (fc1)
 	  Copyright (c) 1986-2008 by Cisco Systems, Inc.
 	  Compiled Sat 05-Jan-08 00:15 by weiliu
-	Platform (0x06), value length: 20 bytes: 'cisco WS-C3560G-24PS'
-	Address (0x02), value length: 13 bytes: IPv4 (1) 0.0.0.0
-	Port-ID (0x03), value length: 19 bytes: 'GigabitEthernet0/13'
-	Capability (0x04), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-	Protocol-Hello option (0x08), value length: 32 bytes: 
-	VTP Management Domain (0x09), value length: 0 bytes: ''
-	Native VLAN ID (0x0a), value length: 2 bytes: 1
-	Duplex (0x0b), value length: 1 byte: full
-	AVVID trust bitmap (0x12), value length: 1 byte: 0x00
-	AVVID untrusted ports CoS (0x13), value length: 1 byte: 0x00
-	Management Addresses (0x16), value length: 13 bytes: IPv4 (1) 0.0.0.0
-	Power available (0x1a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
+	Platform (0x0006), value length: 20 bytes: 'cisco WS-C3560G-24PS'
+	Address (0x0002), value length: 13 bytes: IPv4 (1) 0.0.0.0
+	Port-ID (0x0003), value length: 19 bytes: 'GigabitEthernet0/13'
+	Capability (0x0004), value length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
+	Protocol-Hello option (0x0008), value length: 32 bytes: 
+	VTP Management Domain (0x0009), value length: 0 bytes: ''
+	Native VLAN ID (0x000a), value length: 2 bytes: 1
+	Duplex (0x000b), value length: 1 byte: full
+	AVVID trust bitmap (0x0012), value length: 1 byte: 0x00
+	AVVID untrusted ports CoS (0x0013), value length: 1 byte: 0x00
+	Management Addresses (0x0016), value length: 13 bytes: IPv4 (1) 0.0.0.0
+	Power available (0x001a), value length: 12 bytes: reqid 0, mgmtid 1, pwravail 0 mW 4294967295 mW
     9  03:01:40.932913 00:19:2f:a7:b2:8d > 01:80:c2:00:00:0e, ethertype LLDP (0x88cc), length 296: LLDP, length 282
 	Chassis ID TLV (1), length 7
 	  Subtype MAC address (4): 00:19:2f:a7:b2:8d
diff --git a/tests/various_gre.out b/tests/various_gre.out
index 6c1b4ff1..9fea53b4 100644
--- a/tests/various_gre.out
+++ b/tests/various_gre.out
@@ -141,19 +141,19 @@
    49  09:45:19.766290 IP (tos 0x0, ttl 255, id 152, offset 0, flags [none], proto GRE (47), length 381)
     10.172.64.6 > 10.172.64.7: GREv0, Flags [key present], key=0x28, length 361
 	CDPv2, ttl: 180s, checksum: 0xa82e (unverified), length 353
-	Device-ID (0x01), value length: 2 bytes: 'R1'
-	Version String (0x05), value length: 257 bytes: 
+	Device-ID (0x0001), value length: 2 bytes: 'R1'
+	Version String (0x0005), value length: 257 bytes: 
 	  Cisco IOS Software, Linux Software (I86BI_LINUX-ADVENTERPRISEK9-M), Version 15.5(3)S2, DEVELOPMENT TEST SOFTWARE
 	  Technical Support: http://www.cisco.com/techsupport
 	  Copyright (c) 1986-2016 by Cisco Systems, Inc.
 	  Compiled Mon 08-Feb-16 20:48 by prod_rel_team
-	Platform (0x06), value length: 10 bytes: 'Linux Unix'
-	Address (0x02), value length: 13 bytes: IPv4 (1) 172.17.1.54
-	Port-ID (0x03), value length: 8 bytes: 'Tunnel40'
-	Capability (0x04), value length: 4 bytes: (0x00000001): Router
-	Prefixes (0x07), value length: 5 bytes:  IPv4 Prefixes (1): 10.172.64.6/31
-	Management Addresses (0x16), value length: 13 bytes: IPv4 (1) 172.17.1.54
-	unknown field type (0x1b), value length: 1 byte: 
+	Platform (0x0006), value length: 10 bytes: 'Linux Unix'
+	Address (0x0002), value length: 13 bytes: IPv4 (1) 172.17.1.54
+	Port-ID (0x0003), value length: 8 bytes: 'Tunnel40'
+	Capability (0x0004), value length: 4 bytes: (0x00000001): Router
+	Prefixes (0x0007), value length: 5 bytes:  IPv4 Prefixes (1): 10.172.64.6/31
+	Management Addresses (0x0016), value length: 13 bytes: IPv4 (1) 172.17.1.54
+	unknown field type (0x001b), value length: 1 byte: 
 	  0x0000:  00
    50  09:45:20.096783 STP 802.1d, Config, Flags [none], bridge-id 8001.aa:bb:cc:00:03:00.8002, length 35
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
@@ -197,19 +197,19 @@
    63  09:45:27.181709 IP (tos 0x0, ttl 255, id 172, offset 0, flags [none], proto GRE (47), length 381)
     10.172.64.7 > 10.172.64.6: GREv0, Flags [key present], key=0x28, length 361
 	CDPv2, ttl: 180s, checksum: 0xa82b (unverified), length 353
-	Device-ID (0x01), value length: 2 bytes: 'R2'
-	Version String (0x05), value length: 257 bytes: 
+	Device-ID (0x0001), value length: 2 bytes: 'R2'
+	Version String (0x0005), value length: 257 bytes: 
 	  Cisco IOS Software, Linux Software (I86BI_LINUX-ADVENTERPRISEK9-M), Version 15.5(3)S2, DEVELOPMENT TEST SOFTWARE
 	  Technical Support: http://www.cisco.com/techsupport
 	  Copyright (c) 1986-2016 by Cisco Systems, Inc.
 	  Compiled Mon 08-Feb-16 20:48 by prod_rel_team
-	Platform (0x06), value length: 10 bytes: 'Linux Unix'
-	Address (0x02), value length: 13 bytes: IPv4 (1) 172.17.1.55
-	Port-ID (0x03), value length: 8 bytes: 'Tunnel40'
-	Capability (0x04), value length: 4 bytes: (0x00000001): Router
-	Prefixes (0x07), value length: 5 bytes:  IPv4 Prefixes (1): 10.172.64.6/31
-	Management Addresses (0x16), value length: 13 bytes: IPv4 (1) 172.17.1.55
-	unknown field type (0x1b), value length: 1 byte: 
+	Platform (0x0006), value length: 10 bytes: 'Linux Unix'
+	Address (0x0002), value length: 13 bytes: IPv4 (1) 172.17.1.55
+	Port-ID (0x0003), value length: 8 bytes: 'Tunnel40'
+	Capability (0x0004), value length: 4 bytes: (0x00000001): Router
+	Prefixes (0x0007), value length: 5 bytes:  IPv4 Prefixes (1): 10.172.64.6/31
+	Management Addresses (0x0016), value length: 13 bytes: IPv4 (1) 172.17.1.55
+	unknown field type (0x001b), value length: 1 byte: 
 	  0x0000:  00
    64  09:45:27.478420 IP (tos 0xc0, ttl 255, id 174, offset 0, flags [none], proto GRE (47), length 64)
     10.172.64.7 > 10.172.64.6: GREv0, Flags [key present], key=0x28, length 44
@@ -276,22 +276,22 @@
 	message-age 0.00s, max-age 20.00s, hello-time 2.00s, forwarding-delay 15.00s
 	root-id 8001.aa:bb:cc:00:03:00, root-pathcost 0
    86  09:45:37.371888 CDPv2, ttl: 180s, checksum: 0x2005 (unverified), length 424
-	Device-ID (0x01), value length: 3 bytes: 'SW1'
-	Version String (0x05), value length: 331 bytes: 
+	Device-ID (0x0001), value length: 3 bytes: 'SW1'
+	Version String (0x0005), value length: 331 bytes: 
 	  Cisco IOS Software, Linux Software (I86BI_LINUXL2-ADVENTERPRISEK9-M), Version 15.2(HI_20170202)FLO_DSGS7, EARLY DEPLOYMENT DEVELOPMENT BUILD, synced to  FLO_DSGS7_POSTCOLLAPSE_TEAM_TRACK_DSGS_PI5
 	  Technical Support: http://www.cisco.com/techsupport
 	  Copyright (c) 1986-2017 by Cisco Systems, Inc.
 	  Compiled Thu 02-Feb-17 03:37 by mmen
-	Platform (0x06), value length: 10 bytes: 'Linux Unix'
-	Address (0x02), value length: 4 bytes: 
-	Port-ID (0x03), value length: 11 bytes: 'Ethernet0/1'
-	Capability (0x04), value length: 4 bytes: (0x00000029): Router, L2 Switch, IGMP snooping
-	VTP Management Domain (0x09), value length: 0 bytes: ''
-	Native VLAN ID (0x0a), value length: 2 bytes: 1
-	Duplex (0x0b), value length: 1 byte: full
-	AVVID trust bitmap (0x12), value length: 1 byte: 0x00
-	AVVID untrusted ports CoS (0x13), value length: 1 byte: 0x00
-	Management Addresses (0x16), value length: 4 bytes: 
+	Platform (0x0006), value length: 10 bytes: 'Linux Unix'
+	Address (0x0002), value length: 4 bytes: 
+	Port-ID (0x0003), value length: 11 bytes: 'Ethernet0/1'
+	Capability (0x0004), value length: 4 bytes: (0x00000029): Router, L2 Switch, IGMP snooping
+	VTP Management Domain (0x0009), value length: 0 bytes: ''
+	Native VLAN ID (0x000a), value length: 2 bytes: 1
+	Duplex (0x000b), value length: 1 byte: full
+	AVVID trust bitmap (0x0012), value length: 1 byte: 0x00
+	AVVID untrusted ports CoS (0x0013), value length: 1 byte: 0x00
+	Management Addresses (0x0016), value length: 4 bytes: 
    87  09:45:37.479185 IP (tos 0xc0, ttl 255, id 177, offset 0, flags [none], proto GRE (47), length 64)
     10.172.64.7 > 10.172.64.6: GREv0, Flags [key present], key=0x28, length 44
 	gre-proto-0x8909