diff options
Diffstat (limited to 'contrib/tcpdump/print-slow.c')
| -rw-r--r-- | contrib/tcpdump/print-slow.c | 363 |
1 files changed, 178 insertions, 185 deletions
diff --git a/contrib/tcpdump/print-slow.c b/contrib/tcpdump/print-slow.c index d1484790ce2f..118381808fda 100644 --- a/contrib/tcpdump/print-slow.c +++ b/contrib/tcpdump/print-slow.c @@ -21,17 +21,18 @@ /* \summary: IEEE "slow protocols" (802.3ad/802.3ah) printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif -#include <netdissect-stdinc.h> +#include "netdissect-stdinc.h" +#define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" #include "extract.h" #include "addrtoname.h" -#include "ether.h" #include "oui.h" + #define SLOW_PROTO_LACP 1 #define SLOW_PROTO_MARKER 2 #define SLOW_PROTO_OAM 3 @@ -75,15 +76,15 @@ static const struct tok slow_oam_code_values[] = { }; struct slow_oam_info_t { - uint8_t info_type; - uint8_t info_length; - uint8_t oam_version; - uint8_t revision[2]; - uint8_t state; - uint8_t oam_config; - uint8_t oam_pdu_config[2]; - uint8_t oui[3]; - uint8_t vendor_private[4]; + nd_uint8_t info_type; + nd_uint8_t info_length; + nd_uint8_t oam_version; + nd_uint16_t revision; + nd_uint8_t state; + nd_uint8_t oam_config; + nd_uint16_t oam_pdu_config; + nd_uint24_t oui; + nd_uint32_t vendor_private; }; #define SLOW_OAM_INFO_TYPE_END_OF_TLV 0x00 @@ -145,29 +146,29 @@ static const struct tok slow_oam_link_event_values[] = { }; struct slow_oam_link_event_t { - uint8_t event_type; - uint8_t event_length; - uint8_t time_stamp[2]; - uint8_t window[8]; - uint8_t threshold[8]; - uint8_t errors[8]; - uint8_t errors_running_total[8]; - uint8_t event_running_total[4]; + nd_uint8_t event_type; + nd_uint8_t event_length; + nd_uint16_t time_stamp; + nd_uint64_t window; + nd_uint64_t threshold; + nd_uint64_t errors; + nd_uint64_t errors_running_total; + nd_uint32_t event_running_total; }; struct slow_oam_variablerequest_t { - uint8_t branch; - uint8_t leaf[2]; + nd_uint8_t branch; + nd_uint16_t leaf; }; struct slow_oam_variableresponse_t { - uint8_t branch; - uint8_t leaf[2]; - uint8_t length; + nd_uint8_t branch; + nd_uint16_t leaf; + nd_uint8_t length; }; struct slow_oam_loopbackctrl_t { - uint8_t command; + nd_uint8_t command; }; static const struct tok slow_oam_loopbackctrl_cmd_values[] = { @@ -177,8 +178,8 @@ static const struct tok slow_oam_loopbackctrl_cmd_values[] = { }; struct tlv_header_t { - uint8_t type; - uint8_t length; + nd_uint8_t type; + nd_uint8_t length; }; #define LACP_MARKER_TLV_TERMINATOR 0x00 /* same code for LACP and Marker */ @@ -201,13 +202,13 @@ static const struct tok slow_tlv_values[] = { }; struct lacp_tlv_actor_partner_info_t { - uint8_t sys_pri[2]; - uint8_t sys[ETHER_ADDR_LEN]; - uint8_t key[2]; - uint8_t port_pri[2]; - uint8_t port[2]; - uint8_t state; - uint8_t pad[3]; + nd_uint16_t sys_pri; + nd_mac_addr sys; + nd_uint16_t key; + nd_uint16_t port_pri; + nd_uint16_t port; + nd_uint8_t state; + nd_byte pad[3]; }; static const struct tok lacp_tlv_actor_partner_info_state_values[] = { @@ -223,35 +224,35 @@ static const struct tok lacp_tlv_actor_partner_info_state_values[] = { }; struct lacp_tlv_collector_info_t { - uint8_t max_delay[2]; - uint8_t pad[12]; + nd_uint16_t max_delay; + nd_byte pad[12]; }; struct marker_tlv_marker_info_t { - uint8_t req_port[2]; - uint8_t req_sys[ETHER_ADDR_LEN]; - uint8_t req_trans_id[4]; - uint8_t pad[2]; + nd_uint16_t req_port; + nd_mac_addr req_sys; + nd_uint32_t req_trans_id; + nd_byte pad[2]; }; struct lacp_marker_tlv_terminator_t { - uint8_t pad[50]; + nd_byte pad[50]; }; -static void slow_marker_lacp_print(netdissect_options *, register const u_char *, register u_int, u_int); -static void slow_oam_print(netdissect_options *, register const u_char *, register u_int); +static void slow_marker_lacp_print(netdissect_options *, const u_char *, u_int, u_int); +static void slow_oam_print(netdissect_options *, const u_char *, u_int); void slow_print(netdissect_options *ndo, - register const u_char *pptr, register u_int len) + const u_char *pptr, u_int len) { int print_version; u_int subtype; + ndo->ndo_protocol = "slow"; if (len < 1) goto tooshort; - ND_TCHECK(*pptr); - subtype = *pptr; + subtype = GET_U_1(pptr); /* * Sanity checking of the header. @@ -260,9 +261,9 @@ slow_print(netdissect_options *ndo, case SLOW_PROTO_LACP: if (len < 2) goto tooshort; - ND_TCHECK(*(pptr+1)); - if (*(pptr+1) != LACP_VERSION) { - ND_PRINT((ndo, "LACP version %u packet not supported", *(pptr+1))); + if (GET_U_1(pptr + 1) != LACP_VERSION) { + ND_PRINT("LACP version %u packet not supported", + GET_U_1(pptr + 1)); return; } print_version = 1; @@ -271,9 +272,9 @@ slow_print(netdissect_options *ndo, case SLOW_PROTO_MARKER: if (len < 2) goto tooshort; - ND_TCHECK(*(pptr+1)); - if (*(pptr+1) != MARKER_VERSION) { - ND_PRINT((ndo, "MARKER version %u packet not supported", *(pptr+1))); + if (GET_U_1(pptr + 1) != MARKER_VERSION) { + ND_PRINT("MARKER version %u packet not supported", + GET_U_1(pptr + 1)); return; } print_version = 1; @@ -290,15 +291,15 @@ slow_print(netdissect_options *ndo, } if (print_version == 1) { - ND_PRINT((ndo, "%sv%u, length %u", + ND_PRINT("%sv%u, length %u", tok2str(slow_proto_values, "unknown (%u)", subtype), - *(pptr+1), - len)); + GET_U_1((pptr + 1)), + len); } else { /* some slow protos don't have a version number in the header */ - ND_PRINT((ndo, "%s, length %u", + ND_PRINT("%s, length %u", tok2str(slow_proto_values, "unknown (%u)", subtype), - len)); + len); } /* unrecognized subtype */ @@ -333,26 +334,19 @@ slow_print(netdissect_options *ndo, tooshort: if (!ndo->ndo_vflag) - ND_PRINT((ndo, " (packet is too short)")); - else - ND_PRINT((ndo, "\n\t\t packet is too short")); - return; - -trunc: - if (!ndo->ndo_vflag) - ND_PRINT((ndo, " (packet exceeded snapshot)")); + ND_PRINT(" (packet is too short)"); else - ND_PRINT((ndo, "\n\t\t packet exceeded snapshot")); + ND_PRINT("\n\t\t packet is too short"); } static void slow_marker_lacp_print(netdissect_options *ndo, - register const u_char *tptr, register u_int tlen, + const u_char *tptr, u_int tlen, u_int proto_subtype) { const struct tlv_header_t *tlv_header; const u_char *tlv_tptr; - u_int tlv_len, tlv_tlen; + u_int tlv_type, tlv_len, tlv_tlen; union { const struct lacp_marker_tlv_terminator_t *lacp_marker_tlv_terminator; @@ -366,18 +360,18 @@ slow_marker_lacp_print(netdissect_options *ndo, if (tlen < sizeof(struct tlv_header_t)) goto tooshort; /* did we capture enough for fully decoding the tlv header ? */ - ND_TCHECK2(*tptr, sizeof(struct tlv_header_t)); tlv_header = (const struct tlv_header_t *)tptr; - tlv_len = tlv_header->length; + tlv_type = GET_U_1(tlv_header->type); + tlv_len = GET_U_1(tlv_header->length); - ND_PRINT((ndo, "\n\t%s TLV (0x%02x), length %u", + ND_PRINT("\n\t%s TLV (0x%02x), length %u", tok2str(slow_tlv_values, "Unknown", - (proto_subtype << 8) + tlv_header->type), - tlv_header->type, - tlv_len)); + (proto_subtype << 8) + tlv_type), + tlv_type, + tlv_len); - if (tlv_header->type == LACP_MARKER_TLV_TERMINATOR) { + if (tlv_type == LACP_MARKER_TLV_TERMINATOR) { /* * This TLV has a length of zero, and means there are no * more TLVs to process. @@ -387,8 +381,8 @@ slow_marker_lacp_print(netdissect_options *ndo, /* length includes the type and length fields */ if (tlv_len < sizeof(struct tlv_header_t)) { - ND_PRINT((ndo, "\n\t ERROR: illegal length - should be >= %lu", - (unsigned long) sizeof(struct tlv_header_t))); + ND_PRINT("\n\t ERROR: illegal length - should be >= %zu", + sizeof(struct tlv_header_t)); return; } @@ -396,67 +390,67 @@ slow_marker_lacp_print(netdissect_options *ndo, if (tlen < tlv_len) goto tooshort; /* did we capture enough for fully decoding the tlv ? */ - ND_TCHECK2(*tptr, tlv_len); + ND_TCHECK_LEN(tptr, tlv_len); tlv_tptr=tptr+sizeof(struct tlv_header_t); tlv_tlen=tlv_len-sizeof(struct tlv_header_t); - switch((proto_subtype << 8) + tlv_header->type) { + switch((proto_subtype << 8) + tlv_type) { /* those two TLVs have the same structure -> fall through */ case ((SLOW_PROTO_LACP << 8) + LACP_TLV_ACTOR_INFO): case ((SLOW_PROTO_LACP << 8) + LACP_TLV_PARTNER_INFO): if (tlv_tlen != sizeof(struct lacp_tlv_actor_partner_info_t)) { - ND_PRINT((ndo, "\n\t ERROR: illegal length - should be %lu", - (unsigned long) (sizeof(struct tlv_header_t) + sizeof(struct lacp_tlv_actor_partner_info_t)))); + ND_PRINT("\n\t ERROR: illegal length - should be %zu", + sizeof(struct tlv_header_t) + sizeof(struct lacp_tlv_actor_partner_info_t)); goto badlength; } tlv_ptr.lacp_tlv_actor_partner_info = (const struct lacp_tlv_actor_partner_info_t *)tlv_tptr; - ND_PRINT((ndo, "\n\t System %s, System Priority %u, Key %u" \ + ND_PRINT("\n\t System %s, System Priority %u, Key %u" ", Port %u, Port Priority %u\n\t State Flags [%s]", - etheraddr_string(ndo, tlv_ptr.lacp_tlv_actor_partner_info->sys), - EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->sys_pri), - EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->key), - EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->port), - EXTRACT_16BITS(tlv_ptr.lacp_tlv_actor_partner_info->port_pri), + GET_ETHERADDR_STRING(tlv_ptr.lacp_tlv_actor_partner_info->sys), + GET_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->sys_pri), + GET_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->key), + GET_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->port), + GET_BE_U_2(tlv_ptr.lacp_tlv_actor_partner_info->port_pri), bittok2str(lacp_tlv_actor_partner_info_state_values, "none", - tlv_ptr.lacp_tlv_actor_partner_info->state))); + GET_U_1(tlv_ptr.lacp_tlv_actor_partner_info->state))); break; case ((SLOW_PROTO_LACP << 8) + LACP_TLV_COLLECTOR_INFO): if (tlv_tlen != sizeof(struct lacp_tlv_collector_info_t)) { - ND_PRINT((ndo, "\n\t ERROR: illegal length - should be %lu", - (unsigned long) (sizeof(struct tlv_header_t) + sizeof(struct lacp_tlv_collector_info_t)))); + ND_PRINT("\n\t ERROR: illegal length - should be %zu", + sizeof(struct tlv_header_t) + sizeof(struct lacp_tlv_collector_info_t)); goto badlength; } tlv_ptr.lacp_tlv_collector_info = (const struct lacp_tlv_collector_info_t *)tlv_tptr; - ND_PRINT((ndo, "\n\t Max Delay %u", - EXTRACT_16BITS(tlv_ptr.lacp_tlv_collector_info->max_delay))); + ND_PRINT("\n\t Max Delay %u", + GET_BE_U_2(tlv_ptr.lacp_tlv_collector_info->max_delay)); break; case ((SLOW_PROTO_MARKER << 8) + MARKER_TLV_MARKER_INFO): if (tlv_tlen != sizeof(struct marker_tlv_marker_info_t)) { - ND_PRINT((ndo, "\n\t ERROR: illegal length - should be %lu", - (unsigned long) (sizeof(struct tlv_header_t) + sizeof(struct marker_tlv_marker_info_t)))); + ND_PRINT("\n\t ERROR: illegal length - should be %zu", + sizeof(struct tlv_header_t) + sizeof(struct marker_tlv_marker_info_t)); goto badlength; } tlv_ptr.marker_tlv_marker_info = (const struct marker_tlv_marker_info_t *)tlv_tptr; - ND_PRINT((ndo, "\n\t Request System %s, Request Port %u, Request Transaction ID 0x%08x", - etheraddr_string(ndo, tlv_ptr.marker_tlv_marker_info->req_sys), - EXTRACT_16BITS(tlv_ptr.marker_tlv_marker_info->req_port), - EXTRACT_32BITS(tlv_ptr.marker_tlv_marker_info->req_trans_id))); + ND_PRINT("\n\t Request System %s, Request Port %u, Request Transaction ID 0x%08x", + GET_ETHERADDR_STRING(tlv_ptr.marker_tlv_marker_info->req_sys), + GET_BE_U_2(tlv_ptr.marker_tlv_marker_info->req_port), + GET_BE_U_4(tlv_ptr.marker_tlv_marker_info->req_trans_id)); break; @@ -479,27 +473,27 @@ slow_marker_lacp_print(netdissect_options *ndo, return; tooshort: - ND_PRINT((ndo, "\n\t\t packet is too short")); - return; - -trunc: - ND_PRINT((ndo, "\n\t\t packet exceeded snapshot")); + ND_PRINT("\n\t\t packet is too short"); } static void slow_oam_print(netdissect_options *ndo, - register const u_char *tptr, register u_int tlen) + const u_char *tptr, u_int tlen) { + uint8_t code; + uint8_t type, length; + uint8_t state; + uint8_t command; u_int hexdump; struct slow_oam_common_header_t { - uint8_t flags[2]; - uint8_t code; + nd_uint16_t flags; + nd_uint8_t code; }; struct slow_oam_tlv_header_t { - uint8_t type; - uint8_t length; + nd_uint8_t type; + nd_uint8_t length; }; union { @@ -508,7 +502,7 @@ slow_oam_print(netdissect_options *ndo, } ptr; union { - const struct slow_oam_info_t *slow_oam_info; + const struct slow_oam_info_t *slow_oam_info; const struct slow_oam_link_event_t *slow_oam_link_event; const struct slow_oam_variablerequest_t *slow_oam_variablerequest; const struct slow_oam_variableresponse_t *slow_oam_variableresponse; @@ -518,30 +512,32 @@ slow_oam_print(netdissect_options *ndo, ptr.slow_oam_common_header = (const struct slow_oam_common_header_t *)tptr; if (tlen < sizeof(*ptr.slow_oam_common_header)) goto tooshort; - ND_TCHECK(*ptr.slow_oam_common_header); + ND_TCHECK_SIZE(ptr.slow_oam_common_header); tptr += sizeof(struct slow_oam_common_header_t); tlen -= sizeof(struct slow_oam_common_header_t); - ND_PRINT((ndo, "\n\tCode %s OAM PDU, Flags [%s]", - tok2str(slow_oam_code_values, "Unknown (%u)", ptr.slow_oam_common_header->code), + code = GET_U_1(ptr.slow_oam_common_header->code); + ND_PRINT("\n\tCode %s OAM PDU, Flags [%s]", + tok2str(slow_oam_code_values, "Unknown (%u)", code), bittok2str(slow_oam_flag_values, "none", - EXTRACT_16BITS(&ptr.slow_oam_common_header->flags)))); + GET_BE_U_2(ptr.slow_oam_common_header->flags))); - switch (ptr.slow_oam_common_header->code) { + switch (code) { case SLOW_OAM_CODE_INFO: while (tlen > 0) { ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr; if (tlen < sizeof(*ptr.slow_oam_tlv_header)) goto tooshort; - ND_TCHECK(*ptr.slow_oam_tlv_header); - ND_PRINT((ndo, "\n\t %s Information Type (%u), length %u", - tok2str(slow_oam_info_type_values, "Reserved", - ptr.slow_oam_tlv_header->type), - ptr.slow_oam_tlv_header->type, - ptr.slow_oam_tlv_header->length)); - - if (ptr.slow_oam_tlv_header->type == SLOW_OAM_INFO_TYPE_END_OF_TLV) { + ND_TCHECK_SIZE(ptr.slow_oam_tlv_header); + type = GET_U_1(ptr.slow_oam_tlv_header->type); + length = GET_U_1(ptr.slow_oam_tlv_header->length); + ND_PRINT("\n\t %s Information Type (%u), length %u", + tok2str(slow_oam_info_type_values, "Reserved", type), + type, + length); + + if (type == SLOW_OAM_INFO_TYPE_END_OF_TLV) { /* * As IEEE Std 802.3-2015 says for the End of TLV Marker, * "(the length and value of the Type 0x00 TLV can be ignored)". @@ -550,49 +546,50 @@ slow_oam_print(netdissect_options *ndo, } /* length includes the type and length fields */ - if (ptr.slow_oam_tlv_header->length < sizeof(struct slow_oam_tlv_header_t)) { - ND_PRINT((ndo, "\n\t ERROR: illegal length - should be >= %u", - (u_int)sizeof(struct slow_oam_tlv_header_t))); + if (length < sizeof(struct slow_oam_tlv_header_t)) { + ND_PRINT("\n\t ERROR: illegal length - should be >= %zu", + sizeof(struct slow_oam_tlv_header_t)); return; } - if (tlen < ptr.slow_oam_tlv_header->length) + if (tlen < length) goto tooshort; - ND_TCHECK2(*tptr, ptr.slow_oam_tlv_header->length); + ND_TCHECK_LEN(tptr, length); hexdump = FALSE; - switch (ptr.slow_oam_tlv_header->type) { + switch (type) { case SLOW_OAM_INFO_TYPE_LOCAL: /* identical format - fall through */ case SLOW_OAM_INFO_TYPE_REMOTE: tlv.slow_oam_info = (const struct slow_oam_info_t *)tptr; - if (tlv.slow_oam_info->info_length != + if (GET_U_1(tlv.slow_oam_info->info_length) != sizeof(struct slow_oam_info_t)) { - ND_PRINT((ndo, "\n\t ERROR: illegal length - should be %lu", - (unsigned long) sizeof(struct slow_oam_info_t))); + ND_PRINT("\n\t ERROR: illegal length - should be %zu", + sizeof(struct slow_oam_info_t)); hexdump = TRUE; goto badlength_code_info; } - ND_PRINT((ndo, "\n\t OAM-Version %u, Revision %u", - tlv.slow_oam_info->oam_version, - EXTRACT_16BITS(&tlv.slow_oam_info->revision))); + ND_PRINT("\n\t OAM-Version %u, Revision %u", + GET_U_1(tlv.slow_oam_info->oam_version), + GET_BE_U_2(tlv.slow_oam_info->revision)); - ND_PRINT((ndo, "\n\t State-Parser-Action %s, State-MUX-Action %s", + state = GET_U_1(tlv.slow_oam_info->state); + ND_PRINT("\n\t State-Parser-Action %s, State-MUX-Action %s", tok2str(slow_oam_info_type_state_parser_values, "Reserved", - tlv.slow_oam_info->state & OAM_INFO_TYPE_PARSER_MASK), + state & OAM_INFO_TYPE_PARSER_MASK), tok2str(slow_oam_info_type_state_mux_values, "Reserved", - tlv.slow_oam_info->state & OAM_INFO_TYPE_MUX_MASK))); - ND_PRINT((ndo, "\n\t OAM-Config Flags [%s], OAM-PDU-Config max-PDU size %u", + state & OAM_INFO_TYPE_MUX_MASK)); + ND_PRINT("\n\t OAM-Config Flags [%s], OAM-PDU-Config max-PDU size %u", bittok2str(slow_oam_info_type_oam_config_values, "none", - tlv.slow_oam_info->oam_config), - EXTRACT_16BITS(&tlv.slow_oam_info->oam_pdu_config) & - OAM_INFO_TYPE_PDU_SIZE_MASK)); - ND_PRINT((ndo, "\n\t OUI %s (0x%06x), Vendor-Private 0x%08x", + GET_U_1(tlv.slow_oam_info->oam_config)), + GET_BE_U_2(tlv.slow_oam_info->oam_pdu_config) & + OAM_INFO_TYPE_PDU_SIZE_MASK); + ND_PRINT("\n\t OUI %s (0x%06x), Vendor-Private 0x%08x", tok2str(oui_values, "Unknown", - EXTRACT_24BITS(&tlv.slow_oam_info->oui)), - EXTRACT_24BITS(&tlv.slow_oam_info->oui), - EXTRACT_32BITS(&tlv.slow_oam_info->vendor_private))); + GET_BE_U_3(tlv.slow_oam_info->oui)), + GET_BE_U_3(tlv.slow_oam_info->oui), + GET_BE_U_4(tlv.slow_oam_info->vendor_private)); break; case SLOW_OAM_INFO_TYPE_ORG_SPECIFIC: @@ -608,11 +605,11 @@ slow_oam_print(netdissect_options *ndo, /* do we also want to see a hex dump ? */ if (ndo->ndo_vflag > 1 || hexdump==TRUE) { print_unknown_data(ndo, tptr, "\n\t ", - ptr.slow_oam_tlv_header->length); + length); } - tlen -= ptr.slow_oam_tlv_header->length; - tptr += ptr.slow_oam_tlv_header->length; + tlen -= length; + tptr += length; } break; @@ -620,8 +617,7 @@ slow_oam_print(netdissect_options *ndo, /* Sequence number */ if (tlen < 2) goto tooshort; - ND_TCHECK2(*tptr, 2); - ND_PRINT((ndo, "\n\t Sequence Number %u", EXTRACT_16BITS(tptr))); + ND_PRINT("\n\t Sequence Number %u", GET_BE_U_2(tptr)); tlen -= 2; tptr += 2; @@ -630,14 +626,15 @@ slow_oam_print(netdissect_options *ndo, ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr; if (tlen < sizeof(*ptr.slow_oam_tlv_header)) goto tooshort; - ND_TCHECK(*ptr.slow_oam_tlv_header); - ND_PRINT((ndo, "\n\t %s Link Event Type (%u), length %u", + type = GET_U_1(ptr.slow_oam_tlv_header->type); + length = GET_U_1(ptr.slow_oam_tlv_header->length); + ND_PRINT("\n\t %s Link Event Type (%u), length %u", tok2str(slow_oam_link_event_values, "Reserved", - ptr.slow_oam_tlv_header->type), - ptr.slow_oam_tlv_header->type, - ptr.slow_oam_tlv_header->length)); + type), + type, + length); - if (ptr.slow_oam_tlv_header->type == SLOW_OAM_INFO_TYPE_END_OF_TLV) { + if (type == SLOW_OAM_INFO_TYPE_END_OF_TLV) { /* * As IEEE Std 802.3-2015 says for the End of TLV Marker, * "(the length and value of the Type 0x00 TLV can be ignored)". @@ -646,43 +643,43 @@ slow_oam_print(netdissect_options *ndo, } /* length includes the type and length fields */ - if (ptr.slow_oam_tlv_header->length < sizeof(struct slow_oam_tlv_header_t)) { - ND_PRINT((ndo, "\n\t ERROR: illegal length - should be >= %u", - (u_int)sizeof(struct slow_oam_tlv_header_t))); + if (length < sizeof(struct slow_oam_tlv_header_t)) { + ND_PRINT("\n\t ERROR: illegal length - should be >= %zu", + sizeof(struct slow_oam_tlv_header_t)); return; } - if (tlen < ptr.slow_oam_tlv_header->length) + if (tlen < length) goto tooshort; - ND_TCHECK2(*tptr, ptr.slow_oam_tlv_header->length); + ND_TCHECK_LEN(tptr, length); hexdump = FALSE; - switch (ptr.slow_oam_tlv_header->type) { + switch (type) { case SLOW_OAM_LINK_EVENT_ERR_SYM_PER: /* identical format - fall through */ case SLOW_OAM_LINK_EVENT_ERR_FRM: case SLOW_OAM_LINK_EVENT_ERR_FRM_PER: case SLOW_OAM_LINK_EVENT_ERR_FRM_SUMM: tlv.slow_oam_link_event = (const struct slow_oam_link_event_t *)tptr; - if (tlv.slow_oam_link_event->event_length != + if (GET_U_1(tlv.slow_oam_link_event->event_length) != sizeof(struct slow_oam_link_event_t)) { - ND_PRINT((ndo, "\n\t ERROR: illegal length - should be %lu", - (unsigned long) sizeof(struct slow_oam_link_event_t))); + ND_PRINT("\n\t ERROR: illegal length - should be %zu", + sizeof(struct slow_oam_link_event_t)); hexdump = TRUE; goto badlength_event_notif; } - ND_PRINT((ndo, "\n\t Timestamp %u ms, Errored Window %" PRIu64 + ND_PRINT("\n\t Timestamp %u ms, Errored Window %" PRIu64 "\n\t Errored Threshold %" PRIu64 "\n\t Errors %" PRIu64 "\n\t Error Running Total %" PRIu64 "\n\t Event Running Total %u", - EXTRACT_16BITS(&tlv.slow_oam_link_event->time_stamp)*100, - EXTRACT_64BITS(&tlv.slow_oam_link_event->window), - EXTRACT_64BITS(&tlv.slow_oam_link_event->threshold), - EXTRACT_64BITS(&tlv.slow_oam_link_event->errors), - EXTRACT_64BITS(&tlv.slow_oam_link_event->errors_running_total), - EXTRACT_32BITS(&tlv.slow_oam_link_event->event_running_total))); + GET_BE_U_2(tlv.slow_oam_link_event->time_stamp)*100, + GET_BE_U_8(tlv.slow_oam_link_event->window), + GET_BE_U_8(tlv.slow_oam_link_event->threshold), + GET_BE_U_8(tlv.slow_oam_link_event->errors), + GET_BE_U_8(tlv.slow_oam_link_event->errors_running_total), + GET_BE_U_4(tlv.slow_oam_link_event->event_running_total)); break; case SLOW_OAM_LINK_EVENT_ORG_SPECIFIC: @@ -698,11 +695,11 @@ slow_oam_print(netdissect_options *ndo, /* do we also want to see a hex dump ? */ if (ndo->ndo_vflag > 1 || hexdump==TRUE) { print_unknown_data(ndo, tptr, "\n\t ", - ptr.slow_oam_tlv_header->length); + length); } - tlen -= ptr.slow_oam_tlv_header->length; - tptr += ptr.slow_oam_tlv_header->length; + tlen -= length; + tptr += length; } break; @@ -710,12 +707,12 @@ slow_oam_print(netdissect_options *ndo, tlv.slow_oam_loopbackctrl = (const struct slow_oam_loopbackctrl_t *)tptr; if (tlen < sizeof(*tlv.slow_oam_loopbackctrl)) goto tooshort; - ND_TCHECK(*tlv.slow_oam_loopbackctrl); - ND_PRINT((ndo, "\n\t Command %s (%u)", + command = GET_U_1(tlv.slow_oam_loopbackctrl->command); + ND_PRINT("\n\t Command %s (%u)", tok2str(slow_oam_loopbackctrl_cmd_values, "Unknown", - tlv.slow_oam_loopbackctrl->command), - tlv.slow_oam_loopbackctrl->command)); + command), + command); tptr ++; tlen --; break; @@ -736,9 +733,5 @@ slow_oam_print(netdissect_options *ndo, return; tooshort: - ND_PRINT((ndo, "\n\t\t packet is too short")); - return; - -trunc: - ND_PRINT((ndo, "\n\t\t packet exceeded snapshot")); + ND_PRINT("\n\t\t packet is too short"); } |