diff options
Diffstat (limited to 'contrib/tcpdump/print-sflow.c')
| -rw-r--r-- | contrib/tcpdump/print-sflow.c | 68 |
1 files changed, 59 insertions, 9 deletions
diff --git a/contrib/tcpdump/print-sflow.c b/contrib/tcpdump/print-sflow.c index 24112f4..37a41b5 100644 --- a/contrib/tcpdump/print-sflow.c +++ b/contrib/tcpdump/print-sflow.c @@ -12,21 +12,22 @@ * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS * FOR A PARTICULAR PURPOSE. * - * The SFLOW protocol as per http://www.sflow.org/developers/specifications.php - * * Original code by Carles Kishimoto <carles.kishimoto@gmail.com> * * Expansion and refactoring by Rick Jones <rick.jones2@hp.com> */ -#define NETDISSECT_REWORKED +/* \summary: sFlow protocol printer */ + +/* specification: http://www.sflow.org/developers/specifications.php */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include <tcpdump-stdinc.h> +#include <netdissect-stdinc.h> -#include "interface.h" +#include "netdissect.h" #include "extract.h" #include "addrtoname.h" @@ -304,8 +305,8 @@ print_sflow_counter_generic(netdissect_options *ndo, if (len < sizeof(struct sflow_generic_counter_t)) return 1; - sflow_gen_counter = (const struct sflow_generic_counter_t *)pointer; + ND_TCHECK(*sflow_gen_counter); ND_PRINT((ndo, "\n\t ifindex %u, iftype %u, ifspeed %" PRIu64 ", ifdirection %u (%s)", EXTRACT_32BITS(sflow_gen_counter->ifindex), EXTRACT_32BITS(sflow_gen_counter->iftype), @@ -339,6 +340,9 @@ print_sflow_counter_generic(netdissect_options *ndo, EXTRACT_32BITS(sflow_gen_counter->ifpromiscmode))); return 0; + +trunc: + return 1; } static int @@ -351,6 +355,7 @@ print_sflow_counter_ethernet(netdissect_options *ndo, return 1; sflow_eth_counter = (const struct sflow_ethernet_counter_t *)pointer; + ND_TCHECK(*sflow_eth_counter); ND_PRINT((ndo, "\n\t align errors %u, fcs errors %u, single collision %u, multiple collision %u, test error %u", EXTRACT_32BITS(sflow_eth_counter->alignerrors), EXTRACT_32BITS(sflow_eth_counter->fcserrors), @@ -369,6 +374,9 @@ print_sflow_counter_ethernet(netdissect_options *ndo, EXTRACT_32BITS(sflow_eth_counter->symbol_errors))); return 0; + +trunc: + return 1; } static int @@ -388,6 +396,7 @@ print_sflow_counter_basevg(netdissect_options *ndo, return 1; sflow_100basevg_counter = (const struct sflow_100basevg_counter_t *)pointer; + ND_TCHECK(*sflow_100basevg_counter); ND_PRINT((ndo, "\n\t in high prio frames %u, in high prio octets %" PRIu64, EXTRACT_32BITS(sflow_100basevg_counter->in_highpriority_frames), EXTRACT_64BITS(sflow_100basevg_counter->in_highpriority_octets))); @@ -412,6 +421,9 @@ print_sflow_counter_basevg(netdissect_options *ndo, EXTRACT_64BITS(sflow_100basevg_counter->hc_out_highpriority_octets))); return 0; + +trunc: + return 1; } static int @@ -424,6 +436,7 @@ print_sflow_counter_vlan(netdissect_options *ndo, return 1; sflow_vlan_counter = (const struct sflow_vlan_counter_t *)pointer; + ND_TCHECK(*sflow_vlan_counter); ND_PRINT((ndo, "\n\t vlan_id %u, octets %" PRIu64 ", unicast_pkt %u, multicast_pkt %u, broadcast_pkt %u, discards %u", EXTRACT_32BITS(sflow_vlan_counter->vlan_id), @@ -434,6 +447,9 @@ print_sflow_counter_vlan(netdissect_options *ndo, EXTRACT_32BITS(sflow_vlan_counter->discards))); return 0; + +trunc: + return 1; } struct sflow_processor_counter_t { @@ -454,6 +470,7 @@ print_sflow_counter_processor(netdissect_options *ndo, return 1; sflow_processor_counter = (const struct sflow_processor_counter_t *)pointer; + ND_TCHECK(*sflow_processor_counter); ND_PRINT((ndo, "\n\t 5sec %u, 1min %u, 5min %u, total_mem %" PRIu64 ", total_mem %" PRIu64, EXTRACT_32BITS(sflow_processor_counter->five_sec_util), @@ -463,6 +480,9 @@ print_sflow_counter_processor(netdissect_options *ndo, EXTRACT_64BITS(sflow_processor_counter->free_memory))); return 0; + +trunc: + return 1; } static int @@ -486,6 +506,7 @@ sflow_print_counter_records(netdissect_options *ndo, if (tlen < sizeof(struct sflow_counter_record_t)) return 1; sflow_counter_record = (const struct sflow_counter_record_t *)tptr; + ND_TCHECK(*sflow_counter_record); enterprise = EXTRACT_32BITS(sflow_counter_record->format); counter_type = enterprise & 0x0FFF; @@ -541,6 +562,9 @@ sflow_print_counter_records(netdissect_options *ndo, } return 0; + +trunc: + return 1; } static int @@ -553,11 +577,11 @@ sflow_print_counter_sample(netdissect_options *ndo, u_int type; u_int index; - if (len < sizeof(struct sflow_counter_sample_t)) return 1; sflow_counter_sample = (const struct sflow_counter_sample_t *)pointer; + ND_TCHECK(*sflow_counter_sample); typesource = EXTRACT_32BITS(sflow_counter_sample->typesource); nrecords = EXTRACT_32BITS(sflow_counter_sample->records); @@ -574,6 +598,8 @@ sflow_print_counter_sample(netdissect_options *ndo, len - sizeof(struct sflow_counter_sample_t), nrecords); +trunc: + return 1; } static int @@ -588,6 +614,7 @@ sflow_print_expanded_counter_sample(netdissect_options *ndo, return 1; sflow_expanded_counter_sample = (const struct sflow_expanded_counter_sample_t *)pointer; + ND_TCHECK(*sflow_expanded_counter_sample); nrecords = EXTRACT_32BITS(sflow_expanded_counter_sample->records); @@ -601,6 +628,8 @@ sflow_print_expanded_counter_sample(netdissect_options *ndo, len - sizeof(struct sflow_expanded_counter_sample_t), nrecords); +trunc: + return 1; } static int @@ -613,6 +642,7 @@ print_sflow_raw_packet(netdissect_options *ndo, return 1; sflow_flow_raw = (const struct sflow_expanded_flow_raw_t *)pointer; + ND_TCHECK(*sflow_flow_raw); ND_PRINT((ndo, "\n\t protocol %s (%u), length %u, stripped bytes %u, header_size %u", tok2str(sflow_flow_raw_protocol_values,"Unknown",EXTRACT_32BITS(sflow_flow_raw->protocol)), EXTRACT_32BITS(sflow_flow_raw->protocol), @@ -624,6 +654,9 @@ print_sflow_raw_packet(netdissect_options *ndo, assuming of course there is wnough data present to do so... */ return 0; + +trunc: + return 1; } static int @@ -636,12 +669,16 @@ print_sflow_ethernet_frame(netdissect_options *ndo, return 1; sflow_ethernet_frame = (const struct sflow_ethernet_frame_t *)pointer; + ND_TCHECK(*sflow_ethernet_frame); ND_PRINT((ndo, "\n\t frame len %u, type %u", EXTRACT_32BITS(sflow_ethernet_frame->length), EXTRACT_32BITS(sflow_ethernet_frame->type))); return 0; + +trunc: + return 1; } static int @@ -654,6 +691,7 @@ print_sflow_extended_switch_data(netdissect_options *ndo, return 1; sflow_extended_sw_data = (const struct sflow_extended_switch_data_t *)pointer; + ND_TCHECK(*sflow_extended_sw_data); ND_PRINT((ndo, "\n\t src vlan %u, src pri %u, dst vlan %u, dst pri %u", EXTRACT_32BITS(sflow_extended_sw_data->src_vlan), EXTRACT_32BITS(sflow_extended_sw_data->src_pri), @@ -661,6 +699,9 @@ print_sflow_extended_switch_data(netdissect_options *ndo, EXTRACT_32BITS(sflow_extended_sw_data->dst_pri))); return 0; + +trunc: + return 1; } static int @@ -685,6 +726,7 @@ sflow_print_flow_records(netdissect_options *ndo, return 1; sflow_flow_record = (const struct sflow_flow_record_t *)tptr; + ND_TCHECK(*sflow_flow_record); /* so, the funky encoding means we cannot blythly mask-off bits, we must also check the enterprise. */ @@ -747,6 +789,9 @@ sflow_print_flow_records(netdissect_options *ndo, } return 0; + +trunc: + return 1; } static int @@ -762,7 +807,8 @@ sflow_print_flow_sample(netdissect_options *ndo, if (len < sizeof(struct sflow_flow_sample_t)) return 1; - sflow_flow_sample = (struct sflow_flow_sample_t *)pointer; + sflow_flow_sample = (const struct sflow_flow_sample_t *)pointer; + ND_TCHECK(*sflow_flow_sample); typesource = EXTRACT_32BITS(sflow_flow_sample->typesource); nrecords = EXTRACT_32BITS(sflow_flow_sample->records); @@ -784,6 +830,8 @@ sflow_print_flow_sample(netdissect_options *ndo, len - sizeof(struct sflow_flow_sample_t), nrecords); +trunc: + return 1; } static int @@ -797,6 +845,7 @@ sflow_print_expanded_flow_sample(netdissect_options *ndo, return 1; sflow_expanded_flow_sample = (const struct sflow_expanded_flow_sample_t *)pointer; + ND_TCHECK(*sflow_expanded_flow_sample); nrecords = EXTRACT_32BITS(sflow_expanded_flow_sample->records); @@ -813,6 +862,8 @@ sflow_print_expanded_flow_sample(netdissect_options *ndo, len - sizeof(struct sflow_expanded_flow_sample_t), nrecords); +trunc: + return 1; } void @@ -827,7 +878,6 @@ sflow_print(netdissect_options *ndo, uint32_t sflow_sample_type, sflow_sample_len; uint32_t nsamples; - tptr = pptr; tlen = len; sflow_datagram = (const struct sflow_datagram_t *)pptr; |
