X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/6ab3136df5500b48a93619019658b14ee562666c..f085c93f59fb2332e09f3da20eef5fb2bbd04431:/print-cdp.c

diff --git a/print-cdp.c b/print-cdp.c
index aefb68db..908f55f4 100644
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -24,18 +24,19 @@
  *    http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Cisco Discovery Protocol (CDP) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
 #include <string.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
-#include "extract.h"			/* must come after interface.h */
+#include "extract.h"
 #include "nlpid.h"
 
 static const char tstr[] = "[|cdp]";
@@ -104,16 +105,16 @@ cdp_print(netdissect_options *ndo,
 	tptr = pptr; /* temporary pointer */
 
 	ND_TCHECK2(*tptr, CDP_HEADER_LEN);
-	ND_PRINT((ndo, "CDPv%u, ttl: %us", *(tptr + CDP_HEADER_VERSION_OFFSET),
-					   *(tptr + CDP_HEADER_TTL_OFFSET)));
+	ND_PRINT((ndo, "CDPv%u, ttl: %us", EXTRACT_U_1((tptr + CDP_HEADER_VERSION_OFFSET)),
+					   EXTRACT_U_1(tptr + CDP_HEADER_TTL_OFFSET)));
 	if (ndo->ndo_vflag)
-		ND_PRINT((ndo, ", checksum: 0x%04x (unverified), length %u", EXTRACT_16BITS(tptr+CDP_HEADER_CHECKSUM_OFFSET), length));
+		ND_PRINT((ndo, ", checksum: 0x%04x (unverified), length %u", EXTRACT_BE_U_2(tptr + CDP_HEADER_CHECKSUM_OFFSET), length));
 	tptr += CDP_HEADER_LEN;
 
 	while (tptr < (pptr+length)) {
 		ND_TCHECK2(*tptr, CDP_TLV_HEADER_LEN); /* read out Type and Length */
-		type = EXTRACT_16BITS(tptr+CDP_TLV_TYPE_OFFSET);
-		len  = EXTRACT_16BITS(tptr+CDP_TLV_LEN_OFFSET); /* object length includes the 4 bytes header length */
+		type = EXTRACT_BE_U_2(tptr + CDP_TLV_TYPE_OFFSET);
+		len  = EXTRACT_BE_U_2(tptr + CDP_TLV_LEN_OFFSET); /* object length includes the 4 bytes header length */
 		if (len < CDP_TLV_HEADER_LEN) {
 		    if (ndo->ndo_vflag)
 			ND_PRINT((ndo, "\n\t%s (0x%02x), TLV length: %u byte%s (too short)",
@@ -147,7 +148,7 @@ cdp_print(netdissect_options *ndo,
 			if (!ndo->ndo_vflag)
 			    ND_PRINT((ndo, ", Device-ID "));
 			ND_PRINT((ndo, "'"));
-			fn_printn(ndo, tptr, len, NULL);
+			(void)fn_printn(ndo, tptr, len, NULL);
 			ND_PRINT((ndo, "'"));
 			break;
 		    case 0x02: /* Address */
@@ -156,28 +157,30 @@ cdp_print(netdissect_options *ndo,
 			break;
 		    case 0x03: /* Port-ID */
 			ND_PRINT((ndo, "'"));
-			fn_printn(ndo, tptr, len, NULL);
+			(void)fn_printn(ndo, tptr, len, NULL);
 			ND_PRINT((ndo, "'"));
 			break;
 		    case 0x04: /* Capabilities */
 			if (len < 4)
 			    goto trunc;
 			ND_PRINT((ndo, "(0x%08x): %s",
-			       EXTRACT_32BITS(tptr),
-			       bittok2str(cdp_capability_values, "none", EXTRACT_32BITS(tptr))));
+			       EXTRACT_BE_U_4(tptr),
+			       bittok2str(cdp_capability_values, "none", EXTRACT_BE_U_4(tptr))));
 			break;
 		    case 0x05: /* Version */
 			ND_PRINT((ndo, "\n\t  "));
 			for (i=0;i<len;i++) {
-			    j = *(tptr+i);
-			    ND_PRINT((ndo, "%c", j));
-			    if (j == 0x0a) /* lets rework the version string to get a nice identation */
-				ND_PRINT((ndo, "\t  "));
+			    j = EXTRACT_U_1(tptr + i);
+			    if (j == '\n') /* lets rework the version string to
+					      get a nice indentation */
+				ND_PRINT((ndo, "\n\t  "));
+			    else
+				fn_print_char(ndo, j);
 			}
 			break;
 		    case 0x06: /* Platform */
 			ND_PRINT((ndo, "'"));
-			fn_printn(ndo, tptr, len, NULL);
+			(void)fn_printn(ndo, tptr, len, NULL);
 			ND_PRINT((ndo, "'"));
 			break;
 		    case 0x07: /* Prefixes */
@@ -188,27 +191,27 @@ cdp_print(netdissect_options *ndo,
 			break;
 		    case 0x09: /* VTP Mgmt Domain  - CDPv2 */
 			ND_PRINT((ndo, "'"));
-			fn_printn(ndo, tptr, len, NULL);
+			(void)fn_printn(ndo, tptr, len, NULL);
 			ND_PRINT((ndo, "'"));
 			break;
 		    case 0x0a: /* Native VLAN ID - CDPv2 */
 			if (len < 2)
 			    goto trunc;
-			ND_PRINT((ndo, "%d", EXTRACT_16BITS(tptr)));
+			ND_PRINT((ndo, "%d", EXTRACT_BE_U_2(tptr)));
 			break;
 		    case 0x0b: /* Duplex - CDPv2 */
 			if (len < 1)
 			    goto trunc;
-			ND_PRINT((ndo, "%s", *(tptr) ? "full": "half"));
+			ND_PRINT((ndo, "%s", EXTRACT_U_1(tptr) ? "full": "half"));
 			break;
 
-		    /* http://www.cisco.com/univercd/cc/td/doc/product/voice/ata/atarn/186rn21m.htm
+		    /* http://www.cisco.com/c/en/us/td/docs/voice_ip_comm/cata/186/2_12_m/english/release/notes/186rn21m.html
 		     * plus more details from other sources
 		     */
 		    case 0x0e: /* ATA-186 VoIP VLAN request - incomplete doc. */
 			if (len < 3)
 			    goto trunc;
-			ND_PRINT((ndo, "app %d, vlan %d", *(tptr), EXTRACT_16BITS(tptr + 1)));
+			ND_PRINT((ndo, "app %d, vlan %d", EXTRACT_U_1((tptr)), EXTRACT_BE_U_2(tptr + 1)));
 			break;
 		    case 0x10: /* ATA-186 VoIP VLAN assignment - incomplete doc. */
 			ND_PRINT((ndo, "%1.2fW", cdp_get_number(tptr, len) / 1000.0));
@@ -216,21 +219,21 @@ cdp_print(netdissect_options *ndo,
 		    case 0x11: /* MTU - not documented */
 			if (len < 4)
 			    goto trunc;
-			ND_PRINT((ndo, "%u bytes", EXTRACT_32BITS(tptr)));
+			ND_PRINT((ndo, "%u bytes", EXTRACT_BE_U_4(tptr)));
 			break;
 		    case 0x12: /* AVVID trust bitmap - not documented */
 			if (len < 1)
 			    goto trunc;
-			ND_PRINT((ndo, "0x%02x", *(tptr)));
+			ND_PRINT((ndo, "0x%02x", EXTRACT_U_1(tptr)));
 			break;
 		    case 0x13: /* AVVID untrusted port CoS - not documented */
 			if (len < 1)
 			    goto trunc;
-			ND_PRINT((ndo, "0x%02x", *(tptr)));
+			ND_PRINT((ndo, "0x%02x", EXTRACT_U_1(tptr)));
 			break;
 		    case 0x14: /* System Name - not documented */
 			ND_PRINT((ndo, "'"));
-			fn_printn(ndo, tptr, len, NULL);
+			(void)fn_printn(ndo, tptr, len, NULL);
 			ND_PRINT((ndo, "'"));
 			break;
 		    case 0x16: /* System Object ID - not documented */
@@ -240,10 +243,10 @@ cdp_print(netdissect_options *ndo,
 		    case 0x17: /* Physical Location - not documented */
 			if (len < 1)
 			    goto trunc;
-			ND_PRINT((ndo, "0x%02x", *(tptr)));
+			ND_PRINT((ndo, "0x%02x", EXTRACT_U_1(tptr)));
 			if (len > 1) {
 				ND_PRINT((ndo, "/"));
-				fn_printn(ndo, tptr + 1, len - 1, NULL);
+				(void)fn_printn(ndo, tptr + 1, len - 1, NULL);
 			}
 			break;
 		    default:
@@ -278,30 +281,28 @@ cdp_print_addr(netdissect_options *ndo,
 {
 	int pt, pl, al, num;
 	const u_char *endp = p + l;
-#ifdef INET6
 	static const u_char prot_ipv6[] = {
 		0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00, 0x86, 0xdd
 	};
-#endif
 
-	ND_TCHECK2(*p, 4);
+	ND_TCHECK_4(p);
 	if (p + 4 > endp)
 		goto trunc;
-	num = EXTRACT_32BITS(p);
+	num = EXTRACT_BE_U_4(p);
 	p += 4;
 
 	while (p < endp && num >= 0) {
-		ND_TCHECK2(*p, 2);
+		ND_TCHECK_2(p);
 		if (p + 2 > endp)
 			goto trunc;
 		pt = p[0];		/* type of "protocol" field */
 		pl = p[1];		/* length of "protocol" field */
 		p += 2;
 
-		ND_TCHECK2(p[pl], 2);
+		ND_TCHECK_2(p + pl);
 		if (p + pl + 2 > endp)
 			goto trunc;
-		al = EXTRACT_16BITS(&p[pl]);	/* address length */
+		al = EXTRACT_BE_U_2(p + pl);	/* address length */
 
 		if (pt == PT_NLPID && pl == 1 && *p == NLPID_IP && al == 4) {
 			/*
@@ -311,13 +312,12 @@ cdp_print_addr(netdissect_options *ndo,
 			 */
 			p += 3;
 
-			ND_TCHECK2(*p, 4);
+			ND_TCHECK_4(p);
 			if (p + 4 > endp)
 				goto trunc;
 			ND_PRINT((ndo, "IPv4 (%u) %s", num, ipaddr_string(ndo, p)));
 			p += 4;
 		}
-#ifdef INET6
 		else if (pt == PT_IEEE_802_2 && pl == 8 &&
 		    memcmp(p, prot_ipv6, 8) == 0 && al == 16) {
 			/*
@@ -334,7 +334,6 @@ cdp_print_addr(netdissect_options *ndo,
 			ND_PRINT((ndo, "IPv6 (%u) %s", num, ip6addr_string(ndo, p)));
 			p += al;
 		}
-#endif
 		else {
 			/*
 			 * Generic case: just print raw data
@@ -342,20 +341,23 @@ cdp_print_addr(netdissect_options *ndo,
 			ND_TCHECK2(*p, pl);
 			if (p + pl > endp)
 				goto trunc;
-			ND_PRINT((ndo, "pt=0x%02x, pl=%d, pb=", *(p - 2), pl));
-			while (pl-- > 0)
-				ND_PRINT((ndo, " %02x", *p++));
-			ND_TCHECK2(*p, 2);
+			ND_PRINT((ndo, "pt=0x%02x, pl=%d, pb=", EXTRACT_U_1((p - 2)), pl));
+			while (pl-- > 0) {
+				ND_PRINT((ndo, " %02x", EXTRACT_U_1(p)));
+				p++;
+			}
+			ND_TCHECK_2(p);
 			if (p + 2 > endp)
 				goto trunc;
-			al = (*p << 8) + *(p + 1);
 			ND_PRINT((ndo, ", al=%d, a=", al));
 			p += 2;
 			ND_TCHECK2(*p, al);
 			if (p + al > endp)
 				goto trunc;
-			while (al-- > 0)
-				ND_PRINT((ndo, " %02x", *p++));
+			while (al-- > 0) {
+				ND_PRINT((ndo, " %02x", EXTRACT_U_1(p)));
+				p++;
+			}
 		}
 		num--;
 		if (num)
@@ -379,7 +381,9 @@ cdp_print_prefixes(netdissect_options *ndo,
 	ND_PRINT((ndo, " IPv4 Prefixes (%d):", l / 5));
 
 	while (l > 0) {
-		ND_PRINT((ndo, " %u.%u.%u.%u/%u", p[0], p[1], p[2], p[3], p[4]));
+		ND_PRINT((ndo, " %u.%u.%u.%u/%u",
+			  EXTRACT_U_1(p), EXTRACT_U_1(p + 1), EXTRACT_U_1(p + 2),
+			  EXTRACT_U_1(p + 3), EXTRACT_U_1(p + 4)));
 		l -= 5;
 		p += 5;
 	}
@@ -398,7 +402,7 @@ static unsigned long cdp_get_number(const u_char * p, int l)
     unsigned long res=0;
     while( l>0 )
     {
-	res = (res<<8) + *p;
+	res = (res<<8) + EXTRACT_U_1(p);
 	p++; l--;
     }
     return res;