X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/9bdbb51f4122817ca8bdba9fb9917969809ff451..febd0bc5aa33b3de9b5864e8c5565fe7b63f519f:/print-slow.c diff --git a/print-slow.c b/print-slow.c index 9da02ffa..d1484790 100644 --- a/print-slow.c +++ b/print-slow.c @@ -15,35 +15,23 @@ * support for the IEEE "slow protocols" LACP, MARKER as per 802.3ad * OAM as per 802.3ah * - * Original code by Hannes Gredler (hannes@juniper.net) + * Original code by Hannes Gredler (hannes@gredler.at) */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-slow.c,v 1.7 2006-08-19 06:59:17 guy Exp $"; -#endif +/* \summary: IEEE "slow protocols" (802.3ad/802.3ah) printer */ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include - -#include -#include -#include +#include -#include "interface.h" +#include "netdissect.h" #include "extract.h" #include "addrtoname.h" #include "ether.h" #include "oui.h" -struct slow_common_header_t { - u_int8_t proto_subtype; - u_int8_t version; -}; - #define SLOW_PROTO_LACP 1 #define SLOW_PROTO_MARKER 2 #define SLOW_PROTO_OAM 3 @@ -67,7 +55,7 @@ static const struct tok slow_oam_flag_values[] = { { 0x0020, "Remote Evaluating" }, { 0x0040, "Remote Stable" }, { 0, NULL} -}; +}; #define SLOW_OAM_CODE_INFO 0x00 #define SLOW_OAM_CODE_EVENT_NOTIF 0x01 @@ -87,15 +75,15 @@ static const struct tok slow_oam_code_values[] = { }; struct slow_oam_info_t { - u_int8_t info_type; - u_int8_t info_length; - u_int8_t oam_version; - u_int8_t revision[2]; - u_int8_t state; - u_int8_t oam_config; - u_int8_t oam_pdu_config[2]; - u_int8_t oui[3]; - u_int8_t vendor_private[4]; + 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]; }; #define SLOW_OAM_INFO_TYPE_END_OF_TLV 0x00 @@ -157,25 +145,29 @@ static const struct tok slow_oam_link_event_values[] = { }; struct slow_oam_link_event_t { - u_int8_t event_type; - u_int8_t event_length; - u_int8_t time_stamp[2]; - u_int8_t window[8]; - u_int8_t threshold[8]; - u_int8_t errors[8]; - u_int8_t errors_running_total[8]; - u_int8_t event_running_total[4]; + 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]; }; struct slow_oam_variablerequest_t { - u_int8_t branch; - u_int8_t leaf[2]; + uint8_t branch; + uint8_t leaf[2]; }; struct slow_oam_variableresponse_t { - u_int8_t branch; - u_int8_t leaf[2]; - u_int8_t length; + uint8_t branch; + uint8_t leaf[2]; + uint8_t length; +}; + +struct slow_oam_loopbackctrl_t { + uint8_t command; }; static const struct tok slow_oam_loopbackctrl_cmd_values[] = { @@ -185,38 +177,38 @@ static const struct tok slow_oam_loopbackctrl_cmd_values[] = { }; struct tlv_header_t { - u_int8_t type; - u_int8_t length; + uint8_t type; + uint8_t length; }; -#define LACP_TLV_TERMINATOR 0x00 -#define LACP_TLV_ACTOR_INFO 0x01 -#define LACP_TLV_PARTNER_INFO 0x02 -#define LACP_TLV_COLLECTOR_INFO 0x03 +#define LACP_MARKER_TLV_TERMINATOR 0x00 /* same code for LACP and Marker */ + +#define LACP_TLV_ACTOR_INFO 0x01 +#define LACP_TLV_PARTNER_INFO 0x02 +#define LACP_TLV_COLLECTOR_INFO 0x03 -#define MARKER_TLV_TERMINATOR 0x00 -#define MARKER_TLV_MARKER_INFO 0x01 +#define MARKER_TLV_MARKER_INFO 0x01 static const struct tok slow_tlv_values[] = { - { (SLOW_PROTO_LACP << 8) + LACP_TLV_TERMINATOR, "Terminator"}, + { (SLOW_PROTO_LACP << 8) + LACP_MARKER_TLV_TERMINATOR, "Terminator"}, { (SLOW_PROTO_LACP << 8) + LACP_TLV_ACTOR_INFO, "Actor Information"}, { (SLOW_PROTO_LACP << 8) + LACP_TLV_PARTNER_INFO, "Partner Information"}, { (SLOW_PROTO_LACP << 8) + LACP_TLV_COLLECTOR_INFO, "Collector Information"}, - { (SLOW_PROTO_MARKER << 8) + MARKER_TLV_TERMINATOR, "Terminator"}, + { (SLOW_PROTO_MARKER << 8) + LACP_MARKER_TLV_TERMINATOR, "Terminator"}, { (SLOW_PROTO_MARKER << 8) + MARKER_TLV_MARKER_INFO, "Marker Information"}, { 0, NULL} }; struct lacp_tlv_actor_partner_info_t { - u_int8_t sys_pri[2]; - u_int8_t sys[ETHER_ADDR_LEN]; - u_int8_t key[2]; - u_int8_t port_pri[2]; - u_int8_t port[2]; - u_int8_t state; - u_int8_t pad[3]; -}; + 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]; +}; static const struct tok lacp_tlv_actor_partner_info_state_values[] = { { 0x01, "Activity"}, @@ -231,49 +223,57 @@ static const struct tok lacp_tlv_actor_partner_info_state_values[] = { }; struct lacp_tlv_collector_info_t { - u_int8_t max_delay[2]; - u_int8_t pad[12]; -}; + uint8_t max_delay[2]; + uint8_t pad[12]; +}; struct marker_tlv_marker_info_t { - u_int8_t req_port[2]; - u_int8_t req_sys[ETHER_ADDR_LEN]; - u_int8_t req_trans_id[4]; - u_int8_t pad[2]; -}; + uint8_t req_port[2]; + uint8_t req_sys[ETHER_ADDR_LEN]; + uint8_t req_trans_id[4]; + uint8_t pad[2]; +}; struct lacp_marker_tlv_terminator_t { - u_int8_t pad[50]; -}; - -void slow_marker_lacp_print(register const u_char *, register u_int); -void slow_oam_print(register const u_char *, register u_int); + uint8_t pad[50]; +}; -const struct slow_common_header_t *slow_com_header; +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); void -slow_print(register const u_char *pptr, register u_int len) { - +slow_print(netdissect_options *ndo, + register const u_char *pptr, register u_int len) +{ int print_version; + u_int subtype; - slow_com_header = (const struct slow_common_header_t *)pptr; - TCHECK(*slow_com_header); + if (len < 1) + goto tooshort; + ND_TCHECK(*pptr); + subtype = *pptr; /* * Sanity checking of the header. */ - switch (slow_com_header->proto_subtype) { + switch (subtype) { case SLOW_PROTO_LACP: - if (slow_com_header->version != LACP_VERSION) { - printf("LACP version %u packet not supported",slow_com_header->version); + 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))); return; } print_version = 1; break; case SLOW_PROTO_MARKER: - if (slow_com_header->version != MARKER_VERSION) { - printf("MARKER version %u packet not supported",slow_com_header->version); + 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))); return; } print_version = 1; @@ -289,52 +289,67 @@ slow_print(register const u_char *pptr, register u_int len) { break; } - if (print_version) { - printf("%sv%u, length %u", - tok2str(slow_proto_values, "unknown (%u)",slow_com_header->proto_subtype), - slow_com_header->version, - len); + if (print_version == 1) { + ND_PRINT((ndo, "%sv%u, length %u", + tok2str(slow_proto_values, "unknown (%u)", subtype), + *(pptr+1), + len)); } else { /* some slow protos don't have a version number in the header */ - printf("%s, length %u", - tok2str(slow_proto_values, "unknown (%u)",slow_com_header->proto_subtype), - len); + ND_PRINT((ndo, "%s, length %u", + tok2str(slow_proto_values, "unknown (%u)", subtype), + len)); } /* unrecognized subtype */ if (print_version == -1) { - print_unknown_data(pptr, "\n\t", len); + print_unknown_data(ndo, pptr, "\n\t", len); return; } - if (!vflag) + if (!ndo->ndo_vflag) return; - switch (slow_com_header->proto_subtype) { + switch (subtype) { default: /* should not happen */ break; case SLOW_PROTO_OAM: - /* skip proto_subtype */ - slow_oam_print(pptr+1, len-1); + /* skip subtype */ + len -= 1; + pptr += 1; + slow_oam_print(ndo, pptr, len); break; case SLOW_PROTO_LACP: /* LACP and MARKER share the same semantics */ case SLOW_PROTO_MARKER: - /* skip slow_common_header */ - len -= sizeof(const struct slow_common_header_t); - pptr += sizeof(const struct slow_common_header_t); - slow_marker_lacp_print(pptr, len); + /* skip subtype and version */ + len -= 2; + pptr += 2; + slow_marker_lacp_print(ndo, pptr, len, subtype); break; } return; +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: - printf("\n\t\t packet exceeded snapshot"); + if (!ndo->ndo_vflag) + ND_PRINT((ndo, " (packet exceeded snapshot)")); + else + ND_PRINT((ndo, "\n\t\t packet exceeded snapshot")); } -void slow_marker_lacp_print(register const u_char *tptr, register u_int tlen) { - +static void +slow_marker_lacp_print(netdissect_options *ndo, + register const u_char *tptr, register 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; @@ -345,99 +360,116 @@ void slow_marker_lacp_print(register const u_char *tptr, register u_int tlen) { const struct lacp_tlv_collector_info_t *lacp_tlv_collector_info; const struct marker_tlv_marker_info_t *marker_tlv_marker_info; } tlv_ptr; - + while(tlen>0) { + /* is the packet big enough to include the tlv header ? */ + if (tlen < sizeof(struct tlv_header_t)) + goto tooshort; /* did we capture enough for fully decoding the tlv header ? */ - TCHECK2(*tptr, sizeof(struct tlv_header_t)); + ND_TCHECK2(*tptr, sizeof(struct tlv_header_t)); tlv_header = (const struct tlv_header_t *)tptr; tlv_len = tlv_header->length; - printf("\n\t%s TLV (0x%02x), length %u", + ND_PRINT((ndo, "\n\t%s TLV (0x%02x), length %u", tok2str(slow_tlv_values, "Unknown", - (slow_com_header->proto_subtype << 8) + tlv_header->type), + (proto_subtype << 8) + tlv_header->type), tlv_header->type, - tlv_len); - - if ((tlv_len < sizeof(struct tlv_header_t) || - tlv_len > tlen) && - tlv_header->type != LACP_TLV_TERMINATOR && - tlv_header->type != MARKER_TLV_TERMINATOR) { - printf("\n\t-----trailing data-----"); - print_unknown_data(tptr+sizeof(sizeof(struct tlv_header_t)),"\n\t ",tlen); + tlv_len)); + + if (tlv_header->type == LACP_MARKER_TLV_TERMINATOR) { + /* + * This TLV has a length of zero, and means there are no + * more TLVs to process. + */ return; } - tlv_tptr=tptr+sizeof(struct tlv_header_t); - tlv_tlen=tlv_len-sizeof(struct tlv_header_t); + /* 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))); + return; + } + /* is the packet big enough to include the tlv ? */ + if (tlen < tlv_len) + goto tooshort; /* did we capture enough for fully decoding the tlv ? */ - TCHECK2(*tptr, tlv_len); + ND_TCHECK2(*tptr, tlv_len); + + tlv_tptr=tptr+sizeof(struct tlv_header_t); + tlv_tlen=tlv_len-sizeof(struct tlv_header_t); - switch((slow_com_header->proto_subtype << 8) + tlv_header->type) { + switch((proto_subtype << 8) + tlv_header->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)))); + goto badlength; + } + tlv_ptr.lacp_tlv_actor_partner_info = (const struct lacp_tlv_actor_partner_info_t *)tlv_tptr; - printf("\n\t System %s, System Priority %u, Key %u" \ + ND_PRINT((ndo, "\n\t System %s, System Priority %u, Key %u" \ ", Port %u, Port Priority %u\n\t State Flags [%s]", - etheraddr_string(tlv_ptr.lacp_tlv_actor_partner_info->sys), + 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), bittok2str(lacp_tlv_actor_partner_info_state_values, "none", - tlv_ptr.lacp_tlv_actor_partner_info->state)); + 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)))); + goto badlength; + } + tlv_ptr.lacp_tlv_collector_info = (const struct lacp_tlv_collector_info_t *)tlv_tptr; - printf("\n\t Max Delay %u", - EXTRACT_16BITS(tlv_ptr.lacp_tlv_collector_info->max_delay)); + ND_PRINT((ndo, "\n\t Max Delay %u", + EXTRACT_16BITS(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)))); + goto badlength; + } + tlv_ptr.marker_tlv_marker_info = (const struct marker_tlv_marker_info_t *)tlv_tptr; - printf("\n\t Request System %s, Request Port %u, Request Transaction ID 0x%08x", - etheraddr_string(tlv_ptr.marker_tlv_marker_info->req_sys), + 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)); - - break; - - /* those two TLVs have the same structure -> fall through */ - case ((SLOW_PROTO_LACP << 8) + LACP_TLV_TERMINATOR): - case ((SLOW_PROTO_MARKER << 8) + LACP_TLV_TERMINATOR): - tlv_ptr.lacp_marker_tlv_terminator = (const struct lacp_marker_tlv_terminator_t *)tlv_tptr; - if (tlv_len == 0) { - tlv_len = sizeof(tlv_ptr.lacp_marker_tlv_terminator->pad) + - sizeof(struct tlv_header_t); - /* tell the user that we modified the length field */ - if (vflag>1) - printf(" (=%u)",tlv_len); - /* we have messed around with the length field - now we need to check - * again if there are enough bytes on the wire for the hexdump */ - TCHECK2(tlv_ptr.lacp_marker_tlv_terminator->pad[0], - sizeof(tlv_ptr.lacp_marker_tlv_terminator->pad)); - } + EXTRACT_32BITS(tlv_ptr.marker_tlv_marker_info->req_trans_id))); break; default: - if (vflag <= 1) - print_unknown_data(tlv_tptr,"\n\t ",tlv_tlen); + if (ndo->ndo_vflag <= 1) + print_unknown_data(ndo, tlv_tptr, "\n\t ", tlv_tlen); break; } + + badlength: /* do we want to see an additional hexdump ? */ - if (vflag > 1) { - print_unknown_data(tptr+sizeof(sizeof(struct tlv_header_t)),"\n\t ", + if (ndo->ndo_vflag > 1) { + print_unknown_data(ndo, tptr+sizeof(struct tlv_header_t), "\n\t ", tlv_len-sizeof(struct tlv_header_t)); } @@ -445,22 +477,29 @@ void slow_marker_lacp_print(register const u_char *tptr, register u_int tlen) { tlen-=tlv_len; } return; + +tooshort: + ND_PRINT((ndo, "\n\t\t packet is too short")); + return; + trunc: - printf("\n\t\t packet exceeded snapshot"); + ND_PRINT((ndo, "\n\t\t packet exceeded snapshot")); } -void slow_oam_print(register const u_char *tptr, register u_int tlen) { - +static void +slow_oam_print(netdissect_options *ndo, + register const u_char *tptr, register u_int tlen) +{ u_int hexdump; struct slow_oam_common_header_t { - u_int8_t flags[2]; - u_int8_t code; + uint8_t flags[2]; + uint8_t code; }; struct slow_oam_tlv_header_t { - u_int8_t type; - u_int8_t length; + uint8_t type; + uint8_t length; }; union { @@ -473,85 +512,102 @@ void slow_oam_print(register const u_char *tptr, register u_int tlen) { 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; + const struct slow_oam_loopbackctrl_t *slow_oam_loopbackctrl; } tlv; - - ptr.slow_oam_common_header = (struct slow_oam_common_header_t *)tptr; + + 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); tptr += sizeof(struct slow_oam_common_header_t); tlen -= sizeof(struct slow_oam_common_header_t); - printf("\n\tCode %s OAM PDU, Flags [%s]", + ND_PRINT((ndo, "\n\tCode %s OAM PDU, Flags [%s]", tok2str(slow_oam_code_values, "Unknown (%u)", ptr.slow_oam_common_header->code), bittok2str(slow_oam_flag_values, "none", - EXTRACT_16BITS(&ptr.slow_oam_common_header->flags))); + EXTRACT_16BITS(&ptr.slow_oam_common_header->flags)))); switch (ptr.slow_oam_common_header->code) { case SLOW_OAM_CODE_INFO: while (tlen > 0) { ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr; - printf("\n\t %s Information Type (%u), length %u", + 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); + ptr.slow_oam_tlv_header->length)); + + if (ptr.slow_oam_tlv_header->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)". + */ + return; + } + + /* 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))); + return; + } + + if (tlen < ptr.slow_oam_tlv_header->length) + goto tooshort; + ND_TCHECK2(*tptr, ptr.slow_oam_tlv_header->length); hexdump = FALSE; switch (ptr.slow_oam_tlv_header->type) { - case SLOW_OAM_INFO_TYPE_END_OF_TLV: - if (ptr.slow_oam_tlv_header->length != 0) { - printf("\n\t ERROR: illegal length - should be 0"); - } - return; - 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 != sizeof(struct slow_oam_info_t)) { - printf("\n\t ERROR: illegal length - should be %lu", - (unsigned long) sizeof(struct slow_oam_info_t)); - return; + ND_PRINT((ndo, "\n\t ERROR: illegal length - should be %lu", + (unsigned long) sizeof(struct slow_oam_info_t))); + hexdump = TRUE; + goto badlength_code_info; } - printf("\n\t OAM-Version %u, Revision %u", + ND_PRINT((ndo, "\n\t OAM-Version %u, Revision %u", tlv.slow_oam_info->oam_version, - EXTRACT_16BITS(&tlv.slow_oam_info->revision)); + EXTRACT_16BITS(&tlv.slow_oam_info->revision))); - printf("\n\t State-Parser-Action %s, State-MUX-Action %s", + ND_PRINT((ndo, "\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), tok2str(slow_oam_info_type_state_mux_values, "Reserved", - tlv.slow_oam_info->state & OAM_INFO_TYPE_MUX_MASK)); - printf("\n\t OAM-Config Flags [%s], OAM-PDU-Config max-PDU size %u", + 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", 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); - printf("\n\t OUI %s (0x%06x), Vendor-Private 0x%08x", + OAM_INFO_TYPE_PDU_SIZE_MASK)); + ND_PRINT((ndo, "\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)); + EXTRACT_32BITS(&tlv.slow_oam_info->vendor_private))); break; - + case SLOW_OAM_INFO_TYPE_ORG_SPECIFIC: hexdump = TRUE; break; - + default: hexdump = TRUE; break; } - /* infinite loop check */ - if (!ptr.slow_oam_tlv_header->length) { - return; - } - + badlength_code_info: /* do we also want to see a hex dump ? */ - if (vflag > 1 || hexdump==TRUE) { - print_unknown_data(tptr,"\n\t ", + if (ndo->ndo_vflag > 1 || hexdump==TRUE) { + print_unknown_data(ndo, tptr, "\n\t ", ptr.slow_oam_tlv_header->length); } @@ -561,36 +617,62 @@ void slow_oam_print(register const u_char *tptr, register u_int tlen) { break; case SLOW_OAM_CODE_EVENT_NOTIF: + /* Sequence number */ + if (tlen < 2) + goto tooshort; + ND_TCHECK2(*tptr, 2); + ND_PRINT((ndo, "\n\t Sequence Number %u", EXTRACT_16BITS(tptr))); + tlen -= 2; + tptr += 2; + + /* TLVs */ while (tlen > 0) { ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr; - printf("\n\t %s Link Event Type (%u), length %u", + 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", 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); + ptr.slow_oam_tlv_header->length)); + + if (ptr.slow_oam_tlv_header->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)". + */ + return; + } + + /* 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))); + return; + } + + if (tlen < ptr.slow_oam_tlv_header->length) + goto tooshort; + ND_TCHECK2(*tptr, ptr.slow_oam_tlv_header->length); hexdump = FALSE; switch (ptr.slow_oam_tlv_header->type) { - case SLOW_OAM_LINK_EVENT_END_OF_TLV: - if (ptr.slow_oam_tlv_header->length != 0) { - printf("\n\t ERROR: illegal length - should be 0"); - } - return; - 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 != sizeof(struct slow_oam_link_event_t)) { - printf("\n\t ERROR: illegal length - should be %lu", - (unsigned long) sizeof(struct slow_oam_link_event_t)); - return; + ND_PRINT((ndo, "\n\t ERROR: illegal length - should be %lu", + (unsigned long) sizeof(struct slow_oam_link_event_t))); + hexdump = TRUE; + goto badlength_event_notif; } - printf("\n\t Timestamp %u ms, Errored Window %" PRIu64 + ND_PRINT((ndo, "\n\t Timestamp %u ms, Errored Window %" PRIu64 "\n\t Errored Threshold %" PRIu64 "\n\t Errors %" PRIu64 "\n\t Error Running Total %" PRIu64 @@ -600,26 +682,22 @@ void slow_oam_print(register const u_char *tptr, register u_int tlen) { 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)); + EXTRACT_32BITS(&tlv.slow_oam_link_event->event_running_total))); break; - + case SLOW_OAM_LINK_EVENT_ORG_SPECIFIC: hexdump = TRUE; break; - + default: hexdump = TRUE; break; } - /* infinite loop check */ - if (!ptr.slow_oam_tlv_header->length) { - return; - } - + badlength_event_notif: /* do we also want to see a hex dump ? */ - if (vflag > 1 || hexdump==TRUE) { - print_unknown_data(tptr,"\n\t ", + if (ndo->ndo_vflag > 1 || hexdump==TRUE) { + print_unknown_data(ndo, tptr, "\n\t ", ptr.slow_oam_tlv_header->length); } @@ -628,19 +706,39 @@ void slow_oam_print(register const u_char *tptr, register u_int tlen) { } break; + case SLOW_OAM_CODE_LOOPBACK_CTRL: + 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)", + tok2str(slow_oam_loopbackctrl_cmd_values, + "Unknown", + tlv.slow_oam_loopbackctrl->command), + tlv.slow_oam_loopbackctrl->command)); + tptr ++; + tlen --; + break; + /* * FIXME those are the defined codes that lack a decoder * you are welcome to contribute code ;-) */ case SLOW_OAM_CODE_VAR_REQUEST: case SLOW_OAM_CODE_VAR_RESPONSE: - case SLOW_OAM_CODE_LOOPBACK_CTRL: case SLOW_OAM_CODE_PRIVATE: default: - if (vflag <= 1) { - print_unknown_data(tptr,"\n\t ", tlen); + if (ndo->ndo_vflag <= 1) { + print_unknown_data(ndo, tptr, "\n\t ", tlen); } break; } return; + +tooshort: + ND_PRINT((ndo, "\n\t\t packet is too short")); + return; + +trunc: + ND_PRINT((ndo, "\n\t\t packet exceeded snapshot")); }