Add changes in 4.2.1.

[tcpdump] / print-cdp.c

diff --git a/print-cdp.c b/print-cdp.c
index b65d48eb4974bc096ca5377050f82c6a16cc911e..7bc617a963570222e8a7c53932e06ef554290c68 100644 (file)
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cdp.c,v 1.22 2003-12-29 19:26:28 hannes Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-cdp.c,v 1.25 2004-10-07 14:53:11 hannes Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -41,6 +41,7 @@ static const char rcsid[] _U_ =
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"                   /* must come after interface.h */
+#include "nlpid.h"
 
 #define CDP_HEADER_LEN  4
 
@@ -123,22 +124,25 @@ cdp_print(const u_char *pptr, u_int length, u_int caplen)
                                tok2str(cdp_tlv_values,"unknown field type", type),
                                type,
                                len,
-                               len>1 ? "s" : ""); /* plural */
+                               PLURAL_SUFFIX(len)); /* plural */
 
                     switch (type) {
 
                     case 0x01: /* Device-ID */
                         if (!vflag)
-                            printf(", Device-ID '%.*s'", len, tptr);
-                        else
-                            printf("'%.*s'", len, tptr);
+                            printf(", Device-ID ");
+                        printf("'");
+                        fn_printn(tptr, len, NULL);
+                        printf("'");
                        break;
                     case 0x02: /* Address */
                         if (cdp_print_addr(tptr, len) < 0)
                             goto trunc;
                        break;
                     case 0x03: /* Port-ID */
-                       printf("'%.*s'", len, tptr);
+                        printf("'");
+                        fn_printn(tptr, len, NULL);
+                        printf("'");
                        break;
                     case 0x04: /* Capabilities */
                        printf("(0x%08x): %s",
@@ -155,7 +159,9 @@ cdp_print(const u_char *pptr, u_int length, u_int caplen)
                         }
                        break;
                     case 0x06: /* Platform */
-                       printf("'%.*s'", len, tptr);
+                        printf("'");
+                        fn_printn(tptr, len, NULL);
+                        printf("'");
                        break;
                     case 0x07: /* Prefixes */
                        if (cdp_print_prefixes(tptr, len) < 0)
@@ -164,7 +170,9 @@ cdp_print(const u_char *pptr, u_int length, u_int caplen)
                     case 0x08: /* Protocol Hello Option - not documented */
                        break;
                     case 0x09: /* VTP Mgmt Domain  - not documented */
-                       printf("'%.*s'", len,tptr);
+                        printf("'");
+                        fn_printn(tptr, len, NULL);
+                        printf("'");
                        break;
                     case 0x0a: /* Native VLAN ID - not documented */
                        printf("%d",EXTRACT_16BITS(tptr));
@@ -194,14 +202,20 @@ cdp_print(const u_char *pptr, u_int length, u_int caplen)
                        printf("0x%02x", *(tptr));
                        break;
                     case 0x14: /* System Name - not documented */
-                       printf("'%.*s'", len, tptr);
+                        printf("'");
+                        fn_printn(tptr, len, NULL);
+                        printf("'");
                        break;
                     case 0x16: /* System Object ID - not documented */
                        if (cdp_print_addr(tptr, len) < 0)
                                goto trunc;
                        break;
                     case 0x17: /* Physical Location - not documented */
-                       printf("0x%02x/%.*s", *(tptr), len - 1, tptr + 1 );
+                       printf("0x%02x", *(tptr));
+                       if (len > 1) {
+                               printf("/");
+                               fn_printn(tptr + 1, len - 1, NULL);
+                       }
                        break;
                     default:
                         print_unknown_data(tptr,"\n\t  ",len);
@@ -243,21 +257,24 @@ cdp_print_addr(const u_char * p, int l)
        };
 #endif
 
+       TCHECK2(*p, 2);
        num = EXTRACT_32BITS(p);
        p += 4;
 
        while (p < endp && num >= 0) {
+               TCHECK2(*p, 2);
                if (p + 2 > endp)
                        goto trunc;
                pt = p[0];              /* type of "protocol" field */
                pl = p[1];              /* length of "protocol" field */
                p += 2;
 
+               TCHECK2(p[pl], 2);
                if (p + pl + 2 > endp)
                        goto trunc;
                al = EXTRACT_16BITS(&p[pl]);    /* address length */
 
-               if (pt == PT_NLPID && pl == 1 && *p == 0xcc && al == 4) {
+               if (pt == PT_NLPID && pl == 1 && *p == NLPID_IP && al == 4) {
                        /*
                         * IPv4: protocol type = NLPID, protocol length = 1
                         * (1-byte NLPID), protocol = 0xcc (NLPID for IPv4),
@@ -265,6 +282,7 @@ cdp_print_addr(const u_char * p, int l)
                         */
                        p += 3;
 
+                       TCHECK2(*p, 4);
                        if (p + 4 > endp)
                                goto trunc;
                        printf("IPv4 (%u) %s",
@@ -282,6 +300,7 @@ cdp_print_addr(const u_char * p, int l)
                         * Ethertype, address length = 16
                         */
                        p += 10;
+                       TCHECK2(*p, al);
                        if (p + al > endp)
                                goto trunc;
 
@@ -295,16 +314,19 @@ cdp_print_addr(const u_char * p, int l)
                        /*
                         * Generic case: just print raw data
                         */
+                       TCHECK2(*p, pl);
                        if (p + pl > endp)
                                goto trunc;
                        printf("pt=0x%02x, pl=%d, pb=", *(p - 2), pl);
                        while (pl-- > 0)
                                printf(" %02x", *p++);
+                       TCHECK2(*p, 2);
                        if (p + 2 > endp)
                                goto trunc;
                        al = (*p << 8) + *(p + 1);
                        printf(", al=%d, a=", al);
                        p += 2;
+                       TCHECK2(*p, al);
                        if (p + al > endp)
                                goto trunc;
                        while (al-- > 0)