X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/e2982e7f6f0b624a773ec5a58885ee80fab46d34..bef667db65b15c89ec6f1cf325b76acd3c0b8748:/print-openflow-1.0.c diff --git a/print-openflow-1.0.c b/print-openflow-1.0.c index 03d26dff..d7ac8b24 100644 --- a/print-openflow-1.0.c +++ b/print-openflow-1.0.c @@ -59,10 +59,10 @@ /* \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" @@ -72,7 +72,6 @@ #include "oui.h" #include "openflow.h" -static const char tstr[] = " [|openflow]"; #define OFPT_HELLO 0x00 #define OFPT_ERROR 0x01 @@ -703,7 +702,7 @@ vlan_str(const uint16_t vid) if (vid == OFP_VLAN_NONE) return "NONE"; fmt = (vid > 0 && vid < 0x0fff) ? "%u" : "%u (bogus)"; - snprintf(buf, sizeof(buf), fmt, vid); + nd_snprintf(buf, sizeof(buf), fmt, vid); return buf; } @@ -711,7 +710,7 @@ static const char * pcp_str(const uint8_t pcp) { static char buf[sizeof("255 (bogus)")]; - snprintf(buf, sizeof(buf), pcp <= 7 ? "%u" : "%u (bogus)", pcp); + nd_snprintf(buf, sizeof(buf), pcp <= 7 ? "%u" : "%u (bogus)", pcp); return buf; } @@ -747,7 +746,7 @@ of10_data_print(netdissect_options *ndo, return cp + len; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -762,7 +761,7 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* subtype */ ND_TCHECK_4(cp); - subtype = EXTRACT_BE_U_4(cp); + subtype = GET_BE_U_4(cp); cp += 4; ND_PRINT("\n\t subtype %s", tok2str(bsn_subtype_str, "unknown (0x%08x)", subtype)); switch (subtype) { @@ -783,7 +782,7 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* index */ ND_TCHECK_1(cp); - ND_PRINT(", index %u", EXTRACT_U_1(cp)); + ND_PRINT(", index %u", GET_U_1(cp)); cp += 1; /* pad */ ND_TCHECK_7(cp); @@ -807,7 +806,7 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* index */ ND_TCHECK_1(cp); - ND_PRINT(", index %u", EXTRACT_U_1(cp)); + ND_PRINT(", index %u", GET_U_1(cp)); cp += 1; /* pad */ ND_TCHECK_3(cp); @@ -834,7 +833,8 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* report_mirror_ports */ ND_TCHECK_1(cp); - ND_PRINT(", 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)", GET_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_3(cp); @@ -871,7 +871,7 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* vport_no */ ND_TCHECK_4(cp); - ND_PRINT(", vport_no %u", EXTRACT_BE_U_4(cp)); + ND_PRINT(", vport_no %u", GET_BE_U_4(cp)); cp += 4; break; case BSN_SHELL_COMMAND: @@ -891,11 +891,11 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* service */ ND_TCHECK_4(cp); - ND_PRINT(", service %u", EXTRACT_BE_U_4(cp)); + ND_PRINT(", service %u", GET_BE_U_4(cp)); cp += 4; /* data */ ND_PRINT(", data '"); - if (fn_printn(ndo, cp, len - 8, ep)) { + if (nd_printn(ndo, cp, len - 8, ep)) { ND_PRINT("'"); goto trunc; } @@ -916,7 +916,7 @@ of10_bsn_message_print(netdissect_options *ndo, /* already checked that len >= 4 */ /* data */ ND_PRINT(", data '"); - if (fn_printn(ndo, cp, len - 4, ep)) { + if (nd_printn(ndo, cp, len - 4, ep)) { ND_PRINT("'"); goto trunc; } @@ -938,7 +938,7 @@ of10_bsn_message_print(netdissect_options *ndo, goto invalid; /* status */ ND_TCHECK_4(cp); - ND_PRINT(", status 0x%08x", EXTRACT_BE_U_4(cp)); + ND_PRINT(", status 0x%08x", GET_BE_U_4(cp)); cp += 4; break; default: @@ -948,11 +948,11 @@ of10_bsn_message_print(netdissect_options *ndo, return cp; invalid: /* skip the undersized data */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp0, len); return cp0 + len; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -967,7 +967,7 @@ of10_bsn_actions_print(netdissect_options *ndo, goto invalid; /* subtype */ ND_TCHECK_4(cp); - subtype = EXTRACT_BE_U_4(cp); + subtype = GET_BE_U_4(cp); cp += 4; ND_PRINT("\n\t subtype %s", tok2str(bsn_action_subtype_str, "unknown (0x%08x)", subtype)); switch (subtype) { @@ -990,11 +990,11 @@ of10_bsn_actions_print(netdissect_options *ndo, goto invalid; /* dest_port */ ND_TCHECK_4(cp); - ND_PRINT(", dest_port %u", EXTRACT_BE_U_4(cp)); + ND_PRINT(", dest_port %u", GET_BE_U_4(cp)); cp += 4; /* vlan_tag */ ND_TCHECK_4(cp); - vlan_tag = EXTRACT_BE_U_4(cp); + vlan_tag = GET_BE_U_4(cp); cp += 4; switch (vlan_tag >> 16) { case 0: @@ -1008,7 +1008,8 @@ of10_bsn_actions_print(netdissect_options *ndo, } /* copy_stage */ ND_TCHECK_1(cp); - ND_PRINT(", 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)", GET_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_3(cp); @@ -1022,11 +1023,11 @@ of10_bsn_actions_print(netdissect_options *ndo, return cp; invalid: - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp0, len); return cp0 + len; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1041,7 +1042,7 @@ of10_vendor_action_print(netdissect_options *ndo, goto invalid; /* vendor */ ND_TCHECK_4(cp); - vendor = EXTRACT_BE_U_4(cp); + vendor = GET_BE_U_4(cp); cp += 4; ND_PRINT(", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)); /* data */ @@ -1051,11 +1052,11 @@ of10_vendor_action_print(netdissect_options *ndo, return decoder(ndo, cp, ep, len - 4); invalid: /* skip the undersized data */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp, len); return cp + len; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1070,7 +1071,7 @@ of10_vendor_message_print(netdissect_options *ndo, goto invalid; /* vendor */ ND_TCHECK_4(cp); - vendor = EXTRACT_BE_U_4(cp); + vendor = GET_BE_U_4(cp); cp += 4; ND_PRINT(", vendor 0x%08x (%s)", vendor, of_vendor_name(vendor)); /* data */ @@ -1080,11 +1081,11 @@ of10_vendor_message_print(netdissect_options *ndo, return decoder(ndo, cp, ep, len - 4); invalid: /* skip the undersized data */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp, len); return cp + len; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1099,18 +1100,18 @@ of10_vendor_data_print(netdissect_options *ndo, goto invalid; /* vendor */ ND_TCHECK_4(cp); - vendor = EXTRACT_BE_U_4(cp); + vendor = GET_BE_U_4(cp); cp += 4; 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("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp, len); return cp + len; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1132,7 +1133,7 @@ of10_packet_data_print(netdissect_options *ndo, return cp + len; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1149,7 +1150,8 @@ of10_phy_ports_print(netdissect_options *ndo, goto invalid; /* port_no */ ND_TCHECK_2(cp); - ND_PRINT("\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", GET_BE_U_2(cp))); cp += 2; /* hw_addr */ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); @@ -1158,7 +1160,7 @@ of10_phy_ports_print(netdissect_options *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, cp, cp + OFP_MAX_PORT_NAME_LEN); ND_PRINT("'"); cp += OFP_MAX_PORT_NAME_LEN; @@ -1169,38 +1171,38 @@ of10_phy_ports_print(netdissect_options *ndo, } /* config */ ND_TCHECK_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), + ND_PRINT("\n\t config 0x%08x", GET_BE_U_4(cp)); + of10_bitmap_print(ndo, ofppc_bm, GET_BE_U_4(cp), OFPPC_U); cp += 4; /* state */ ND_TCHECK_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), + ND_PRINT("\n\t state 0x%08x", GET_BE_U_4(cp)); + of10_bitmap_print(ndo, ofpps_bm, GET_BE_U_4(cp), OFPPS_U); cp += 4; /* curr */ ND_TCHECK_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), + ND_PRINT("\n\t curr 0x%08x", GET_BE_U_4(cp)); + of10_bitmap_print(ndo, ofppf_bm, GET_BE_U_4(cp), OFPPF_U); cp += 4; /* advertised */ ND_TCHECK_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), + ND_PRINT("\n\t advertised 0x%08x", GET_BE_U_4(cp)); + of10_bitmap_print(ndo, ofppf_bm, GET_BE_U_4(cp), OFPPF_U); cp += 4; /* supported */ ND_TCHECK_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), + ND_PRINT("\n\t supported 0x%08x", GET_BE_U_4(cp)); + of10_bitmap_print(ndo, ofppf_bm, GET_BE_U_4(cp), OFPPF_U); cp += 4; /* peer */ ND_TCHECK_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), + ND_PRINT("\n\t peer 0x%08x", GET_BE_U_4(cp)); + of10_bitmap_print(ndo, ofppf_bm, GET_BE_U_4(cp), OFPPF_U); cp += 4; next_port: @@ -1209,11 +1211,11 @@ next_port: return cp; invalid: /* skip the undersized trailing data */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1233,12 +1235,12 @@ of10_queue_props_print(netdissect_options *ndo, goto invalid; /* property */ ND_TCHECK_2(cp); - property = EXTRACT_BE_U_2(cp); + property = GET_BE_U_2(cp); cp += 2; ND_PRINT("\n\t property %s", tok2str(ofpqt_str, "invalid (0x%04x)", property)); /* len */ ND_TCHECK_2(cp); - plen = EXTRACT_BE_U_2(cp); + plen = GET_BE_U_2(cp); cp += 2; ND_PRINT(", len %u", plen); if (plen < OF_QUEUE_PROP_HEADER_LEN || plen > len) @@ -1269,7 +1271,7 @@ of10_queue_props_print(netdissect_options *ndo, if (property == OFPQT_MIN_RATE) { /* the only case of property decoding */ /* rate */ ND_TCHECK_2(cp); - rate = EXTRACT_BE_U_2(cp); + rate = GET_BE_U_2(cp); cp += 2; if (rate > 1000) ND_PRINT(", rate disabled"); @@ -1285,11 +1287,11 @@ next_property: return cp; invalid: /* skip the rest of queue properties */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1307,11 +1309,11 @@ of10_queues_print(netdissect_options *ndo, goto invalid; /* queue_id */ ND_TCHECK_4(cp); - ND_PRINT("\n\t queue_id %u", EXTRACT_BE_U_4(cp)); + ND_PRINT("\n\t queue_id %u", GET_BE_U_4(cp)); cp += 4; /* len */ ND_TCHECK_2(cp); - desclen = EXTRACT_BE_U_2(cp); + desclen = GET_BE_U_2(cp); cp += 2; ND_PRINT(", len %u", desclen); if (desclen < OF_PACKET_QUEUE_LEN || desclen > len) @@ -1333,11 +1335,11 @@ next_queue: return cp; invalid: /* skip the rest of queues */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1349,19 +1351,20 @@ of10_match_print(netdissect_options *ndo, uint32_t wildcards; uint16_t dl_type; uint8_t nw_proto; - u_char nw_bits; + u_int nw_bits; const char *field_name; /* wildcards */ ND_TCHECK_4(cp); - wildcards = EXTRACT_BE_U_4(cp); + wildcards = GET_BE_U_4(cp); if (wildcards & OFPFW_U) ND_PRINT("%swildcards 0x%08x (bogus)", pfx, wildcards); cp += 4; /* in_port */ ND_TCHECK_2(cp); if (! (wildcards & OFPFW_IN_PORT)) - ND_PRINT("%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", GET_BE_U_2(cp))); cp += 2; /* dl_src */ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); @@ -1376,30 +1379,30 @@ of10_match_print(netdissect_options *ndo, /* dl_vlan */ ND_TCHECK_2(cp); if (! (wildcards & OFPFW_DL_VLAN)) - ND_PRINT("%smatch dl_vlan %s", pfx, vlan_str(EXTRACT_BE_U_2(cp))); + ND_PRINT("%smatch dl_vlan %s", pfx, vlan_str(GET_BE_U_2(cp))); cp += 2; /* dl_vlan_pcp */ ND_TCHECK_1(cp); if (! (wildcards & OFPFW_DL_VLAN_PCP)) - ND_PRINT("%smatch dl_vlan_pcp %s", pfx, pcp_str(EXTRACT_U_1(cp))); + ND_PRINT("%smatch dl_vlan_pcp %s", pfx, pcp_str(GET_U_1(cp))); cp += 1; /* pad1 */ ND_TCHECK_1(cp); cp += 1; /* dl_type */ ND_TCHECK_2(cp); - dl_type = EXTRACT_BE_U_2(cp); + dl_type = GET_BE_U_2(cp); cp += 2; if (! (wildcards & OFPFW_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("%smatch nw_tos 0x%02x", pfx, EXTRACT_U_1(cp)); + ND_PRINT("%smatch nw_tos 0x%02x", pfx, GET_U_1(cp)); cp += 1; /* nw_proto */ ND_TCHECK_1(cp); - nw_proto = EXTRACT_U_1(cp); + nw_proto = GET_U_1(cp); cp += 1; if (! (wildcards & OFPFW_NW_PROTO)) { field_name = ! (wildcards & OFPFW_DL_TYPE) && dl_type == ETHERTYPE_ARP @@ -1427,7 +1430,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("%smatch %s %u", pfx, field_name, EXTRACT_BE_U_2(cp)); + ND_PRINT("%smatch %s %u", pfx, field_name, GET_BE_U_2(cp)); } cp += 2; /* tp_dst */ @@ -1436,12 +1439,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("%smatch %s %u", pfx, field_name, EXTRACT_BE_U_2(cp)); + ND_PRINT("%smatch %s %u", pfx, field_name, GET_BE_U_2(cp)); } return cp + 2; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1462,12 +1465,12 @@ of10_actions_print(netdissect_options *ndo, goto invalid; /* type */ ND_TCHECK_2(cp); - type = EXTRACT_BE_U_2(cp); + type = GET_BE_U_2(cp); cp += 2; ND_PRINT("%saction type %s", pfx, tok2str(ofpat_str, "invalid (0x%04x)", type)); /* length */ ND_TCHECK_2(cp); - alen = EXTRACT_BE_U_2(cp); + alen = GET_BE_U_2(cp); cp += 2; ND_PRINT(", len %u", alen); /* On action size underrun/overrun skip the rest of the action list. */ @@ -1512,19 +1515,19 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_OUTPUT: /* port */ ND_TCHECK_2(cp); - output_port = EXTRACT_BE_U_2(cp); + output_port = GET_BE_U_2(cp); cp += 2; ND_PRINT(", port %s", tok2str(ofpp_str, "%u", output_port)); /* max_len */ ND_TCHECK_2(cp); if (output_port == OFPP_CONTROLLER) - ND_PRINT(", max_len %u", EXTRACT_BE_U_2(cp)); + ND_PRINT(", max_len %u", GET_BE_U_2(cp)); cp += 2; break; case OFPAT_SET_VLAN_VID: /* vlan_vid */ ND_TCHECK_2(cp); - ND_PRINT(", vlan_vid %s", vlan_str(EXTRACT_BE_U_2(cp))); + ND_PRINT(", vlan_vid %s", vlan_str(GET_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_2(cp); @@ -1533,7 +1536,7 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_SET_VLAN_PCP: /* vlan_pcp */ ND_TCHECK_1(cp); - ND_PRINT(", vlan_pcp %s", pcp_str(EXTRACT_U_1(cp))); + ND_PRINT(", vlan_pcp %s", pcp_str(GET_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_3(cp); @@ -1559,7 +1562,7 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_SET_NW_TOS: /* nw_tos */ ND_TCHECK_1(cp); - ND_PRINT(", nw_tos 0x%02x", EXTRACT_U_1(cp)); + ND_PRINT(", nw_tos 0x%02x", GET_U_1(cp)); cp += 1; /* pad */ ND_TCHECK_3(cp); @@ -1569,7 +1572,7 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_SET_TP_DST: /* nw_tos */ ND_TCHECK_2(cp); - ND_PRINT(", tp_port %u", EXTRACT_BE_U_2(cp)); + ND_PRINT(", tp_port %u", GET_BE_U_2(cp)); cp += 2; /* pad */ ND_TCHECK_2(cp); @@ -1578,14 +1581,16 @@ of10_actions_print(netdissect_options *ndo, case OFPAT_ENQUEUE: /* port */ ND_TCHECK_2(cp); - ND_PRINT(", port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", port %s", + tok2str(ofpp_str, "%u", GET_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_6(cp); cp += 6; /* queue_id */ ND_TCHECK_4(cp); - ND_PRINT(", queue_id %s", tok2str(ofpq_str, "%u", EXTRACT_BE_U_4(cp))); + ND_PRINT(", queue_id %s", + tok2str(ofpq_str, "%u", GET_BE_U_4(cp))); cp += 4; break; case OFPAT_VENDOR: @@ -1604,11 +1609,11 @@ next_action: return cp; invalid: /* skip the rest of actions */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1619,35 +1624,35 @@ of10_features_reply_print(netdissect_options *ndo, { /* datapath_id */ ND_TCHECK_8(cp); - ND_PRINT("\n\t dpid 0x%016" PRIx64, EXTRACT_BE_U_8(cp)); + ND_PRINT("\n\t dpid 0x%016" PRIx64, GET_BE_U_8(cp)); cp += 8; /* n_buffers */ ND_TCHECK_4(cp); - ND_PRINT(", n_buffers %u", EXTRACT_BE_U_4(cp)); + ND_PRINT(", n_buffers %u", GET_BE_U_4(cp)); cp += 4; /* n_tables */ ND_TCHECK_1(cp); - ND_PRINT(", n_tables %u", EXTRACT_U_1(cp)); + ND_PRINT(", n_tables %u", GET_U_1(cp)); cp += 1; /* pad */ ND_TCHECK_3(cp); cp += 3; /* capabilities */ ND_TCHECK_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), + ND_PRINT("\n\t capabilities 0x%08x", GET_BE_U_4(cp)); + of10_bitmap_print(ndo, ofp_capabilities_bm, GET_BE_U_4(cp), OFPCAP_U); cp += 4; /* actions */ ND_TCHECK_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); + ND_PRINT("\n\t actions 0x%08x", GET_BE_U_4(cp)); + of10_bitmap_print(ndo, ofpat_bm, GET_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("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1663,49 +1668,51 @@ of10_flow_mod_print(netdissect_options *ndo, return ep; /* end of snapshot */ /* cookie */ ND_TCHECK_8(cp); - ND_PRINT("\n\t cookie 0x%016" PRIx64, EXTRACT_BE_U_8(cp)); + ND_PRINT("\n\t cookie 0x%016" PRIx64, GET_BE_U_8(cp)); cp += 8; /* command */ ND_TCHECK_2(cp); - command = EXTRACT_BE_U_2(cp); + command = GET_BE_U_2(cp); 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(", idle_timeout %u", EXTRACT_BE_U_2(cp)); + if (GET_BE_U_2(cp)) + ND_PRINT(", idle_timeout %u", GET_BE_U_2(cp)); cp += 2; /* hard_timeout */ ND_TCHECK_2(cp); - if (EXTRACT_BE_U_2(cp)) - ND_PRINT(", hard_timeout %u", EXTRACT_BE_U_2(cp)); + if (GET_BE_U_2(cp)) + ND_PRINT(", hard_timeout %u", GET_BE_U_2(cp)); cp += 2; /* priority */ ND_TCHECK_2(cp); - if (EXTRACT_BE_U_2(cp)) - ND_PRINT(", priority %u", EXTRACT_BE_U_2(cp)); + if (GET_BE_U_2(cp)) + ND_PRINT(", priority %u", GET_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(", buffer_id %s", tok2str(bufferid_str, "0x%08x", EXTRACT_BE_U_4(cp))); + ND_PRINT(", buffer_id %s", + tok2str(bufferid_str, "0x%08x", GET_BE_U_4(cp))); cp += 4; /* out_port */ ND_TCHECK_2(cp); if (command == OFPFC_DELETE || command == OFPFC_DELETE_STRICT) - ND_PRINT(", out_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", out_port %s", + tok2str(ofpp_str, "%u", GET_BE_U_2(cp))); cp += 2; /* flags */ ND_TCHECK_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); + ND_PRINT(", flags 0x%04x", GET_BE_U_2(cp)); + of10_bitmap_print(ndo, ofpff_bm, GET_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("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1716,7 +1723,7 @@ of10_port_mod_print(netdissect_options *ndo, { /* port_no */ ND_TCHECK_2(cp); - ND_PRINT("\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", GET_BE_U_2(cp))); cp += 2; /* hw_addr */ ND_TCHECK_LEN(cp, MAC_ADDR_LEN); @@ -1724,25 +1731,25 @@ of10_port_mod_print(netdissect_options *ndo, cp += MAC_ADDR_LEN; /* config */ ND_TCHECK_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); + ND_PRINT("\n\t config 0x%08x", GET_BE_U_4(cp)); + of10_bitmap_print(ndo, ofppc_bm, GET_BE_U_4(cp), OFPPC_U); cp += 4; /* mask */ ND_TCHECK_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); + ND_PRINT("\n\t mask 0x%08x", GET_BE_U_4(cp)); + of10_bitmap_print(ndo, ofppc_bm, GET_BE_U_4(cp), OFPPC_U); cp += 4; /* advertise */ ND_TCHECK_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); + ND_PRINT("\n\t advertise 0x%08x", GET_BE_U_4(cp)); + of10_bitmap_print(ndo, ofppf_bm, GET_BE_U_4(cp), OFPPF_U); cp += 4; /* pad */ ND_TCHECK_4(cp); return cp + 4; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1757,13 +1764,13 @@ of10_stats_request_print(netdissect_options *ndo, /* type */ ND_TCHECK_2(cp); - type = EXTRACT_BE_U_2(cp); + type = GET_BE_U_2(cp); cp += 2; ND_PRINT("\n\t type %s", tok2str(ofpst_str, "invalid (0x%04x)", type)); /* flags */ ND_TCHECK_2(cp); - ND_PRINT(", flags 0x%04x", EXTRACT_BE_U_2(cp)); - if (EXTRACT_BE_U_2(cp)) + ND_PRINT(", flags 0x%04x", GET_BE_U_2(cp)); + if (GET_BE_U_2(cp)) ND_PRINT(" (bogus)"); cp += 2; /* type-specific body of one of fixed lengths */ @@ -1783,21 +1790,24 @@ of10_stats_request_print(netdissect_options *ndo, return ep; /* end of snapshot */ /* table_id */ ND_TCHECK_1(cp); - ND_PRINT("\n\t table_id %s", tok2str(tableid_str, "%u", EXTRACT_U_1(cp))); + ND_PRINT("\n\t table_id %s", + tok2str(tableid_str, "%u", GET_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_1(cp); cp += 1; /* out_port */ ND_TCHECK_2(cp); - ND_PRINT(", out_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", out_port %s", + tok2str(ofpp_str, "%u", GET_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("\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", GET_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_6(cp); @@ -1807,14 +1817,16 @@ of10_stats_request_print(netdissect_options *ndo, goto invalid; /* port_no */ ND_TCHECK_2(cp); - ND_PRINT("\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", GET_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_2(cp); cp += 2; /* queue_id */ ND_TCHECK_4(cp); - ND_PRINT(", queue_id %s", tok2str(ofpq_str, "%u", EXTRACT_BE_U_4(cp))); + ND_PRINT(", queue_id %s", + tok2str(ofpq_str, "%u", GET_BE_U_4(cp))); return cp + 4; case OFPST_VENDOR: return of10_vendor_data_print(ndo, cp, ep, len); @@ -1822,11 +1834,11 @@ of10_stats_request_print(netdissect_options *ndo, return cp; invalid: /* skip the message body */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1840,40 +1852,40 @@ of10_desc_stats_reply_print(netdissect_options *ndo, /* 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, cp, cp + DESC_STR_LEN); ND_PRINT("'"); cp += DESC_STR_LEN; /* 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, cp, cp + DESC_STR_LEN); ND_PRINT("'"); cp += DESC_STR_LEN; /* 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, cp, cp + DESC_STR_LEN); ND_PRINT("'"); cp += DESC_STR_LEN; /* 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, cp, cp + SERIAL_NUM_LEN); ND_PRINT("'"); cp += SERIAL_NUM_LEN; /* 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, cp, cp + DESC_STR_LEN); ND_PRINT("'"); return cp + DESC_STR_LEN; invalid: /* skip the message body */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp, len); return cp + len; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1891,14 +1903,15 @@ of10_flow_stats_reply_print(netdissect_options *ndo, goto invalid; /* length */ ND_TCHECK_2(cp); - entry_len = EXTRACT_BE_U_2(cp); + entry_len = GET_BE_U_2(cp); 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(", table_id %s", tok2str(tableid_str, "%u", EXTRACT_U_1(cp))); + ND_PRINT(", table_id %s", + tok2str(tableid_str, "%u", GET_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_1(cp); @@ -1908,38 +1921,38 @@ of10_flow_stats_reply_print(netdissect_options *ndo, return ep; /* end of snapshot */ /* duration_sec */ ND_TCHECK_4(cp); - ND_PRINT("\n\t duration_sec %u", EXTRACT_BE_U_4(cp)); + ND_PRINT("\n\t duration_sec %u", GET_BE_U_4(cp)); cp += 4; /* duration_nsec */ ND_TCHECK_4(cp); - ND_PRINT(", duration_nsec %u", EXTRACT_BE_U_4(cp)); + ND_PRINT(", duration_nsec %u", GET_BE_U_4(cp)); cp += 4; /* priority */ ND_TCHECK_2(cp); - ND_PRINT(", priority %u", EXTRACT_BE_U_2(cp)); + ND_PRINT(", priority %u", GET_BE_U_2(cp)); cp += 2; /* idle_timeout */ ND_TCHECK_2(cp); - ND_PRINT(", idle_timeout %u", EXTRACT_BE_U_2(cp)); + ND_PRINT(", idle_timeout %u", GET_BE_U_2(cp)); cp += 2; /* hard_timeout */ ND_TCHECK_2(cp); - ND_PRINT(", hard_timeout %u", EXTRACT_BE_U_2(cp)); + ND_PRINT(", hard_timeout %u", GET_BE_U_2(cp)); cp += 2; /* pad2 */ ND_TCHECK_6(cp); cp += 6; /* cookie */ ND_TCHECK_8(cp); - ND_PRINT(", cookie 0x%016" PRIx64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", cookie 0x%016" PRIx64, GET_BE_U_8(cp)); cp += 8; /* packet_count */ ND_TCHECK_8(cp); - ND_PRINT(", packet_count %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", packet_count %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* byte_count */ ND_TCHECK_8(cp); - ND_PRINT(", byte_count %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", byte_count %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* actions */ if (ep == (cp = of10_actions_print(ndo, "\n\t ", cp, ep, entry_len - OF_FLOW_STATS_LEN))) @@ -1950,11 +1963,11 @@ of10_flow_stats_reply_print(netdissect_options *ndo, return cp; invalid: /* skip the rest of flow statistics entries */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -1968,26 +1981,26 @@ of10_aggregate_stats_reply_print(netdissect_options *ndo, goto invalid; /* packet_count */ ND_TCHECK_8(cp); - ND_PRINT("\n\t packet_count %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT("\n\t packet_count %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* byte_count */ ND_TCHECK_8(cp); - ND_PRINT(", byte_count %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", byte_count %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* flow_count */ ND_TCHECK_4(cp); - ND_PRINT(", flow_count %u", EXTRACT_BE_U_4(cp)); + ND_PRINT(", flow_count %u", GET_BE_U_4(cp)); cp += 4; /* pad */ ND_TCHECK_4(cp); return cp + 4; invalid: /* skip the message body */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp, len); return cp + len; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -2004,7 +2017,8 @@ of10_table_stats_reply_print(netdissect_options *ndo, goto invalid; /* table_id */ ND_TCHECK_1(cp); - ND_PRINT("\n\t table_id %s", tok2str(tableid_str, "%u", EXTRACT_U_1(cp))); + ND_PRINT("\n\t table_id %s", + tok2str(tableid_str, "%u", GET_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_3(cp); @@ -2012,30 +2026,30 @@ of10_table_stats_reply_print(netdissect_options *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, cp, cp + OFP_MAX_TABLE_NAME_LEN); ND_PRINT("'"); cp += OFP_MAX_TABLE_NAME_LEN; /* wildcards */ ND_TCHECK_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), + ND_PRINT("\n\t wildcards 0x%08x", GET_BE_U_4(cp)); + of10_bitmap_print(ndo, ofpfw_bm, GET_BE_U_4(cp), OFPFW_U); cp += 4; /* max_entries */ ND_TCHECK_4(cp); - ND_PRINT("\n\t max_entries %u", EXTRACT_BE_U_4(cp)); + ND_PRINT("\n\t max_entries %u", GET_BE_U_4(cp)); cp += 4; /* active_count */ ND_TCHECK_4(cp); - ND_PRINT(", active_count %u", EXTRACT_BE_U_4(cp)); + ND_PRINT(", active_count %u", GET_BE_U_4(cp)); cp += 4; /* lookup_count */ ND_TCHECK_8(cp); - ND_PRINT(", lookup_count %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", lookup_count %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* matched_count */ ND_TCHECK_8(cp); - ND_PRINT(", matched_count %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", matched_count %" PRIu64, GET_BE_U_8(cp)); cp += 8; len -= OF_TABLE_STATS_LEN; @@ -2043,11 +2057,11 @@ of10_table_stats_reply_print(netdissect_options *ndo, return cp; invalid: /* skip the undersized trailing data */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -2064,7 +2078,8 @@ of10_port_stats_reply_print(netdissect_options *ndo, goto invalid; /* port_no */ ND_TCHECK_2(cp); - ND_PRINT("\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", GET_BE_U_2(cp))); cp += 2; if (ndo->ndo_vflag < 2) { ND_TCHECK_LEN(cp, OF_PORT_STATS_LEN - 2); @@ -2076,51 +2091,51 @@ of10_port_stats_reply_print(netdissect_options *ndo, cp += 6; /* rx_packets */ ND_TCHECK_8(cp); - ND_PRINT(", rx_packets %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", rx_packets %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* tx_packets */ ND_TCHECK_8(cp); - ND_PRINT(", tx_packets %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", tx_packets %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* rx_bytes */ ND_TCHECK_8(cp); - ND_PRINT(", rx_bytes %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", rx_bytes %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* tx_bytes */ ND_TCHECK_8(cp); - ND_PRINT(", tx_bytes %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", tx_bytes %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* rx_dropped */ ND_TCHECK_8(cp); - ND_PRINT(", rx_dropped %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", rx_dropped %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* tx_dropped */ ND_TCHECK_8(cp); - ND_PRINT(", tx_dropped %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", tx_dropped %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* rx_errors */ ND_TCHECK_8(cp); - ND_PRINT(", rx_errors %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", rx_errors %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* tx_errors */ ND_TCHECK_8(cp); - ND_PRINT(", tx_errors %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", tx_errors %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* rx_frame_err */ ND_TCHECK_8(cp); - ND_PRINT(", rx_frame_err %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", rx_frame_err %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* rx_over_err */ ND_TCHECK_8(cp); - ND_PRINT(", rx_over_err %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", rx_over_err %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* rx_crc_err */ ND_TCHECK_8(cp); - ND_PRINT(", rx_crc_err %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", rx_crc_err %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* collisions */ ND_TCHECK_8(cp); - ND_PRINT(", collisions %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", collisions %" PRIu64, GET_BE_U_8(cp)); cp += 8; next_port: len -= OF_PORT_STATS_LEN; @@ -2128,11 +2143,11 @@ next_port: return cp; invalid: /* skip the undersized trailing data */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -2149,26 +2164,27 @@ of10_queue_stats_reply_print(netdissect_options *ndo, goto invalid; /* port_no */ ND_TCHECK_2(cp); - ND_PRINT("\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", GET_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_2(cp); cp += 2; /* queue_id */ ND_TCHECK_4(cp); - ND_PRINT(", queue_id %u", EXTRACT_BE_U_4(cp)); + ND_PRINT(", queue_id %u", GET_BE_U_4(cp)); cp += 4; /* tx_bytes */ ND_TCHECK_8(cp); - ND_PRINT(", tx_bytes %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", tx_bytes %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* tx_packets */ ND_TCHECK_8(cp); - ND_PRINT(", tx_packets %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", tx_packets %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* tx_errors */ ND_TCHECK_8(cp); - ND_PRINT(", tx_errors %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", tx_errors %" PRIu64, GET_BE_U_8(cp)); cp += 8; len -= OF_QUEUE_STATS_LEN; @@ -2176,11 +2192,11 @@ of10_queue_stats_reply_print(netdissect_options *ndo, return cp; invalid: /* skip the undersized trailing data */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -2194,13 +2210,13 @@ of10_stats_reply_print(netdissect_options *ndo, /* type */ ND_TCHECK_2(cp); - type = EXTRACT_BE_U_2(cp); + type = GET_BE_U_2(cp); ND_PRINT("\n\t type %s", tok2str(ofpst_str, "invalid (0x%04x)", type)); cp += 2; /* flags */ ND_TCHECK_2(cp); - ND_PRINT(", flags 0x%04x", EXTRACT_BE_U_2(cp)); - of10_bitmap_print(ndo, ofpsf_reply_bm, EXTRACT_BE_U_2(cp), + ND_PRINT(", flags 0x%04x", GET_BE_U_2(cp)); + of10_bitmap_print(ndo, ofpsf_reply_bm, GET_BE_U_2(cp), OFPSF_REPLY_U); cp += 2; @@ -2221,7 +2237,7 @@ of10_stats_reply_print(netdissect_options *ndo, return cp0 + len; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -2236,15 +2252,15 @@ of10_packet_out_print(netdissect_options *ndo, /* buffer_id */ ND_TCHECK_4(cp); - ND_PRINT("\n\t buffer_id 0x%08x", EXTRACT_BE_U_4(cp)); + ND_PRINT("\n\t buffer_id 0x%08x", GET_BE_U_4(cp)); cp += 4; /* in_port */ ND_TCHECK_2(cp); - ND_PRINT(", in_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", in_port %s", tok2str(ofpp_str, "%u", GET_BE_U_2(cp))); cp += 2; /* actions_len */ ND_TCHECK_2(cp); - actions_len = EXTRACT_BE_U_2(cp); + actions_len = GET_BE_U_2(cp); cp += 2; if (actions_len > len - OF_PACKET_OUT_LEN) goto invalid; @@ -2255,11 +2271,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("%s", istr); + nd_print_invalid(ndo); ND_TCHECK_LEN(cp0, len0); return cp0 + len0; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -2270,19 +2286,21 @@ of10_packet_in_print(netdissect_options *ndo, { /* buffer_id */ ND_TCHECK_4(cp); - ND_PRINT("\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", GET_BE_U_4(cp))); cp += 4; /* total_len */ ND_TCHECK_2(cp); - ND_PRINT(", total_len %u", EXTRACT_BE_U_2(cp)); + ND_PRINT(", total_len %u", GET_BE_U_2(cp)); cp += 2; /* in_port */ ND_TCHECK_2(cp); - ND_PRINT(", in_port %s", tok2str(ofpp_str, "%u", EXTRACT_BE_U_2(cp))); + ND_PRINT(", in_port %s", tok2str(ofpp_str, "%u", GET_BE_U_2(cp))); cp += 2; /* reason */ ND_TCHECK_1(cp); - ND_PRINT(", reason %s", tok2str(ofpr_str, "invalid (0x%02x)", EXTRACT_U_1(cp))); + ND_PRINT(", reason %s", + tok2str(ofpr_str, "invalid (0x%02x)", GET_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_1(cp); @@ -2292,7 +2310,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("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -2306,47 +2324,48 @@ of10_flow_removed_print(netdissect_options *ndo, return ep; /* end of snapshot */ /* cookie */ ND_TCHECK_8(cp); - ND_PRINT("\n\t cookie 0x%016" PRIx64, EXTRACT_BE_U_8(cp)); + ND_PRINT("\n\t cookie 0x%016" PRIx64, GET_BE_U_8(cp)); cp += 8; /* priority */ ND_TCHECK_2(cp); - if (EXTRACT_BE_U_2(cp)) - ND_PRINT(", priority %u", EXTRACT_BE_U_2(cp)); + if (GET_BE_U_2(cp)) + ND_PRINT(", priority %u", GET_BE_U_2(cp)); cp += 2; /* reason */ ND_TCHECK_1(cp); - ND_PRINT(", reason %s", tok2str(ofprr_str, "unknown (0x%02x)", EXTRACT_U_1(cp))); + ND_PRINT(", reason %s", + tok2str(ofprr_str, "unknown (0x%02x)", GET_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_1(cp); cp += 1; /* duration_sec */ ND_TCHECK_4(cp); - ND_PRINT(", duration_sec %u", EXTRACT_BE_U_4(cp)); + ND_PRINT(", duration_sec %u", GET_BE_U_4(cp)); cp += 4; /* duration_nsec */ ND_TCHECK_4(cp); - ND_PRINT(", duration_nsec %u", EXTRACT_BE_U_4(cp)); + ND_PRINT(", duration_nsec %u", GET_BE_U_4(cp)); cp += 4; /* idle_timeout */ ND_TCHECK_2(cp); - if (EXTRACT_BE_U_2(cp)) - ND_PRINT(", idle_timeout %u", EXTRACT_BE_U_2(cp)); + if (GET_BE_U_2(cp)) + ND_PRINT(", idle_timeout %u", GET_BE_U_2(cp)); cp += 2; /* pad2 */ ND_TCHECK_2(cp); cp += 2; /* packet_count */ ND_TCHECK_8(cp); - ND_PRINT(", packet_count %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", packet_count %" PRIu64, GET_BE_U_8(cp)); cp += 8; /* byte_count */ ND_TCHECK_8(cp); - ND_PRINT(", byte_count %" PRIu64, EXTRACT_BE_U_8(cp)); + ND_PRINT(", byte_count %" PRIu64, GET_BE_U_8(cp)); return cp + 8; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -2360,7 +2379,7 @@ of10_error_print(netdissect_options *ndo, /* type */ ND_TCHECK_2(cp); - type = EXTRACT_BE_U_2(cp); + type = GET_BE_U_2(cp); cp += 2; ND_PRINT("\n\t type %s", tok2str(ofpet_str, "invalid (0x%04x)", type)); /* code */ @@ -2373,13 +2392,14 @@ of10_error_print(netdissect_options *ndo, type == OFPET_PORT_MOD_FAILED ? ofppmfc_str : type == OFPET_QUEUE_OP_FAILED ? ofpqofc_str : empty_str; - ND_PRINT(", code %s", tok2str(code_str, "invalid (0x%04x)", EXTRACT_BE_U_2(cp))); + ND_PRINT(", code %s", + tok2str(code_str, "invalid (0x%04x)", GET_BE_U_2(cp))); cp += 2; /* data */ return of10_data_print(ndo, cp, ep, len - OF_ERROR_MSG_LEN); trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; } @@ -2419,11 +2439,12 @@ of10_header_body_print(netdissect_options *ndo, goto next_message; /* flags */ ND_TCHECK_2(cp); - ND_PRINT("\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)", GET_BE_U_2(cp))); cp += 2; /* miss_send_len */ ND_TCHECK_2(cp); - ND_PRINT(", miss_send_len %u", EXTRACT_BE_U_2(cp)); + ND_PRINT(", miss_send_len %u", GET_BE_U_2(cp)); return cp + 2; case OFPT_PORT_MOD: if (len != OF_PORT_MOD_LEN) @@ -2438,7 +2459,8 @@ of10_header_body_print(netdissect_options *ndo, goto next_message; /* port */ ND_TCHECK_2(cp); - ND_PRINT("\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", GET_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_2(cp); @@ -2456,7 +2478,8 @@ of10_header_body_print(netdissect_options *ndo, goto next_message; /* reason */ ND_TCHECK_1(cp); - ND_PRINT("\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)", GET_U_1(cp))); cp += 1; /* pad */ ND_TCHECK_7(cp); @@ -2547,7 +2570,8 @@ of10_header_body_print(netdissect_options *ndo, goto next_message; /* port */ ND_TCHECK_2(cp); - ND_PRINT("\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", GET_BE_U_2(cp))); cp += 2; /* pad */ ND_TCHECK_6(cp); @@ -2558,11 +2582,11 @@ of10_header_body_print(netdissect_options *ndo, goto next_message; invalid: /* skip the message body */ - ND_PRINT("%s", istr); + nd_print_invalid(ndo); next_message: ND_TCHECK_LEN(cp0, len0 - OF_HEADER_LEN); return cp0 + len0 - OF_HEADER_LEN; trunc: - ND_PRINT("%s", tstr); + nd_print_trunc(ndo); return ep; }