Update to reflect the output format changes and bug fixes for CDP.

diff --git a/tests/cdp-v.out b/tests/cdp-v.out
index 4a6c983d73420137eb372e4a00373dd107cd8a3d..eb578bfe54d1e6917edc470c9460361f7490d872 100644 (file)
--- a/tests/cdp-v.out
+++ b/tests/cdp-v.out
@@ -1,57 +1,57 @@
-CDPv2, ttl: 180s, checksum: 692 (unverified), length 378
-       Device-ID (0x01), length: 6 bytes: 'Switch'
-       Version String (0x05), length: 192 bytes: 
+CDPv2, ttl: 180s, checksum: 0xb0bd (unverified), length 378
+       Device-ID (0x01), value length: 6 bytes: 'Switch'
+       Version String (0x05), 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), length: 20 bytes: 'cisco WS-C3560G-24PS'
-       Address (0x02), length: 13 bytes: IPv4 (1) 192.168.0.1
-       Port-ID (0x03), length: 18 bytes: 'GigabitEthernet0/5'
-       Capability (0x04), length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-       Protocol-Hello option (0x08), length: 32 bytes: 
-       VTP Management Domain (0x09), length: 3 bytes: 'Lab'
-       Native VLAN ID (0x0a), length: 2 bytes: 1
-       Duplex (0x0b), length: 1 byte: full
-       AVVID trust bitmap (0x12), length: 1 byte: 0x00
-       AVVID untrusted ports CoS (0x13), length: 1 byte: 0x00
-       Management Addresses (0x16), length: 13 bytes: IPv4 (1) 192.168.0.1
-       unknown field type (0x1a), length: 12 bytes: 
+       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
+       unknown field type (0x1a), value length: 12 bytes: 
          0x0000:  0000 0001 0000 0000 ffff ffff
-CDPv2, ttl: 180s, checksum: 692 (unverified), length 378
-       Device-ID (0x01), length: 6 bytes: 'Switch'
-       Version String (0x05), length: 192 bytes: 
+CDPv2, ttl: 180s, checksum: 0xb0bd (unverified), length 378
+       Device-ID (0x01), value length: 6 bytes: 'Switch'
+       Version String (0x05), 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), length: 20 bytes: 'cisco WS-C3560G-24PS'
-       Address (0x02), length: 13 bytes: IPv4 (1) 192.168.0.1
-       Port-ID (0x03), length: 18 bytes: 'GigabitEthernet0/5'
-       Capability (0x04), length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-       Protocol-Hello option (0x08), length: 32 bytes: 
-       VTP Management Domain (0x09), length: 3 bytes: 'Lab'
-       Native VLAN ID (0x0a), length: 2 bytes: 1
-       Duplex (0x0b), length: 1 byte: full
-       AVVID trust bitmap (0x12), length: 1 byte: 0x00
-       AVVID untrusted ports CoS (0x13), length: 1 byte: 0x00
-       Management Addresses (0x16), length: 13 bytes: IPv4 (1) 192.168.0.1
-       unknown field type (0x1a), length: 12 bytes: 
+       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
+       unknown field type (0x1a), value length: 12 bytes: 
          0x0000:  0000 0001 0000 0000 ffff ffff
-CDPv2, ttl: 180s, checksum: 692 (unverified), length 378
-       Device-ID (0x01), length: 6 bytes: 'Switch'
-       Version String (0x05), length: 192 bytes: 
+CDPv2, ttl: 180s, checksum: 0xb0bd (unverified), length 378
+       Device-ID (0x01), value length: 6 bytes: 'Switch'
+       Version String (0x05), 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), length: 20 bytes: 'cisco WS-C3560G-24PS'
-       Address (0x02), length: 13 bytes: IPv4 (1) 192.168.0.1
-       Port-ID (0x03), length: 18 bytes: 'GigabitEthernet0/5'
-       Capability (0x04), length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-       Protocol-Hello option (0x08), length: 32 bytes: 
-       VTP Management Domain (0x09), length: 3 bytes: 'Lab'
-       Native VLAN ID (0x0a), length: 2 bytes: 1
-       Duplex (0x0b), length: 1 byte: full
-       AVVID trust bitmap (0x12), length: 1 byte: 0x00
-       AVVID untrusted ports CoS (0x13), length: 1 byte: 0x00
-       Management Addresses (0x16), length: 13 bytes: IPv4 (1) 192.168.0.1
-       unknown field type (0x1a), length: 12 bytes: 
+       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
+       unknown field type (0x1a), value length: 12 bytes: 
          0x0000:  0000 0001 0000 0000 ffff ffff

