X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b38f324af9dd953a661b9f35910f8c6d8eb2cc06..7780402e9f67ffe6b98274f16277c8db00d3a95f:/print-loopback.c

diff --git a/print-loopback.c b/print-loopback.c
index 10f69310..e0c6efbd 100644
--- a/print-loopback.c
+++ b/print-loopback.c
@@ -33,14 +33,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
-#include "ether.h"
 #include "addrtoname.h"
 
 static const char tstr[] = " [|loopback]";
@@ -63,46 +62,46 @@ loopback_message_print(netdissect_options *ndo, const u_char *cp, const u_int le
 	if (len < 2)
 		goto invalid;
 	/* function */
-	ND_TCHECK2(*cp, 2);
-	function = EXTRACT_LE_16BITS(cp);
+	ND_TCHECK_2(cp);
+	function = EXTRACT_LE_U_2(cp);
 	cp += 2;
-	ND_PRINT((ndo, ", %s", tok2str(fcode_str, " invalid (%u)", function)));
+	ND_PRINT(", %s", tok2str(fcode_str, " invalid (%u)", function));
 
 	switch (function) {
 		case LOOPBACK_REPLY:
 			if (len < 4)
 				goto invalid;
 			/* receipt number */
-			ND_TCHECK2(*cp, 2);
-			ND_PRINT((ndo, ", receipt number %u", EXTRACT_LE_16BITS(cp)));
+			ND_TCHECK_2(cp);
+			ND_PRINT(", receipt number %u", EXTRACT_LE_U_2(cp));
 			cp += 2;
 			/* data */
-			ND_PRINT((ndo, ", data (%u octets)", len - 4));
-			ND_TCHECK2(*cp, len - 4);
+			ND_PRINT(", data (%u octets)", len - 4);
+			ND_TCHECK_LEN(cp, len - 4);
 			break;
 		case LOOPBACK_FWDDATA:
 			if (len < 8)
 				goto invalid;
 			/* forwarding address */
-			ND_TCHECK2(*cp, ETHER_ADDR_LEN);
-			ND_PRINT((ndo, ", forwarding address %s", etheraddr_string(ndo, cp)));
-			cp += ETHER_ADDR_LEN;
+			ND_TCHECK_LEN(cp, MAC_ADDR_LEN);
+			ND_PRINT(", forwarding address %s", etheraddr_string(ndo, cp));
+			cp += MAC_ADDR_LEN;
 			/* data */
-			ND_PRINT((ndo, ", data (%u octets)", len - 8));
-			ND_TCHECK2(*cp, len - 8);
+			ND_PRINT(", data (%u octets)", len - 8);
+			ND_TCHECK_LEN(cp, len - 8);
 			break;
 		default:
-			ND_TCHECK2(*cp, len - 2);
+			ND_TCHECK_LEN(cp, len - 2);
 			break;
 	}
 	return;
 
 invalid:
-	ND_PRINT((ndo, "%s", istr));
-	ND_TCHECK2(*cp, ep - cp);
+	ND_PRINT("%s", istr);
+	ND_TCHECK_LEN(cp, ep - cp);
 	return;
 trunc:
-	ND_PRINT((ndo, "%s", tstr));
+	ND_PRINT("%s", tstr);
 }
 
 void
@@ -111,26 +110,26 @@ loopback_print(netdissect_options *ndo, const u_char *cp, const u_int len)
 	const u_char *ep = cp + len;
 	uint16_t skipCount;
 
-	ND_PRINT((ndo, "Loopback"));
+	ND_PRINT("Loopback");
 	if (len < 2)
 		goto invalid;
 	/* skipCount */
-	ND_TCHECK2(*cp, 2);
-	skipCount = EXTRACT_LE_16BITS(cp);
+	ND_TCHECK_2(cp);
+	skipCount = EXTRACT_LE_U_2(cp);
 	cp += 2;
-	ND_PRINT((ndo, ", skipCount %u", skipCount));
+	ND_PRINT(", skipCount %u", skipCount);
 	if (skipCount % 8)
-		ND_PRINT((ndo, " (bogus)"));
+		ND_PRINT(" (bogus)");
 	if (skipCount > len - 2)
 		goto invalid;
 	loopback_message_print(ndo, cp + skipCount, len - 2 - skipCount);
 	return;
 
 invalid:
-	ND_PRINT((ndo, "%s", istr));
-	ND_TCHECK2(*cp, ep - cp);
+	ND_PRINT("%s", istr);
+	ND_TCHECK_LEN(cp, ep - cp);
 	return;
 trunc:
-	ND_PRINT((ndo, "%s", tstr));
+	ND_PRINT("%s", tstr);
 }