X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/df7577985f1c1ff40179bd1d1ff9f9a018696d7d..5287bffd3f4fa1fda9d7734b45f8cf02391d3855:/print-cdp.c

diff --git a/print-cdp.c b/print-cdp.c
index 932f7bcc..9b12e413 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]";
@@ -107,13 +108,13 @@ cdp_print(netdissect_options *ndo,
 	ND_PRINT((ndo, "CDPv%u, ttl: %us", *(tptr + CDP_HEADER_VERSION_OFFSET),
 					   *(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_16BITS(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_16BITS(tptr + CDP_TLV_TYPE_OFFSET);
+		len  = EXTRACT_BE_16BITS(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)",
@@ -163,16 +164,18 @@ cdp_print(netdissect_options *ndo,
 			if (len < 4)
 			    goto trunc;
 			ND_PRINT((ndo, "(0x%08x): %s",
-			       EXTRACT_32BITS(tptr),
-			       bittok2str(cdp_capability_values, "none", EXTRACT_32BITS(tptr))));
+			       EXTRACT_BE_32BITS(tptr),
+			       bittok2str(cdp_capability_values, "none", EXTRACT_BE_32BITS(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 indentation */
-				ND_PRINT((ndo, "\t  "));
+			    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 */
@@ -194,7 +197,7 @@ cdp_print(netdissect_options *ndo,
 		    case 0x0a: /* Native VLAN ID - CDPv2 */
 			if (len < 2)
 			    goto trunc;
-			ND_PRINT((ndo, "%d", EXTRACT_16BITS(tptr)));
+			ND_PRINT((ndo, "%d", EXTRACT_BE_16BITS(tptr)));
 			break;
 		    case 0x0b: /* Duplex - CDPv2 */
 			if (len < 1)
@@ -208,7 +211,7 @@ cdp_print(netdissect_options *ndo,
 		    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", *(tptr), EXTRACT_BE_16BITS(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,7 +219,7 @@ 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_32BITS(tptr)));
 			break;
 		    case 0x12: /* AVVID trust bitmap - not documented */
 			if (len < 1)
@@ -278,16 +281,14 @@ 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);
 	if (p + 4 > endp)
 		goto trunc;
-	num = EXTRACT_32BITS(p);
+	num = EXTRACT_BE_32BITS(p);
 	p += 4;
 
 	while (p < endp && num >= 0) {
@@ -301,7 +302,7 @@ cdp_print_addr(netdissect_options *ndo,
 		ND_TCHECK2(p[pl], 2);
 		if (p + pl + 2 > endp)
 			goto trunc;
-		al = EXTRACT_16BITS(&p[pl]);	/* address length */
+		al = EXTRACT_BE_16BITS(&p[pl]);	/* address length */
 
 		if (pt == PT_NLPID && pl == 1 && *p == NLPID_IP && al == 4) {
 			/*
@@ -317,7 +318,6 @@ cdp_print_addr(netdissect_options *ndo,
 			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
@@ -348,7 +347,6 @@ cdp_print_addr(netdissect_options *ndo,
 			ND_TCHECK2(*p, 2);
 			if (p + 2 > endp)
 				goto trunc;
-			al = (*p << 8) + *(p + 1);
 			ND_PRINT((ndo, ", al=%d, a=", al));
 			p += 2;
 			ND_TCHECK2(*p, al);