diff --git a/tests/lldp_cdp-ev.out b/tests/lldp_cdp-ev.out
index cb9a2099ec7890307077354b80ec584bd4df2126..d9fc6477872e2f45bbea3e17f634bc18c692ded9 100644 (file)
--- a/tests/lldp_cdp-ev.out
+++ b/tests/lldp_cdp-ev.out
@@ -1,27 +1,41 @@
-00:18:ba:98:68:8f > 01:00:0c:cc:cc:cc, 802.3, length 388: LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Cisco (0x00000c), pid CDP (0x2000): CDPv2, ttl: 180s, checksum: 692 (unverified), length 366
-       Device-ID (0x01), length: 2 bytes: 'S1'
-       Version String (0x05), length: 190 bytes: 
+00:18:ba:98:68:8f > 01:00:0c:cc:cc:cc, 802.3, length 388: LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Cisco (0x00000c), pid CDP (0x2000): CDPv2, ttl: 180s, checksum: 0x0bea (unverified), length 366
+       Device-ID (0x01), value length: 2 bytes: 'S1'
+       Version String (0x05), 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), length: 19 bytes: 'cisco WS-C3560-24TS'
-       Address (0x02), length: 13 bytes: IPv4 (1) 0.0.0.0
-       Port-ID (0x03), length: 16 bytes: 'FastEthernet0/13'
-       Capability (0x04), length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-       Protocol-Hello option (0x08), length: 32 bytes: 
-       VTP Management Domain (0x09), length: 0 bytes: ''
-00:19:2f:a7:b2:8d > 01:00:0c:cc:cc:cc, 802.3, length 392: LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Cisco (0x00000c), pid CDP (0x2000): CDPv2, ttl: 180s, checksum: 692 (unverified), length 370
-       Device-ID (0x01), length: 2 bytes: 'S2'
-       Version String (0x05), length: 190 bytes: 
+       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
+       unknown field type (0x1a), value length: 12 bytes: 
+         0x0000:  0000 0001 0000 0000 ffff ffff
+00:19:2f:a7:b2:8d > 01:00:0c:cc:cc:cc, 802.3, length 392: LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Cisco (0x00000c), pid CDP (0x2000): CDPv2, ttl: 180s, checksum: 0x971d (unverified), length 370
+       Device-ID (0x01), value length: 2 bytes: 'S2'
+       Version String (0x05), 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), length: 20 bytes: 'cisco WS-C3560G-24PS'
-       Address (0x02), length: 13 bytes: IPv4 (1) 0.0.0.0
-       Port-ID (0x03), length: 19 bytes: 'GigabitEthernet0/13'
-       Capability (0x04), length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-       Protocol-Hello option (0x08), length: 32 bytes: 
-       VTP Management Domain (0x09), length: 0 bytes: ''
+       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
+       unknown field type (0x1a), value length: 12 bytes: 
+         0x0000:  0000 0001 0000 0000 ffff ffff
 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
@@ -110,30 +124,44 @@
            PMD autoneg capability [Sym PAUSE for fdx, Asym and Sym PAUSE for fdx, 1000BASE-{X LX SX CX} fdx, 1000BASE-T hdx] (0x0036)
            MAU type 100BASETX fdx (0x0010)
        End TLV (0), length 0
-00:18:ba:98:68:8f > 01:00:0c:cc:cc:cc, 802.3, length 388: LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Cisco (0x00000c), pid CDP (0x2000): CDPv2, ttl: 180s, checksum: 692 (unverified), length 366
-       Device-ID (0x01), length: 2 bytes: 'S1'
-       Version String (0x05), length: 190 bytes: 
+00:18:ba:98:68:8f > 01:00:0c:cc:cc:cc, 802.3, length 388: LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Cisco (0x00000c), pid CDP (0x2000): CDPv2, ttl: 180s, checksum: 0x0be9 (unverified), length 366
+       Device-ID (0x01), value length: 2 bytes: 'S1'
+       Version String (0x05), 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), length: 19 bytes: 'cisco WS-C3560-24TS'
-       Address (0x02), length: 13 bytes: IPv4 (1) 0.0.0.0
-       Port-ID (0x03), length: 16 bytes: 'FastEthernet0/13'
-       Capability (0x04), length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-       Protocol-Hello option (0x08), length: 32 bytes: 
-       VTP Management Domain (0x09), length: 0 bytes: ''
-00:19:2f:a7:b2:8d > 01:00:0c:cc:cc:cc, 802.3, length 392: LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Cisco (0x00000c), pid CDP (0x2000): CDPv2, ttl: 180s, checksum: 692 (unverified), length 370
-       Device-ID (0x01), length: 2 bytes: 'S2'
-       Version String (0x05), length: 190 bytes: 
+       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
+       unknown field type (0x1a), value length: 12 bytes: 
+         0x0000:  0000 0001 0000 0000 ffff ffff
+00:19:2f:a7:b2:8d > 01:00:0c:cc:cc:cc, 802.3, length 392: LLC, dsap SNAP (0xaa) Individual, ssap SNAP (0xaa) Command, ctrl 0x03: oui Cisco (0x00000c), pid CDP (0x2000): CDPv2, ttl: 180s, checksum: 0x971c (unverified), length 370
+       Device-ID (0x01), value length: 2 bytes: 'S2'
+       Version String (0x05), 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), length: 20 bytes: 'cisco WS-C3560G-24PS'
-       Address (0x02), length: 13 bytes: IPv4 (1) 0.0.0.0
-       Port-ID (0x03), length: 19 bytes: 'GigabitEthernet0/13'
-       Capability (0x04), length: 4 bytes: (0x00000028): L2 Switch, IGMP snooping
-       Protocol-Hello option (0x08), length: 32 bytes: 
-       VTP Management Domain (0x09), length: 0 bytes: ''
+       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
+       unknown field type (0x1a), value length: 12 bytes: 
+         0x0000:  0000 0001 0000 0000 ffff ffff
 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