X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f085c93f59fb2332e09f3da20eef5fb2bbd04431..fe4ef2d22bcc1b89f16c30480f7bff4348d1a014:/print-openflow-1.0.c diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c index 731f0e38..ac58d7b3 100644 --- a/print-openflow-1.0.c +++ b/print-openflow-1.0.c @@ -59,15 +59,14 @@ /* \summary: OpenFlow protocol version 1.0 printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include "netdissect.h" #include "extract.h" #include "addrtoname.h" -#include "ether.h" #include "ethertype.h" #include "ipproto.h" #include "oui.h" @@ -727,11 +726,11 @@ of10_bitmap_print(netdissect_options *ndo, /* assigned bits */ for (; t->s != NULL; t++) if (v & t->v) { - ND_PRINT((ndo, "%s%s", sep, t->s)); + ND_PRINT("%s%s", sep, t->s); sep = ", "; } /* unassigned bits? */ - ND_PRINT((ndo, v & u ? ") (bogus)" : ")")); + ND_PRINT(v & u ? ") (bogus)" : ")"); } static const u_char * @@ -741,14 +740,14 @@ of10_data_print(netdissect_options *ndo, if (len == 0) return cp; /* data */ - ND_PRINT((ndo, "\n\t data (%u octets)", len)); - ND_TCHECK2(*cp, len); + ND_PRINT("\n\t data (%u octets)", len); + ND_TCHECK_LEN(cp, len); if (ndo->ndo_vflag >= 2) hex_and_ascii_print(ndo, "\n\t ", cp, len); return cp + len; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -765,7 +764,7 @@ of10_bsn_message_print(netdissect_options *ndo, ND_TCHECK_4(cp); subtype = EXTRACT_BE_U_4(cp); cp += 4; - ND_PRINT((ndo, "\n\t subtype %s", tok2str(bsn_subtype_str, "unknown (0x%08x)", subtype))); + ND_PRINT("\n\t subtype %s", tok2str(bsn_subtype_str, "unknown (0x%08x)", subtype)); switch (subtype) { case BSN_GET_IP_MASK_REQUEST: /* @@ -784,7 +783,7 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* index */ ND_TCHECK_1(cp); - ND_PRINT((ndo, ", index %u", EXTRACT_U_1(cp))); + ND_PRINT(", index %u", EXTRACT_U_1(cp)); cp += 1; /* pad */ ND_TCHECK_7(cp); @@ -808,14 +807,14 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* index */ ND_TCHECK_1(cp); - ND_PRINT((ndo, ", index %u", EXTRACT_U_1(cp))); + ND_PRINT(", index %u", EXTRACT_U_1(cp)); cp += 1; /* pad */ ND_TCHECK_3(cp); cp += 3; /* mask */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", mask %s", ipaddr_string(ndo, cp))); + ND_PRINT(", mask %s", ipaddr_string(ndo, cp)); cp += 4; break; case BSN_SET_MIRRORING: @@ -835,7 +834,7 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* report_mirror_ports */ ND_TCHECK_1(cp); - ND_PRINT((ndo, ", report_mirror_ports %s", tok2str(bsn_onoff_str, "bogus (%u)", EXTRACT_U_1(cp)))); + ND_PRINT(", report_mirror_ports %s", tok2str(bsn_onoff_str, "bogus (%u)", EXTRACT_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_3(cp); @@ -872,7 +871,7 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* vport_no */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", vport_no %u", EXTRACT_BE_U_4(cp))); + ND_PRINT(", vport_no %u", EXTRACT_BE_U_4(cp)); cp += 4; break; case BSN_SHELL_COMMAND: @@ -892,15 +891,15 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* service */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", service %u", EXTRACT_BE_U_4(cp))); + ND_PRINT(", service %u", EXTRACT_BE_U_4(cp)); cp += 4; /* data */ - ND_PRINT((ndo, ", data '")); + ND_PRINT(", data '"); if (fn_printn(ndo, cp, len - 8, ep)) { - ND_PRINT((ndo, "'")); + ND_PRINT("'"); goto trunc; } - ND_PRINT((ndo, "'")); + ND_PRINT("'"); cp += len - 8; break; case BSN_SHELL_OUTPUT: @@ -916,12 +915,12 @@ of10_bsn_message_print(netdissect_options *ndo, */ /* already checked that len >= 4 */ /* data */ - ND_PRINT((ndo, ", data '")); + ND_PRINT(", data '"); if (fn_printn(ndo, cp, len - 4, ep)) { - ND_PRINT((ndo, "'")); + ND_PRINT("'"); goto trunc; } - ND_PRINT((ndo, "'")); + ND_PRINT("'"); cp += len - 4; break; case BSN_SHELL_STATUS: @@ -939,21 +938,21 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* status */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", status 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT(", status 0x%08x", EXTRACT_BE_U_4(cp)); cp += 4; break; default: - ND_TCHECK2(*cp, len - 4); + ND_TCHECK_LEN(cp, len - 4); cp += len - 4; } return cp; invalid: /* skip the undersized data */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp0, len); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp0, len); return cp0 + len; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -970,7 +969,7 @@ of10_bsn_actions_print(netdissect_options *ndo, ND_TCHECK_4(cp); subtype = EXTRACT_BE_U_4(cp); cp += 4; - ND_PRINT((ndo, "\n\t subtype %s", tok2str(bsn_action_subtype_str, "unknown (0x%08x)", subtype))); + ND_PRINT("\n\t subtype %s", tok2str(bsn_action_subtype_str, "unknown (0x%08x)", subtype)); switch (subtype) { case BSN_ACTION_MIRROR: /* @@ -991,7 +990,7 @@ of10_bsn_actions_print(netdissect_options *ndo, goto invalid; /* dest_port */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", dest_port %u", EXTRACT_BE_U_4(cp))); + ND_PRINT(", dest_port %u", EXTRACT_BE_U_4(cp)); cp += 4; /* vlan_tag */ ND_TCHECK_4(cp); @@ -999,35 +998,35 @@ of10_bsn_actions_print(netdissect_options *ndo, cp += 4; switch (vlan_tag >> 16) { case 0: - ND_PRINT((ndo, ", vlan_tag none")); + ND_PRINT(", vlan_tag none"); break; case ETHERTYPE_8021Q: - ND_PRINT((ndo, ", vlan_tag 802.1Q (%s)", ieee8021q_tci_string(vlan_tag & 0xffff))); + ND_PRINT(", vlan_tag 802.1Q (%s)", ieee8021q_tci_string(vlan_tag & 0xffff)); break; default: - ND_PRINT((ndo, ", vlan_tag unknown (0x%04x)", vlan_tag >> 16)); + ND_PRINT(", vlan_tag unknown (0x%04x)", vlan_tag >> 16); } /* copy_stage */ ND_TCHECK_1(cp); - ND_PRINT((ndo, ", copy_stage %s", tok2str(bsn_mirror_copy_stage_str, "unknown (%u)", EXTRACT_U_1(cp)))); + ND_PRINT(", copy_stage %s", tok2str(bsn_mirror_copy_stage_str, "unknown (%u)", EXTRACT_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_3(cp); cp += 3; break; default: - ND_TCHECK2(*cp, len - 4); + ND_TCHECK_LEN(cp, len - 4); cp += len - 4; } return cp; invalid: - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp0, len); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp0, len); return cp0 + len; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1044,7 +1043,7 @@ of10_vendor_action_print(netdissect_options *ndo, ND_TCHECK_4(cp); vendor = EXTRACT_BE_U_4(cp); cp += 4; - ND_PRINT((ndo, ", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor))); + ND_PRINT(", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)); /* data */ decoder = vendor == OUI_BSN ? of10_bsn_actions_print : @@ -1052,11 +1051,11 @@ of10_vendor_action_print(netdissect_options *ndo, return decoder(ndo, cp, ep, len - 4); invalid: /* skip the undersized data */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp, len); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp, len); return cp + len; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1073,7 +1072,7 @@ of10_vendor_message_print(netdissect_options *ndo, ND_TCHECK_4(cp); vendor = EXTRACT_BE_U_4(cp); cp += 4; - ND_PRINT((ndo, ", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor))); + ND_PRINT(", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)); /* data */ decoder = vendor == OUI_BSN ? of10_bsn_message_print : @@ -1081,11 +1080,11 @@ of10_vendor_message_print(netdissect_options *ndo, return decoder(ndo, cp, ep, len - 4); invalid: /* skip the undersized data */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp, len); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp, len); return cp + len; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1102,16 +1101,16 @@ of10_vendor_data_print(netdissect_options *ndo, ND_TCHECK_4(cp); vendor = EXTRACT_BE_U_4(cp); cp += 4; - ND_PRINT((ndo, ", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor))); + ND_PRINT(", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)); /* data */ return of10_data_print(ndo, cp, ep, len - 4); invalid: /* skip the undersized data */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp, len); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp, len); return cp + len; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1122,18 +1121,18 @@ of10_packet_data_print(netdissect_options *ndo, if (len == 0) return cp; /* data */ - ND_PRINT((ndo, "\n\t data (%u octets)", len)); + ND_PRINT("\n\t data (%u octets)", len); if (ndo->ndo_vflag < 3) return cp + len; - ND_TCHECK2(*cp, len); + ND_TCHECK_LEN(cp, len); ndo->ndo_vflag -= 3; - ND_PRINT((ndo, ", frame decoding below\n")); + ND_PRINT(", frame decoding below\n"); ether_print(ndo, cp, len, ndo->ndo_snapend - cp, NULL, NULL); ndo->ndo_vflag += 3; return cp + len; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1150,57 +1149,57 @@ of10_phy_ports_print(netdissect_options *ndo, goto invalid; /* port_no */ ND_TCHECK_2(cp); - ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT("\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; /* hw_addr */ - ND_TCHECK2(*cp, ETHER_ADDR_LEN); - ND_PRINT((ndo, ", hw_addr %s", etheraddr_string(ndo, cp))); - cp += ETHER_ADDR_LEN; + ND_TCHECK_LEN(cp, MAC_ADDR_LEN); + ND_PRINT(", hw_addr %s", etheraddr_string(ndo, cp)); + cp += MAC_ADDR_LEN; /* name */ - ND_TCHECK2(*cp, OFP_MAX_PORT_NAME_LEN); - ND_PRINT((ndo, ", name '")); + ND_TCHECK_LEN(cp, OFP_MAX_PORT_NAME_LEN); + ND_PRINT(", name '"); fn_print(ndo, cp, cp + OFP_MAX_PORT_NAME_LEN); - ND_PRINT((ndo, "'")); + ND_PRINT("'"); cp += OFP_MAX_PORT_NAME_LEN; if (ndo->ndo_vflag < 2) { - ND_TCHECK2(*cp, 24); + ND_TCHECK_LEN(cp, 24); cp += 24; goto next_port; } /* config */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t config 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t config 0x%08x", EXTRACT_BE_U_4(cp)); of10_bitmap_print(ndo, ofppc_bm, EXTRACT_BE_U_4(cp), OFPPC_U); cp += 4; /* state */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t state 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t state 0x%08x", EXTRACT_BE_U_4(cp)); of10_bitmap_print(ndo, ofpps_bm, EXTRACT_BE_U_4(cp), OFPPS_U); cp += 4; /* curr */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t curr 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t curr 0x%08x", EXTRACT_BE_U_4(cp)); of10_bitmap_print(ndo, ofppf_bm, EXTRACT_BE_U_4(cp), OFPPF_U); cp += 4; /* advertised */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t advertised 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t advertised 0x%08x", EXTRACT_BE_U_4(cp)); of10_bitmap_print(ndo, ofppf_bm, EXTRACT_BE_U_4(cp), OFPPF_U); cp += 4; /* supported */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t supported 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t supported 0x%08x", EXTRACT_BE_U_4(cp)); of10_bitmap_print(ndo, ofppf_bm, EXTRACT_BE_U_4(cp), OFPPF_U); cp += 4; /* peer */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t peer 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t peer 0x%08x", EXTRACT_BE_U_4(cp)); of10_bitmap_print(ndo, ofppf_bm, EXTRACT_BE_U_4(cp), OFPPF_U); cp += 4; @@ -1210,11 +1209,11 @@ next_port: return cp; invalid: /* skip the undersized trailing data */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp0, len0); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1236,12 +1235,12 @@ of10_queue_props_print(netdissect_options *ndo, ND_TCHECK_2(cp); property = EXTRACT_BE_U_2(cp); cp += 2; - ND_PRINT((ndo, "\n\t property %s", tok2str(ofpqt_str, "invalid (0x%04x)", property))); + ND_PRINT("\n\t property %s", tok2str(ofpqt_str, "invalid (0x%04x)", property)); /* len */ ND_TCHECK_2(cp); plen = EXTRACT_BE_U_2(cp); cp += 2; - ND_PRINT((ndo, ", len %u", plen)); + ND_PRINT(", len %u", plen); if (plen < OF_QUEUE_PROP_HEADER_LEN || plen > len) goto invalid; /* pad */ @@ -1259,11 +1258,11 @@ of10_queue_props_print(netdissect_options *ndo, skip = 1; } if (plen_bogus) { - ND_PRINT((ndo, " (bogus)")); + ND_PRINT(" (bogus)"); skip = 1; } if (skip) { - ND_TCHECK2(*cp, plen - 4); + ND_TCHECK_LEN(cp, plen - 4); cp += plen - 4; goto next_property; } @@ -1273,9 +1272,9 @@ of10_queue_props_print(netdissect_options *ndo, rate = EXTRACT_BE_U_2(cp); cp += 2; if (rate > 1000) - ND_PRINT((ndo, ", rate disabled")); + ND_PRINT(", rate disabled"); else - ND_PRINT((ndo, ", rate %u.%u%%", rate / 10, rate % 10)); + ND_PRINT(", rate %u.%u%%", rate / 10, rate % 10); /* pad */ ND_TCHECK_6(cp); cp += 6; @@ -1286,11 +1285,11 @@ next_property: return cp; invalid: /* skip the rest of queue properties */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp0, len0); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1308,13 +1307,13 @@ of10_queues_print(netdissect_options *ndo, goto invalid; /* queue_id */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t queue_id %u", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t queue_id %u", EXTRACT_BE_U_4(cp)); cp += 4; /* len */ ND_TCHECK_2(cp); desclen = EXTRACT_BE_U_2(cp); cp += 2; - ND_PRINT((ndo, ", len %u", desclen)); + ND_PRINT(", len %u", desclen); if (desclen < OF_PACKET_QUEUE_LEN || desclen > len) goto invalid; /* pad */ @@ -1322,7 +1321,7 @@ of10_queues_print(netdissect_options *ndo, cp += 2; /* properties */ if (ndo->ndo_vflag < 2) { - ND_TCHECK2(*cp, desclen - OF_PACKET_QUEUE_LEN); + ND_TCHECK_LEN(cp, desclen - OF_PACKET_QUEUE_LEN); cp += desclen - OF_PACKET_QUEUE_LEN; goto next_queue; } @@ -1334,11 +1333,11 @@ next_queue: return cp; invalid: /* skip the rest of queues */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp0, len0); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1357,32 +1356,32 @@ of10_match_print(netdissect_options *ndo, ND_TCHECK_4(cp); wildcards = EXTRACT_BE_U_4(cp); if (wildcards & OFPFW_U) - ND_PRINT((ndo, "%swildcards 0x%08x (bogus)", pfx, wildcards)); + ND_PRINT("%swildcards 0x%08x (bogus)", pfx, wildcards); cp += 4; /* in_port */ ND_TCHECK_2(cp); if (! (wildcards & OFPFW_IN_PORT)) - ND_PRINT((ndo, "%smatch in_port %s", pfx, tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT("%smatch in_port %s", pfx, tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; /* dl_src */ - ND_TCHECK2(*cp, ETHER_ADDR_LEN); + ND_TCHECK_LEN(cp, MAC_ADDR_LEN); if (! (wildcards & OFPFW_DL_SRC)) - ND_PRINT((ndo, "%smatch dl_src %s", pfx, etheraddr_string(ndo, cp))); - cp += ETHER_ADDR_LEN; + ND_PRINT("%smatch dl_src %s", pfx, etheraddr_string(ndo, cp)); + cp += MAC_ADDR_LEN; /* dl_dst */ - ND_TCHECK2(*cp, ETHER_ADDR_LEN); + ND_TCHECK_LEN(cp, MAC_ADDR_LEN); if (! (wildcards & OFPFW_DL_DST)) - ND_PRINT((ndo, "%smatch dl_dst %s", pfx, etheraddr_string(ndo, cp))); - cp += ETHER_ADDR_LEN; + ND_PRINT("%smatch dl_dst %s", pfx, etheraddr_string(ndo, cp)); + cp += MAC_ADDR_LEN; /* dl_vlan */ ND_TCHECK_2(cp); if (! (wildcards & OFPFW_DL_VLAN)) - ND_PRINT((ndo, "%smatch dl_vlan %s", pfx, vlan_str(EXTRACT_BE_U_2(cp)))); + ND_PRINT("%smatch dl_vlan %s", pfx, vlan_str(EXTRACT_BE_U_2(cp))); cp += 2; /* dl_vlan_pcp */ ND_TCHECK_1(cp); if (! (wildcards & OFPFW_DL_VLAN_PCP)) - ND_PRINT((ndo, "%smatch dl_vlan_pcp %s", pfx, pcp_str(EXTRACT_U_1(cp)))); + ND_PRINT("%smatch dl_vlan_pcp %s", pfx, pcp_str(EXTRACT_U_1(cp))); cp += 1; /* pad1 */ ND_TCHECK_1(cp); @@ -1392,20 +1391,20 @@ of10_match_print(netdissect_options *ndo, dl_type = EXTRACT_BE_U_2(cp); cp += 2; if (! (wildcards & OFPFW_DL_TYPE)) - ND_PRINT((ndo, "%smatch dl_type 0x%04x", pfx, dl_type)); + ND_PRINT("%smatch dl_type 0x%04x", pfx, dl_type); /* nw_tos */ ND_TCHECK_1(cp); if (! (wildcards & OFPFW_NW_TOS)) - ND_PRINT((ndo, "%smatch nw_tos 0x%02x", pfx, EXTRACT_U_1(cp))); + ND_PRINT("%smatch nw_tos 0x%02x", pfx, EXTRACT_U_1(cp)); cp += 1; /* nw_proto */ ND_TCHECK_1(cp); - nw_proto = *cp; + nw_proto = EXTRACT_U_1(cp); cp += 1; if (! (wildcards & OFPFW_NW_PROTO)) { field_name = ! (wildcards & OFPFW_DL_TYPE) && dl_type == ETHERTYPE_ARP ? "arp_opcode" : "nw_proto"; - ND_PRINT((ndo, "%smatch %s %u", pfx, field_name, nw_proto)); + ND_PRINT("%smatch %s %u", pfx, field_name, nw_proto); } /* pad2 */ ND_TCHECK_2(cp); @@ -1414,13 +1413,13 @@ of10_match_print(netdissect_options *ndo, ND_TCHECK_4(cp); 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(ndo, cp), 32 - nw_bits)); + ND_PRINT("%smatch nw_src %s/%u", pfx, ipaddr_string(ndo, cp), 32 - nw_bits); cp += 4; /* nw_dst */ ND_TCHECK_4(cp); 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(ndo, cp), 32 - nw_bits)); + ND_PRINT("%smatch nw_dst %s/%u", pfx, ipaddr_string(ndo, cp), 32 - nw_bits); cp += 4; /* tp_src */ ND_TCHECK_2(cp); @@ -1428,7 +1427,7 @@ of10_match_print(netdissect_options *ndo, field_name = ! (wildcards & OFPFW_DL_TYPE) && dl_type == ETHERTYPE_IP && ! (wildcards & OFPFW_NW_PROTO) && nw_proto == IPPROTO_ICMP ? "icmp_type" : "tp_src"; - ND_PRINT((ndo, "%smatch %s %u", pfx, field_name, EXTRACT_BE_U_2(cp))); + ND_PRINT("%smatch %s %u", pfx, field_name, EXTRACT_BE_U_2(cp)); } cp += 2; /* tp_dst */ @@ -1437,12 +1436,12 @@ of10_match_print(netdissect_options *ndo, field_name = ! (wildcards & OFPFW_DL_TYPE) && dl_type == ETHERTYPE_IP && ! (wildcards & OFPFW_NW_PROTO) && nw_proto == IPPROTO_ICMP ? "icmp_code" : "tp_dst"; - ND_PRINT((ndo, "%smatch %s %u", pfx, field_name, EXTRACT_BE_U_2(cp))); + ND_PRINT("%smatch %s %u", pfx, field_name, EXTRACT_BE_U_2(cp)); } return cp + 2; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1465,12 +1464,12 @@ of10_actions_print(netdissect_options *ndo, ND_TCHECK_2(cp); type = EXTRACT_BE_U_2(cp); cp += 2; - ND_PRINT((ndo, "%saction type %s", pfx, tok2str(ofpat_str, "invalid (0x%04x)", type))); + ND_PRINT("%saction type %s", pfx, tok2str(ofpat_str, "invalid (0x%04x)", type)); /* length */ ND_TCHECK_2(cp); alen = EXTRACT_BE_U_2(cp); cp += 2; - ND_PRINT((ndo, ", len %u", alen)); + ND_PRINT(", len %u", alen); /* On action size underrun/overrun skip the rest of the action list. */ if (alen < OF_ACTION_HEADER_LEN || alen > len) goto invalid; @@ -1500,11 +1499,11 @@ of10_actions_print(netdissect_options *ndo, skip = 1; } if (alen_bogus) { - ND_PRINT((ndo, " (bogus)")); + ND_PRINT(" (bogus)"); skip = 1; } if (skip) { - ND_TCHECK2(*cp, alen - 4); + ND_TCHECK_LEN(cp, alen - 4); cp += alen - 4; goto next_action; } @@ -1515,17 +1514,17 @@ of10_actions_print(netdissect_options *ndo, ND_TCHECK_2(cp); output_port = EXTRACT_BE_U_2(cp); cp += 2; - ND_PRINT((ndo, ", port %s", tok2str(ofpp_str, "%u", output_port))); + ND_PRINT(", port %s", tok2str(ofpp_str, "%u", output_port)); /* max_len */ ND_TCHECK_2(cp); if (output_port == OFPP_CONTROLLER) - ND_PRINT((ndo, ", max_len %u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", max_len %u", EXTRACT_BE_U_2(cp)); cp += 2; break; case OFPAT_SET_VLAN_VID: /* vlan_vid */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", vlan_vid %s", vlan_str(EXTRACT_BE_U_2(cp)))); + ND_PRINT(", vlan_vid %s", vlan_str(EXTRACT_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_2(cp); @@ -1534,7 +1533,7 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_SET_VLAN_PCP: /* vlan_pcp */ ND_TCHECK_1(cp); - ND_PRINT((ndo, ", vlan_pcp %s", pcp_str(EXTRACT_U_1(cp)))); + ND_PRINT(", vlan_pcp %s", pcp_str(EXTRACT_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_3(cp); @@ -1543,9 +1542,9 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_SET_DL_SRC: case OFPAT_SET_DL_DST: /* dl_addr */ - ND_TCHECK2(*cp, ETHER_ADDR_LEN); - ND_PRINT((ndo, ", dl_addr %s", etheraddr_string(ndo, cp))); - cp += ETHER_ADDR_LEN; + ND_TCHECK_LEN(cp, MAC_ADDR_LEN); + ND_PRINT(", dl_addr %s", etheraddr_string(ndo, cp)); + cp += MAC_ADDR_LEN; /* pad */ ND_TCHECK_6(cp); cp += 6; @@ -1554,13 +1553,13 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_SET_NW_DST: /* nw_addr */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", nw_addr %s", ipaddr_string(ndo, cp))); + ND_PRINT(", nw_addr %s", ipaddr_string(ndo, cp)); cp += 4; break; case OFPAT_SET_NW_TOS: /* nw_tos */ ND_TCHECK_1(cp); - ND_PRINT((ndo, ", nw_tos 0x%02x", EXTRACT_U_1(cp))); + ND_PRINT(", nw_tos 0x%02x", EXTRACT_U_1(cp)); cp += 1; /* pad */ ND_TCHECK_3(cp); @@ -1570,7 +1569,7 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_SET_TP_DST: /* nw_tos */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", tp_port %u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", tp_port %u", EXTRACT_BE_U_2(cp)); cp += 2; /* pad */ ND_TCHECK_2(cp); @@ -1579,14 +1578,14 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_ENQUEUE: /* port */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT(", port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_6(cp); cp += 6; /* queue_id */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", queue_id %s", tok2str(ofpq_str, "%u", EXTRACT_BE_U_4(cp)))); + ND_PRINT(", queue_id %s", tok2str(ofpq_str, "%u", EXTRACT_BE_U_4(cp))); cp += 4; break; case OFPAT_VENDOR: @@ -1605,11 +1604,11 @@ next_action: return cp; invalid: /* skip the rest of actions */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp0, len0); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1620,35 +1619,35 @@ of10_features_reply_print(netdissect_options *ndo, { /* datapath_id */ ND_TCHECK_8(cp); - ND_PRINT((ndo, "\n\t dpid 0x%016" PRIx64, EXTRACT_BE_U_8(cp))); + ND_PRINT("\n\t dpid 0x%016" PRIx64, EXTRACT_BE_U_8(cp)); cp += 8; /* n_buffers */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", n_buffers %u", EXTRACT_BE_U_4(cp))); + ND_PRINT(", n_buffers %u", EXTRACT_BE_U_4(cp)); cp += 4; /* n_tables */ ND_TCHECK_1(cp); - ND_PRINT((ndo, ", n_tables %u", EXTRACT_U_1(cp))); + ND_PRINT(", n_tables %u", EXTRACT_U_1(cp)); cp += 1; /* pad */ ND_TCHECK_3(cp); cp += 3; /* capabilities */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t capabilities 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t capabilities 0x%08x", EXTRACT_BE_U_4(cp)); of10_bitmap_print(ndo, ofp_capabilities_bm, EXTRACT_BE_U_4(cp), OFPCAP_U); cp += 4; /* actions */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t actions 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t actions 0x%08x", EXTRACT_BE_U_4(cp)); of10_bitmap_print(ndo, ofpat_bm, EXTRACT_BE_U_4(cp), OFPAT_U); cp += 4; /* ports */ return of10_phy_ports_print(ndo, cp, ep, len - OF_SWITCH_FEATURES_LEN); trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1664,49 +1663,49 @@ of10_flow_mod_print(netdissect_options *ndo, return ep; /* end of snapshot */ /* cookie */ ND_TCHECK_8(cp); - ND_PRINT((ndo, "\n\t cookie 0x%016" PRIx64, EXTRACT_BE_U_8(cp))); + ND_PRINT("\n\t cookie 0x%016" PRIx64, EXTRACT_BE_U_8(cp)); cp += 8; /* command */ ND_TCHECK_2(cp); command = EXTRACT_BE_U_2(cp); - ND_PRINT((ndo, ", command %s", tok2str(ofpfc_str, "invalid (0x%04x)", command))); + ND_PRINT(", command %s", tok2str(ofpfc_str, "invalid (0x%04x)", command)); cp += 2; /* idle_timeout */ ND_TCHECK_2(cp); if (EXTRACT_BE_U_2(cp)) - ND_PRINT((ndo, ", idle_timeout %u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", idle_timeout %u", EXTRACT_BE_U_2(cp)); cp += 2; /* hard_timeout */ ND_TCHECK_2(cp); if (EXTRACT_BE_U_2(cp)) - ND_PRINT((ndo, ", hard_timeout %u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", hard_timeout %u", EXTRACT_BE_U_2(cp)); cp += 2; /* priority */ ND_TCHECK_2(cp); if (EXTRACT_BE_U_2(cp)) - ND_PRINT((ndo, ", priority %u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", priority %u", EXTRACT_BE_U_2(cp)); cp += 2; /* buffer_id */ ND_TCHECK_4(cp); if (command == OFPFC_ADD || command == OFPFC_MODIFY || command == OFPFC_MODIFY_STRICT) - ND_PRINT((ndo, ", buffer_id %s", tok2str(bufferid_str, "0x%08x", EXTRACT_BE_U_4(cp)))); + ND_PRINT(", buffer_id %s", tok2str(bufferid_str, "0x%08x", EXTRACT_BE_U_4(cp))); cp += 4; /* out_port */ ND_TCHECK_2(cp); if (command == OFPFC_DELETE || command == OFPFC_DELETE_STRICT) - ND_PRINT((ndo, ", out_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT(", out_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; /* flags */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", flags 0x%04x", EXTRACT_BE_U_2(cp))); + ND_PRINT(", flags 0x%04x", EXTRACT_BE_U_2(cp)); of10_bitmap_print(ndo, ofpff_bm, EXTRACT_BE_U_2(cp), OFPFF_U); cp += 2; /* actions */ return of10_actions_print(ndo, "\n\t ", cp, ep, len - OF_FLOW_MOD_LEN); trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1717,25 +1716,25 @@ of10_port_mod_print(netdissect_options *ndo, { /* port_no */ ND_TCHECK_2(cp); - ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT("\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; /* hw_addr */ - ND_TCHECK2(*cp, ETHER_ADDR_LEN); - ND_PRINT((ndo, ", hw_addr %s", etheraddr_string(ndo, cp))); - cp += ETHER_ADDR_LEN; + ND_TCHECK_LEN(cp, MAC_ADDR_LEN); + ND_PRINT(", hw_addr %s", etheraddr_string(ndo, cp)); + cp += MAC_ADDR_LEN; /* config */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t config 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t config 0x%08x", EXTRACT_BE_U_4(cp)); of10_bitmap_print(ndo, ofppc_bm, EXTRACT_BE_U_4(cp), OFPPC_U); cp += 4; /* mask */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t mask 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t mask 0x%08x", EXTRACT_BE_U_4(cp)); of10_bitmap_print(ndo, ofppc_bm, EXTRACT_BE_U_4(cp), OFPPC_U); cp += 4; /* advertise */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t advertise 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t advertise 0x%08x", EXTRACT_BE_U_4(cp)); of10_bitmap_print(ndo, ofppf_bm, EXTRACT_BE_U_4(cp), OFPPF_U); cp += 4; /* pad */ @@ -1743,7 +1742,7 @@ of10_port_mod_print(netdissect_options *ndo, return cp + 4; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1760,12 +1759,12 @@ of10_stats_request_print(netdissect_options *ndo, ND_TCHECK_2(cp); type = EXTRACT_BE_U_2(cp); cp += 2; - ND_PRINT((ndo, "\n\t type %s", tok2str(ofpst_str, "invalid (0x%04x)", type))); + ND_PRINT("\n\t type %s", tok2str(ofpst_str, "invalid (0x%04x)", type)); /* flags */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", flags 0x%04x", EXTRACT_BE_U_2(cp))); + ND_PRINT(", flags 0x%04x", EXTRACT_BE_U_2(cp)); if (EXTRACT_BE_U_2(cp)) - ND_PRINT((ndo, " (bogus)")); + ND_PRINT(" (bogus)"); cp += 2; /* type-specific body of one of fixed lengths */ len -= OF_STATS_REQUEST_LEN; @@ -1784,21 +1783,21 @@ of10_stats_request_print(netdissect_options *ndo, return ep; /* end of snapshot */ /* table_id */ ND_TCHECK_1(cp); - ND_PRINT((ndo, "\n\t table_id %s", tok2str(tableid_str, "%u", EXTRACT_U_1(cp)))); + ND_PRINT("\n\t table_id %s", tok2str(tableid_str, "%u", EXTRACT_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_1(cp); cp += 1; /* out_port */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", out_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT(", out_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); return cp + 2; case OFPST_PORT: if (len != OF_PORT_STATS_REQUEST_LEN) goto invalid; /* port_no */ ND_TCHECK_2(cp); - ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT("\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_6(cp); @@ -1808,14 +1807,14 @@ of10_stats_request_print(netdissect_options *ndo, goto invalid; /* port_no */ ND_TCHECK_2(cp); - ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT("\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_2(cp); cp += 2; /* queue_id */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", queue_id %s", tok2str(ofpq_str, "%u", EXTRACT_BE_U_4(cp)))); + ND_PRINT(", queue_id %s", tok2str(ofpq_str, "%u", EXTRACT_BE_U_4(cp))); return cp + 4; case OFPST_VENDOR: return of10_vendor_data_print(ndo, cp, ep, len); @@ -1823,11 +1822,11 @@ of10_stats_request_print(netdissect_options *ndo, return cp; invalid: /* skip the message body */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp0, len0); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1839,42 +1838,42 @@ of10_desc_stats_reply_print(netdissect_options *ndo, if (len != OF_DESC_STATS_LEN) goto invalid; /* mfr_desc */ - ND_TCHECK2(*cp, DESC_STR_LEN); - ND_PRINT((ndo, "\n\t mfr_desc '")); + ND_TCHECK_LEN(cp, DESC_STR_LEN); + ND_PRINT("\n\t mfr_desc '"); fn_print(ndo, cp, cp + DESC_STR_LEN); - ND_PRINT((ndo, "'")); + ND_PRINT("'"); cp += DESC_STR_LEN; /* hw_desc */ - ND_TCHECK2(*cp, DESC_STR_LEN); - ND_PRINT((ndo, "\n\t hw_desc '")); + ND_TCHECK_LEN(cp, DESC_STR_LEN); + ND_PRINT("\n\t hw_desc '"); fn_print(ndo, cp, cp + DESC_STR_LEN); - ND_PRINT((ndo, "'")); + ND_PRINT("'"); cp += DESC_STR_LEN; /* sw_desc */ - ND_TCHECK2(*cp, DESC_STR_LEN); - ND_PRINT((ndo, "\n\t sw_desc '")); + ND_TCHECK_LEN(cp, DESC_STR_LEN); + ND_PRINT("\n\t sw_desc '"); fn_print(ndo, cp, cp + DESC_STR_LEN); - ND_PRINT((ndo, "'")); + ND_PRINT("'"); cp += DESC_STR_LEN; /* serial_num */ - ND_TCHECK2(*cp, SERIAL_NUM_LEN); - ND_PRINT((ndo, "\n\t serial_num '")); + ND_TCHECK_LEN(cp, SERIAL_NUM_LEN); + ND_PRINT("\n\t serial_num '"); fn_print(ndo, cp, cp + SERIAL_NUM_LEN); - ND_PRINT((ndo, "'")); + ND_PRINT("'"); cp += SERIAL_NUM_LEN; /* dp_desc */ - ND_TCHECK2(*cp, DESC_STR_LEN); - ND_PRINT((ndo, "\n\t dp_desc '")); + ND_TCHECK_LEN(cp, DESC_STR_LEN); + ND_PRINT("\n\t dp_desc '"); fn_print(ndo, cp, cp + DESC_STR_LEN); - ND_PRINT((ndo, "'")); + ND_PRINT("'"); return cp + DESC_STR_LEN; invalid: /* skip the message body */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp, len); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp, len); return cp + len; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1893,13 +1892,13 @@ of10_flow_stats_reply_print(netdissect_options *ndo, /* length */ ND_TCHECK_2(cp); entry_len = EXTRACT_BE_U_2(cp); - ND_PRINT((ndo, "\n\t length %u", entry_len)); + ND_PRINT("\n\t length %u", entry_len); if (entry_len < OF_FLOW_STATS_LEN || entry_len > len) goto invalid; cp += 2; /* table_id */ ND_TCHECK_1(cp); - ND_PRINT((ndo, ", table_id %s", tok2str(tableid_str, "%u", EXTRACT_U_1(cp)))); + ND_PRINT(", table_id %s", tok2str(tableid_str, "%u", EXTRACT_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_1(cp); @@ -1909,38 +1908,38 @@ of10_flow_stats_reply_print(netdissect_options *ndo, return ep; /* end of snapshot */ /* duration_sec */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t duration_sec %u", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t duration_sec %u", EXTRACT_BE_U_4(cp)); cp += 4; /* duration_nsec */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", duration_nsec %u", EXTRACT_BE_U_4(cp))); + ND_PRINT(", duration_nsec %u", EXTRACT_BE_U_4(cp)); cp += 4; /* priority */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", priority %u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", priority %u", EXTRACT_BE_U_2(cp)); cp += 2; /* idle_timeout */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", idle_timeout %u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", idle_timeout %u", EXTRACT_BE_U_2(cp)); cp += 2; /* hard_timeout */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", hard_timeout %u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", hard_timeout %u", EXTRACT_BE_U_2(cp)); cp += 2; /* pad2 */ ND_TCHECK_6(cp); cp += 6; /* cookie */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", cookie 0x%016" PRIx64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", cookie 0x%016" PRIx64, EXTRACT_BE_U_8(cp)); cp += 8; /* packet_count */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", packet_count %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", packet_count %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* byte_count */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", byte_count %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", byte_count %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* actions */ if (ep == (cp = of10_actions_print(ndo, "\n\t ", cp, ep, entry_len - OF_FLOW_STATS_LEN))) @@ -1951,11 +1950,11 @@ of10_flow_stats_reply_print(netdissect_options *ndo, return cp; invalid: /* skip the rest of flow statistics entries */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp0, len0); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -1969,26 +1968,26 @@ of10_aggregate_stats_reply_print(netdissect_options *ndo, goto invalid; /* packet_count */ ND_TCHECK_8(cp); - ND_PRINT((ndo, "\n\t packet_count %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT("\n\t packet_count %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* byte_count */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", byte_count %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", byte_count %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* flow_count */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", flow_count %u", EXTRACT_BE_U_4(cp))); + ND_PRINT(", flow_count %u", EXTRACT_BE_U_4(cp)); cp += 4; /* pad */ ND_TCHECK_4(cp); return cp + 4; invalid: /* skip the message body */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp, len); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp, len); return cp + len; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -2005,38 +2004,38 @@ of10_table_stats_reply_print(netdissect_options *ndo, goto invalid; /* table_id */ ND_TCHECK_1(cp); - ND_PRINT((ndo, "\n\t table_id %s", tok2str(tableid_str, "%u", EXTRACT_U_1(cp)))); + ND_PRINT("\n\t table_id %s", tok2str(tableid_str, "%u", EXTRACT_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_3(cp); cp += 3; /* name */ - ND_TCHECK2(*cp, OFP_MAX_TABLE_NAME_LEN); - ND_PRINT((ndo, ", name '")); + ND_TCHECK_LEN(cp, OFP_MAX_TABLE_NAME_LEN); + ND_PRINT(", name '"); fn_print(ndo, cp, cp + OFP_MAX_TABLE_NAME_LEN); - ND_PRINT((ndo, "'")); + ND_PRINT("'"); cp += OFP_MAX_TABLE_NAME_LEN; /* wildcards */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t wildcards 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t wildcards 0x%08x", EXTRACT_BE_U_4(cp)); of10_bitmap_print(ndo, ofpfw_bm, EXTRACT_BE_U_4(cp), OFPFW_U); cp += 4; /* max_entries */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t max_entries %u", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t max_entries %u", EXTRACT_BE_U_4(cp)); cp += 4; /* active_count */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", active_count %u", EXTRACT_BE_U_4(cp))); + ND_PRINT(", active_count %u", EXTRACT_BE_U_4(cp)); cp += 4; /* lookup_count */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", lookup_count %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", lookup_count %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* matched_count */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", matched_count %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", matched_count %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; len -= OF_TABLE_STATS_LEN; @@ -2044,11 +2043,11 @@ of10_table_stats_reply_print(netdissect_options *ndo, return cp; invalid: /* skip the undersized trailing data */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp0, len0); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -2065,10 +2064,10 @@ of10_port_stats_reply_print(netdissect_options *ndo, goto invalid; /* port_no */ ND_TCHECK_2(cp); - ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT("\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; if (ndo->ndo_vflag < 2) { - ND_TCHECK2(*cp, OF_PORT_STATS_LEN - 2); + ND_TCHECK_LEN(cp, OF_PORT_STATS_LEN - 2); cp += OF_PORT_STATS_LEN - 2; goto next_port; } @@ -2077,51 +2076,51 @@ of10_port_stats_reply_print(netdissect_options *ndo, cp += 6; /* rx_packets */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", rx_packets %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", rx_packets %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* tx_packets */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", tx_packets %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", tx_packets %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* rx_bytes */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", rx_bytes %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", rx_bytes %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* tx_bytes */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", tx_bytes %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", tx_bytes %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* rx_dropped */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", rx_dropped %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", rx_dropped %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* tx_dropped */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", tx_dropped %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", tx_dropped %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* rx_errors */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", rx_errors %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", rx_errors %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* tx_errors */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", tx_errors %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", tx_errors %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* rx_frame_err */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", rx_frame_err %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", rx_frame_err %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* rx_over_err */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", rx_over_err %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", rx_over_err %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* rx_crc_err */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", rx_crc_err %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", rx_crc_err %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* collisions */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", collisions %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", collisions %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; next_port: len -= OF_PORT_STATS_LEN; @@ -2129,11 +2128,11 @@ next_port: return cp; invalid: /* skip the undersized trailing data */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp0, len0); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -2150,26 +2149,26 @@ of10_queue_stats_reply_print(netdissect_options *ndo, goto invalid; /* port_no */ ND_TCHECK_2(cp); - ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT("\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_2(cp); cp += 2; /* queue_id */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", queue_id %u", EXTRACT_BE_U_4(cp))); + ND_PRINT(", queue_id %u", EXTRACT_BE_U_4(cp)); cp += 4; /* tx_bytes */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", tx_bytes %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", tx_bytes %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* tx_packets */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", tx_packets %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", tx_packets %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* tx_errors */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", tx_errors %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", tx_errors %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; len -= OF_QUEUE_STATS_LEN; @@ -2177,11 +2176,11 @@ of10_queue_stats_reply_print(netdissect_options *ndo, return cp; invalid: /* skip the undersized trailing data */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp0, len0); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -2196,11 +2195,11 @@ of10_stats_reply_print(netdissect_options *ndo, /* type */ ND_TCHECK_2(cp); type = EXTRACT_BE_U_2(cp); - ND_PRINT((ndo, "\n\t type %s", tok2str(ofpst_str, "invalid (0x%04x)", type))); + ND_PRINT("\n\t type %s", tok2str(ofpst_str, "invalid (0x%04x)", type)); cp += 2; /* flags */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", flags 0x%04x", EXTRACT_BE_U_2(cp))); + ND_PRINT(", flags 0x%04x", EXTRACT_BE_U_2(cp)); of10_bitmap_print(ndo, ofpsf_reply_bm, EXTRACT_BE_U_2(cp), OFPSF_REPLY_U); cp += 2; @@ -2218,11 +2217,11 @@ of10_stats_reply_print(netdissect_options *ndo, if (decoder != NULL) return decoder(ndo, cp, ep, len - OF_STATS_REPLY_LEN); } - ND_TCHECK2(*cp0, len); + ND_TCHECK_LEN(cp0, len); return cp0 + len; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -2237,11 +2236,11 @@ of10_packet_out_print(netdissect_options *ndo, /* buffer_id */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t buffer_id 0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT("\n\t buffer_id 0x%08x", EXTRACT_BE_U_4(cp)); cp += 4; /* in_port */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", in_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT(", in_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; /* actions_len */ ND_TCHECK_2(cp); @@ -2256,11 +2255,11 @@ of10_packet_out_print(netdissect_options *ndo, return of10_packet_data_print(ndo, cp, ep, len - OF_PACKET_OUT_LEN - actions_len); invalid: /* skip the rest of the message body */ - ND_PRINT((ndo, "%s", istr)); - ND_TCHECK2(*cp0, len0); + ND_PRINT("%s", istr); + ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -2271,19 +2270,19 @@ of10_packet_in_print(netdissect_options *ndo, { /* buffer_id */ ND_TCHECK_4(cp); - ND_PRINT((ndo, "\n\t buffer_id %s", tok2str(bufferid_str, "0x%08x", EXTRACT_BE_U_4(cp)))); + ND_PRINT("\n\t buffer_id %s", tok2str(bufferid_str, "0x%08x", EXTRACT_BE_U_4(cp))); cp += 4; /* total_len */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", total_len %u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", total_len %u", EXTRACT_BE_U_2(cp)); cp += 2; /* in_port */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", in_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT(", in_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; /* reason */ ND_TCHECK_1(cp); - ND_PRINT((ndo, ", reason %s", tok2str(ofpr_str, "invalid (0x%02x)", EXTRACT_U_1(cp)))); + ND_PRINT(", reason %s", tok2str(ofpr_str, "invalid (0x%02x)", EXTRACT_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_1(cp); @@ -2293,7 +2292,7 @@ of10_packet_in_print(netdissect_options *ndo, return of10_packet_data_print(ndo, cp, ep, len - (OF_PACKET_IN_LEN - 2)); trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -2307,47 +2306,47 @@ of10_flow_removed_print(netdissect_options *ndo, return ep; /* end of snapshot */ /* cookie */ ND_TCHECK_8(cp); - ND_PRINT((ndo, "\n\t cookie 0x%016" PRIx64, EXTRACT_BE_U_8(cp))); + ND_PRINT("\n\t cookie 0x%016" PRIx64, EXTRACT_BE_U_8(cp)); cp += 8; /* priority */ ND_TCHECK_2(cp); if (EXTRACT_BE_U_2(cp)) - ND_PRINT((ndo, ", priority %u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", priority %u", EXTRACT_BE_U_2(cp)); cp += 2; /* reason */ ND_TCHECK_1(cp); - ND_PRINT((ndo, ", reason %s", tok2str(ofprr_str, "unknown (0x%02x)", EXTRACT_U_1(cp)))); + ND_PRINT(", reason %s", tok2str(ofprr_str, "unknown (0x%02x)", EXTRACT_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_1(cp); cp += 1; /* duration_sec */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", duration_sec %u", EXTRACT_BE_U_4(cp))); + ND_PRINT(", duration_sec %u", EXTRACT_BE_U_4(cp)); cp += 4; /* duration_nsec */ ND_TCHECK_4(cp); - ND_PRINT((ndo, ", duration_nsec %u", EXTRACT_BE_U_4(cp))); + ND_PRINT(", duration_nsec %u", EXTRACT_BE_U_4(cp)); cp += 4; /* idle_timeout */ ND_TCHECK_2(cp); if (EXTRACT_BE_U_2(cp)) - ND_PRINT((ndo, ", idle_timeout %u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", idle_timeout %u", EXTRACT_BE_U_2(cp)); cp += 2; /* pad2 */ ND_TCHECK_2(cp); cp += 2; /* packet_count */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", packet_count %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", packet_count %" PRIu64, EXTRACT_BE_U_8(cp)); cp += 8; /* byte_count */ ND_TCHECK_8(cp); - ND_PRINT((ndo, ", byte_count %" PRIu64, EXTRACT_BE_U_8(cp))); + ND_PRINT(", byte_count %" PRIu64, EXTRACT_BE_U_8(cp)); return cp + 8; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -2363,7 +2362,7 @@ of10_error_print(netdissect_options *ndo, ND_TCHECK_2(cp); type = EXTRACT_BE_U_2(cp); cp += 2; - ND_PRINT((ndo, "\n\t type %s", tok2str(ofpet_str, "invalid (0x%04x)", type))); + ND_PRINT("\n\t type %s", tok2str(ofpet_str, "invalid (0x%04x)", type)); /* code */ ND_TCHECK_2(cp); code_str = @@ -2374,13 +2373,13 @@ of10_error_print(netdissect_options *ndo, type == OFPET_PORT_MOD_FAILED ? ofppmfc_str : type == OFPET_QUEUE_OP_FAILED ? ofpqofc_str : empty_str; - ND_PRINT((ndo, ", code %s", tok2str(code_str, "invalid (0x%04x)", EXTRACT_BE_U_2(cp)))); + ND_PRINT(", code %s", tok2str(code_str, "invalid (0x%04x)", EXTRACT_BE_U_2(cp))); cp += 2; /* data */ return of10_data_print(ndo, cp, ep, len - OF_ERROR_MSG_LEN); trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; } @@ -2399,8 +2398,8 @@ of10_header_body_print(netdissect_options *ndo, * invalid, proceed to the next message. */ /* [OF10] Section 5.1 */ - ND_PRINT((ndo, "\n\tversion 1.0, type %s, length %u, xid 0x%08x", - tok2str(ofpt_str, "invalid (0x%02x)", type), len, xid)); + ND_PRINT("\n\tversion 1.0, type %s, length %u, xid 0x%08x", + tok2str(ofpt_str, "invalid (0x%02x)", type), len, xid); switch (type) { /* OpenFlow header only. */ case OFPT_FEATURES_REQUEST: /* [OF10] Section 5.3.1 */ @@ -2420,11 +2419,11 @@ of10_header_body_print(netdissect_options *ndo, goto next_message; /* flags */ ND_TCHECK_2(cp); - ND_PRINT((ndo, "\n\t flags %s", tok2str(ofp_config_str, "invalid (0x%04x)", EXTRACT_BE_U_2(cp)))); + ND_PRINT("\n\t flags %s", tok2str(ofp_config_str, "invalid (0x%04x)", EXTRACT_BE_U_2(cp))); cp += 2; /* miss_send_len */ ND_TCHECK_2(cp); - ND_PRINT((ndo, ", miss_send_len %u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", miss_send_len %u", EXTRACT_BE_U_2(cp)); return cp + 2; case OFPT_PORT_MOD: if (len != OF_PORT_MOD_LEN) @@ -2439,7 +2438,7 @@ of10_header_body_print(netdissect_options *ndo, goto next_message; /* port */ ND_TCHECK_2(cp); - ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT("\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_2(cp); @@ -2457,7 +2456,7 @@ of10_header_body_print(netdissect_options *ndo, goto next_message; /* reason */ ND_TCHECK_1(cp); - ND_PRINT((ndo, "\n\t reason %s", tok2str(ofppr_str, "invalid (0x%02x)", EXTRACT_U_1(cp)))); + ND_PRINT("\n\t reason %s", tok2str(ofppr_str, "invalid (0x%02x)", EXTRACT_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_7(cp); @@ -2548,7 +2547,7 @@ of10_header_body_print(netdissect_options *ndo, goto next_message; /* port */ ND_TCHECK_2(cp); - ND_PRINT((ndo, "\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp)))); + ND_PRINT("\n\t port_no %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_6(cp); @@ -2559,11 +2558,11 @@ of10_header_body_print(netdissect_options *ndo, goto next_message; invalid: /* skip the message body */ - ND_PRINT((ndo, "%s", istr)); + ND_PRINT("%s", istr); next_message: - ND_TCHECK2(*cp0, len0 - OF_HEADER_LEN); + ND_TCHECK_LEN(cp0, len0 - OF_HEADER_LEN); return cp0 + len0 - OF_HEADER_LEN; trunc: - ND_PRINT((ndo, "%s", tstr)); + ND_PRINT("%s", tstr); return ep; }