Merge git://github.com/the-tcpdump-group/tcpdump

diff --combined print-cdp.c
index 42ea1b7f1a738ba6cdd53180ac2b56b1ad8e783f,c5fc8b11997793cdd32a9925a54edfbb9123947b..74d9a52e30e00b50e68ed9766d9f28e20148f1b4
--- 1/print-cdp.c
--- 2/print-cdp.c
+++ b/print-cdp.c
@@@ -40,7 -40,8 +40,8 @@@
  
  static const char tstr[] = "[|cdp]";
  
- #define CDP_HEADER_LEN  4
+ #define CDP_HEADER_LEN     4
+ #define CDP_HEADER_OFFSET  2
  
  static const struct tok cdp_tlv_values[] = {
      { 0x01,             "Device-ID"},
@@@ -99,28 -100,15 +100,28 @@@ cdp_print(netdissect_options *ndo
        ND_TCHECK2(*tptr, CDP_HEADER_LEN);
        ND_PRINT((ndo, "CDPv%u, ttl: %us", *tptr, *(tptr + 1)));
        if (ndo->ndo_vflag)
-               ND_PRINT((ndo, ", checksum: %u (unverified), length %u", EXTRACT_16BITS(tptr), length));
+               ND_PRINT((ndo, ", checksum: 0x%04x (unverified), length %u", EXTRACT_16BITS(tptr+CDP_HEADER_OFFSET), length));
        tptr += CDP_HEADER_LEN;
  
        while (tptr < (pptr+length)) {
-               ND_TCHECK2(*tptr, 4); /* read out Type and Length */
+               ND_TCHECK2(*tptr, CDP_HEADER_LEN); /* read out Type and Length */
                type = EXTRACT_16BITS(tptr);
-               len  = EXTRACT_16BITS(tptr+2); /* object length includes the 4 bytes header length */
-               if (len < 4) {
+               len  = EXTRACT_16BITS(tptr+CDP_HEADER_OFFSET); /* object length includes the 4 bytes header length */
++              if (len < CDP_HEADER_LEN) {
 +                    if (ndo->ndo_vflag)
 +                        ND_PRINT((ndo, "\n\t%s (0x%02x), length: %u byte%s (too short)",
 +                               tok2str(cdp_tlv_values,"unknown field type", type),
 +                               type,
 +                               len,
 +                               PLURAL_SUFFIX(len))); /* plural */
 +                    else
 +                        ND_PRINT((ndo, ", %s TLV length %u too short",
 +                               tok2str(cdp_tlv_values,"unknown field type", type),
 +                               len));
 +                    break;
 +                }
-                 tptr += 4;
-                 len -= 4;
+                 tptr += CDP_HEADER_LEN;
+                 len -= CDP_HEADER_LEN;
  
                ND_TCHECK2(*tptr, len);
  
@@@ -176,15 -164,15 +177,15 @@@
                        break;
                      case 0x08: /* Protocol Hello Option - not documented */
                        break;
-                     case 0x09: /* VTP Mgmt Domain  - not documented */
+                     case 0x09: /* VTP Mgmt Domain  - CDPv2 */
                          ND_PRINT((ndo, "'"));
                          fn_printn(ndo, tptr, len, NULL);
                          ND_PRINT((ndo, "'"));
                        break;
-                     case 0x0a: /* Native VLAN ID - not documented */
+                     case 0x0a: /* Native VLAN ID - CDPv2 */
                        ND_PRINT((ndo, "%d", EXTRACT_16BITS(tptr)));
                        break;
-                     case 0x0b: /* Duplex - not documented */
+                     case 0x0b: /* Duplex - CDPv2 */
                        ND_PRINT((ndo, "%s", *(tptr) ? "full": "half"));
                        break;
  
@@@ -227,6 -215,9 +228,6 @@@
                        break;
                      }
                  }
 -              /* avoid infinite loop */
 -              if (len == 0)
 -                      break;
                tptr = tptr+len;
        }
          if (ndo->ndo_vflag < 1)