X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d53a7940aaf35b8cb7f3b89c7a668281912a063f..e1e0824e40f4bfaaec7636f1e452911a6b8f7eca:/print-openflow-1.0.c

diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c
index 03bb623f..a26f2dc0 100644
--- a/print-openflow-1.0.c
+++ b/print-openflow-1.0.c
@@ -692,12 +692,12 @@ of10_phy_ports_print(netdissect_options *ndo,
 		cp += 2;
 		/* hw_addr */
 		ND_TCHECK2(*cp, ETHER_ADDR_LEN);
-		ND_PRINT((ndo, ", hw_addr %s", etheraddr_string(cp)));
+		ND_PRINT((ndo, ", hw_addr %s", etheraddr_string(ndo, cp)));
 		cp += ETHER_ADDR_LEN;
 		/* name */
 		ND_TCHECK2(*cp, OFP_MAX_PORT_NAME_LEN);
 		ND_PRINT((ndo, ", name '"));
-		fn_print(cp, cp + OFP_MAX_PORT_NAME_LEN);
+		fn_print(ndo, cp, cp + OFP_MAX_PORT_NAME_LEN);
 		ND_PRINT((ndo, "'"));
 		cp += OFP_MAX_PORT_NAME_LEN;
 
@@ -896,12 +896,12 @@ of10_match_print(netdissect_options *ndo,
 	/* dl_src */
 	ND_TCHECK2(*cp, ETHER_ADDR_LEN);
 	if (! (wildcards & OFPFW_DL_SRC))
-		ND_PRINT((ndo, "%smatch dl_src %s", pfx, etheraddr_string(cp)));
+		ND_PRINT((ndo, "%smatch dl_src %s", pfx, etheraddr_string(ndo, cp)));
 	cp += ETHER_ADDR_LEN;
 	/* dl_dst */
 	ND_TCHECK2(*cp, ETHER_ADDR_LEN);
 	if (! (wildcards & OFPFW_DL_DST))
-		ND_PRINT((ndo, "%smatch dl_dst %s", pfx, etheraddr_string(cp)));
+		ND_PRINT((ndo, "%smatch dl_dst %s", pfx, etheraddr_string(ndo, cp)));
 	cp += ETHER_ADDR_LEN;
 	/* dl_vlan */
 	ND_TCHECK2(*cp, 2);
@@ -943,13 +943,13 @@ of10_match_print(netdissect_options *ndo,
 	ND_TCHECK2(*cp, 4);
 	nw_bits = (wildcards & OFPFW_NW_SRC_MASK) >> OFPFW_NW_SRC_SHIFT;
 	if (nw_bits < 32)
-		ND_PRINT((ndo, "%smatch nw_src %s/%u", pfx, ipaddr_string(cp), 32 - nw_bits));
+		ND_PRINT((ndo, "%smatch nw_src %s/%u", pfx, ipaddr_string(ndo, cp), 32 - nw_bits));
 	cp += 4;
 	/* nw_dst */
 	ND_TCHECK2(*cp, 4);
 	nw_bits = (wildcards & OFPFW_NW_DST_MASK) >> OFPFW_NW_DST_SHIFT;
 	if (nw_bits < 32)
-		ND_PRINT((ndo, "%smatch nw_dst %s/%u", pfx, ipaddr_string(cp), 32 - nw_bits));
+		ND_PRINT((ndo, "%smatch nw_dst %s/%u", pfx, ipaddr_string(ndo, cp), 32 - nw_bits));
 	cp += 4;
 	/* tp_src */
 	ND_TCHECK2(*cp, 2);
@@ -1072,7 +1072,7 @@ of10_actions_print(netdissect_options *ndo,
 		case OFPAT_SET_DL_DST:
 			/* dl_addr */
 			ND_TCHECK2(*cp, ETHER_ADDR_LEN);
-			ND_PRINT((ndo, ", dl_addr %s", etheraddr_string(cp)));
+			ND_PRINT((ndo, ", dl_addr %s", etheraddr_string(ndo, cp)));
 			cp += ETHER_ADDR_LEN;
 			/* pad */
 			ND_TCHECK2(*cp, 6);
@@ -1082,7 +1082,7 @@ of10_actions_print(netdissect_options *ndo,
 		case OFPAT_SET_NW_DST:
 			/* nw_addr */
 			ND_TCHECK2(*cp, 4);
-			ND_PRINT((ndo, ", nw_addr %s", ipaddr_string(cp)));
+			ND_PRINT((ndo, ", nw_addr %s", ipaddr_string(ndo, cp)));
 			cp += 4;
 			break;
 		case OFPAT_SET_NW_TOS:
@@ -1245,7 +1245,7 @@ of10_port_mod_print(netdissect_options *ndo,
 	cp += 2;
 	/* hw_addr */
 	ND_TCHECK2(*cp, ETHER_ADDR_LEN);
-	ND_PRINT((ndo, ", hw_addr %s", etheraddr_string(cp)));
+	ND_PRINT((ndo, ", hw_addr %s", etheraddr_string(ndo, cp)));
 	cp += ETHER_ADDR_LEN;
 	/* config */
 	ND_TCHECK2(*cp, 4);
@@ -1363,31 +1363,31 @@ of10_desc_stats_reply_print(netdissect_options *ndo,
 	/* mfr_desc */
 	ND_TCHECK2(*cp, DESC_STR_LEN);
 	ND_PRINT((ndo, "\n\t  mfr_desc '"));
-	fn_print(cp, cp + DESC_STR_LEN);
+	fn_print(ndo, cp, cp + DESC_STR_LEN);
 	ND_PRINT((ndo, "'"));
 	cp += DESC_STR_LEN;
 	/* hw_desc */
 	ND_TCHECK2(*cp, DESC_STR_LEN);
 	ND_PRINT((ndo, "\n\t  hw_desc '"));
-	fn_print(cp, cp + DESC_STR_LEN);
+	fn_print(ndo, cp, cp + DESC_STR_LEN);
 	ND_PRINT((ndo, "'"));
 	cp += DESC_STR_LEN;
 	/* sw_desc */
 	ND_TCHECK2(*cp, DESC_STR_LEN);
 	ND_PRINT((ndo, "\n\t  sw_desc '"));
-	fn_print(cp, cp + DESC_STR_LEN);
+	fn_print(ndo, cp, cp + DESC_STR_LEN);
 	ND_PRINT((ndo, "'"));
 	cp += DESC_STR_LEN;
 	/* serial_num */
 	ND_TCHECK2(*cp, SERIAL_NUM_LEN);
 	ND_PRINT((ndo, "\n\t  serial_num '"));
-	fn_print(cp, cp + SERIAL_NUM_LEN);
+	fn_print(ndo, cp, cp + SERIAL_NUM_LEN);
 	ND_PRINT((ndo, "'"));
 	cp += SERIAL_NUM_LEN;
 	/* dp_desc */
 	ND_TCHECK2(*cp, DESC_STR_LEN);
 	ND_PRINT((ndo, "\n\t  dp_desc '"));
-	fn_print(cp, cp + DESC_STR_LEN);
+	fn_print(ndo, cp, cp + DESC_STR_LEN);
 	ND_PRINT((ndo, "'"));
 	return cp + DESC_STR_LEN;
 
@@ -1532,7 +1532,7 @@ of10_table_stats_reply_print(netdissect_options *ndo,
 		/* name */
 		ND_TCHECK2(*cp, OFP_MAX_TABLE_NAME_LEN);
 		ND_PRINT((ndo, ", name '"));
-		fn_print(cp, cp + OFP_MAX_TABLE_NAME_LEN);
+		fn_print(ndo, cp, cp + OFP_MAX_TABLE_NAME_LEN);
 		ND_PRINT((ndo, "'"));
 		cp += OFP_MAX_TABLE_NAME_LEN;
 		/* wildcards */