X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f2e17bb1673b6c1c9d62ea51625aef920d7252d2..refs/pull/482/head:/print-cdp.c?ds=inline

diff --git a/print-cdp.c b/print-cdp.c
index a725eb6e..96ef143b 100644
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -24,18 +24,17 @@
  *    http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
  */
 
-#define NETDISSECT_REWORKED
 #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]";
@@ -147,7 +146,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,7 +155,7 @@ 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 */
@@ -171,13 +170,13 @@ cdp_print(netdissect_options *ndo,
 			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 */
+			    if (j == 0x0a) /* lets rework the version string to get a nice indentation */
 				ND_PRINT((ndo, "\t  "));
 			}
 			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,7 +187,7 @@ 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 */
@@ -230,7 +229,7 @@ cdp_print(netdissect_options *ndo,
 			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 */
@@ -243,7 +242,7 @@ cdp_print(netdissect_options *ndo,
 			ND_PRINT((ndo, "0x%02x", *(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,11 +277,9 @@ 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)
@@ -317,7 +314,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 +330,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