X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/da20bc56d6100b5275d6f85c4a25bac1dab4e57e..e2982e7f6f0b624a773ec5a58885ee80fab46d34:/print-openflow.c

diff --git a/print-openflow.c b/print-openflow.c
index 92956292..d9271a29 100644
--- a/print-openflow.c
+++ b/print-openflow.c
@@ -70,8 +70,8 @@ static void
 of_header_print(netdissect_options *ndo, const uint8_t version, const uint8_t type,
                       const uint16_t length, const uint32_t xid)
 {
-	ND_PRINT((ndo, "\n\tversion unknown (0x%02x), type 0x%02x, length %u, xid 0x%08x",
-	       version, type, length, xid));
+	ND_PRINT("\n\tversion unknown (0x%02x), type 0x%02x, length %u, xid 0x%08x",
+	       version, type, length, xid);
 }
 
 /* Print a single OpenFlow message. */
@@ -85,19 +85,19 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
 	if (ep < cp + OF_HEADER_LEN)
 		goto invalid;
 	/* version */
-	ND_TCHECK2(*cp, 1);
-	version = *cp;
+	ND_TCHECK_1(cp);
+	version = EXTRACT_U_1(cp);
 	cp += 1;
 	/* type */
-	ND_TCHECK2(*cp, 1);
-	type = *cp;
+	ND_TCHECK_1(cp);
+	type = EXTRACT_U_1(cp);
 	cp += 1;
 	/* length */
-	ND_TCHECK2(*cp, 2);
+	ND_TCHECK_2(cp);
 	length = EXTRACT_BE_U_2(cp);
 	cp += 2;
 	/* xid */
-	ND_TCHECK2(*cp, 4);
+	ND_TCHECK_4(cp);
 	xid = EXTRACT_BE_U_4(cp);
 	cp += 4;
 	/* Message length includes the header length and a message always includes
@@ -116,16 +116,16 @@ of_header_body_print(netdissect_options *ndo, const u_char *cp, const u_char *ep
 		return of10_header_body_print(ndo, cp, ep, type, length, xid);
 	default:
 		of_header_print(ndo, version, type, length, xid);
-		ND_TCHECK2(*cp, length - OF_HEADER_LEN);
+		ND_TCHECK_LEN(cp, length - OF_HEADER_LEN);
 		return cp + length - OF_HEADER_LEN; /* done with current message */
 	}
 
 invalid: /* fail current packet */
-	ND_PRINT((ndo, "%s", istr));
-	ND_TCHECK2(*cp, ep - cp);
+	ND_PRINT("%s", istr);
+	ND_TCHECK_LEN(cp, ep - cp);
 	return ep;
 trunc:
-	ND_PRINT((ndo, "%s", tstr));
+	ND_PRINT("%s", tstr);
 	return ep;
 }
 
@@ -136,7 +136,7 @@ openflow_print(netdissect_options *ndo, const u_char *cp, const u_int len)
 {
 	const u_char *ep = cp + len;
 
-	ND_PRINT((ndo, ": OpenFlow"));
+	ND_PRINT(": OpenFlow");
 	while (cp < ep)
 		cp = of_header_body_print(ndo, cp, ep);
 }