Add support for IPv6 agent in sFlow.

[tcpdump] / print-sflow.c

diff --git a/print-sflow.c b/print-sflow.c
index 78aaafb6138770d07f700a7759201afd1d7e5e57..71ca26630ab56067148093aff74b81b17020821c 100644 (file)
--- a/print-sflow.c
+++ b/print-sflow.c
@@ -19,7 +19,7 @@
 
 /* \summary: sFlow protocol printer */
 
 
 /* \summary: sFlow protocol printer */
 

-/* specification: http://www.sflow.org/developers/specifications.php */
+/* specification: https://sflow.org/developers/specifications.php */

 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>


@@ -27,6 +27,7 @@
 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"


@@ -64,6 +65,16 @@ struct sflow_datagram_t {
     nd_uint32_t        samples;
 };
 
     nd_uint32_t        samples;
 };
 

+struct sflow_v6_datagram_t {
+    nd_uint32_t version;
+    nd_uint32_t ip_version;
+    nd_ipv6     agent;
+    nd_uint32_t        agent_id;
+    nd_uint32_t        seqnum;
+    nd_uint32_t        uptime;
+    nd_uint32_t        samples;
+};
+

 struct sflow_sample_header {
     nd_uint32_t        format;
     nd_uint32_t        len;
 struct sflow_sample_header {
     nd_uint32_t        format;
     nd_uint32_t        len;


@@ -308,43 +319,39 @@ print_sflow_counter_generic(netdissect_options *ndo,
        return 1;
 
     sflow_gen_counter = (const struct sflow_generic_counter_t *)pointer;
        return 1;
 
     sflow_gen_counter = (const struct sflow_generic_counter_t *)pointer;

-    ND_TCHECK_SIZE(sflow_gen_counter);

     ND_PRINT("\n\t      ifindex %u, iftype %u, ifspeed %" PRIu64 ", ifdirection %u (%s)",
     ND_PRINT("\n\t      ifindex %u, iftype %u, ifspeed %" PRIu64 ", ifdirection %u (%s)",

-          EXTRACT_BE_U_4(sflow_gen_counter->ifindex),
-          EXTRACT_BE_U_4(sflow_gen_counter->iftype),
-          EXTRACT_BE_U_8(sflow_gen_counter->ifspeed),
-          EXTRACT_BE_U_4(sflow_gen_counter->ifdirection),
+          GET_BE_U_4(sflow_gen_counter->ifindex),
+          GET_BE_U_4(sflow_gen_counter->iftype),
+          GET_BE_U_8(sflow_gen_counter->ifspeed),
+          GET_BE_U_4(sflow_gen_counter->ifdirection),

           tok2str(sflow_iface_direction_values, "Unknown",
           tok2str(sflow_iface_direction_values, "Unknown",

-          EXTRACT_BE_U_4(sflow_gen_counter->ifdirection)));
+          GET_BE_U_4(sflow_gen_counter->ifdirection)));

     ND_PRINT("\n\t      ifstatus %u, adminstatus: %s, operstatus: %s",
     ND_PRINT("\n\t      ifstatus %u, adminstatus: %s, operstatus: %s",

-          EXTRACT_BE_U_4(sflow_gen_counter->ifstatus),
-          EXTRACT_BE_U_4(sflow_gen_counter->ifstatus)&1 ? "up" : "down",
-          (EXTRACT_BE_U_4(sflow_gen_counter->ifstatus)>>1)&1 ? "up" : "down");
+          GET_BE_U_4(sflow_gen_counter->ifstatus),
+          GET_BE_U_4(sflow_gen_counter->ifstatus)&1 ? "up" : "down",
+          (GET_BE_U_4(sflow_gen_counter->ifstatus)>>1)&1 ? "up" : "down");

     ND_PRINT("\n\t      In octets %" PRIu64
           ", unicast pkts %u, multicast pkts %u, broadcast pkts %u, discards %u",
     ND_PRINT("\n\t      In octets %" PRIu64
           ", unicast pkts %u, multicast pkts %u, broadcast pkts %u, discards %u",

-          EXTRACT_BE_U_8(sflow_gen_counter->ifinoctets),
-          EXTRACT_BE_U_4(sflow_gen_counter->ifinunicastpkts),
-          EXTRACT_BE_U_4(sflow_gen_counter->ifinmulticastpkts),
-          EXTRACT_BE_U_4(sflow_gen_counter->ifinbroadcastpkts),
-          EXTRACT_BE_U_4(sflow_gen_counter->ifindiscards));
+          GET_BE_U_8(sflow_gen_counter->ifinoctets),
+          GET_BE_U_4(sflow_gen_counter->ifinunicastpkts),
+          GET_BE_U_4(sflow_gen_counter->ifinmulticastpkts),
+          GET_BE_U_4(sflow_gen_counter->ifinbroadcastpkts),
+          GET_BE_U_4(sflow_gen_counter->ifindiscards));

     ND_PRINT("\n\t      In errors %u, unknown protos %u",
     ND_PRINT("\n\t      In errors %u, unknown protos %u",

-          EXTRACT_BE_U_4(sflow_gen_counter->ifinerrors),
-          EXTRACT_BE_U_4(sflow_gen_counter->ifinunkownprotos));
+          GET_BE_U_4(sflow_gen_counter->ifinerrors),
+          GET_BE_U_4(sflow_gen_counter->ifinunkownprotos));

     ND_PRINT("\n\t      Out octets %" PRIu64
           ", unicast pkts %u, multicast pkts %u, broadcast pkts %u, discards %u",
     ND_PRINT("\n\t      Out octets %" PRIu64
           ", unicast pkts %u, multicast pkts %u, broadcast pkts %u, discards %u",

-          EXTRACT_BE_U_8(sflow_gen_counter->ifoutoctets),
-          EXTRACT_BE_U_4(sflow_gen_counter->ifoutunicastpkts),
-          EXTRACT_BE_U_4(sflow_gen_counter->ifoutmulticastpkts),
-          EXTRACT_BE_U_4(sflow_gen_counter->ifoutbroadcastpkts),
-          EXTRACT_BE_U_4(sflow_gen_counter->ifoutdiscards));
+          GET_BE_U_8(sflow_gen_counter->ifoutoctets),
+          GET_BE_U_4(sflow_gen_counter->ifoutunicastpkts),
+          GET_BE_U_4(sflow_gen_counter->ifoutmulticastpkts),
+          GET_BE_U_4(sflow_gen_counter->ifoutbroadcastpkts),
+          GET_BE_U_4(sflow_gen_counter->ifoutdiscards));

     ND_PRINT("\n\t      Out errors %u, promisc mode %u",
     ND_PRINT("\n\t      Out errors %u, promisc mode %u",

-          EXTRACT_BE_U_4(sflow_gen_counter->ifouterrors),
-          EXTRACT_BE_U_4(sflow_gen_counter->ifpromiscmode));
+          GET_BE_U_4(sflow_gen_counter->ifouterrors),
+          GET_BE_U_4(sflow_gen_counter->ifpromiscmode));

 
     return 0;
 
     return 0;

-
-trunc:
-    return 1;

 }
 
 static int
 }
 
 static int


@@ -357,28 +364,24 @@ print_sflow_counter_ethernet(netdissect_options *ndo,
        return 1;
 
     sflow_eth_counter = (const struct sflow_ethernet_counter_t *)pointer;
        return 1;
 
     sflow_eth_counter = (const struct sflow_ethernet_counter_t *)pointer;

-    ND_TCHECK_SIZE(sflow_eth_counter);

     ND_PRINT("\n\t      align errors %u, fcs errors %u, single collision %u, multiple collision %u, test error %u",
     ND_PRINT("\n\t      align errors %u, fcs errors %u, single collision %u, multiple collision %u, test error %u",

-          EXTRACT_BE_U_4(sflow_eth_counter->alignerrors),
-          EXTRACT_BE_U_4(sflow_eth_counter->fcserrors),
-          EXTRACT_BE_U_4(sflow_eth_counter->single_collision_frames),
-          EXTRACT_BE_U_4(sflow_eth_counter->multiple_collision_frames),
-          EXTRACT_BE_U_4(sflow_eth_counter->test_errors));
+          GET_BE_U_4(sflow_eth_counter->alignerrors),
+          GET_BE_U_4(sflow_eth_counter->fcserrors),
+          GET_BE_U_4(sflow_eth_counter->single_collision_frames),
+          GET_BE_U_4(sflow_eth_counter->multiple_collision_frames),
+          GET_BE_U_4(sflow_eth_counter->test_errors));

     ND_PRINT("\n\t      deferred %u, late collision %u, excessive collision %u, mac trans error %u",
     ND_PRINT("\n\t      deferred %u, late collision %u, excessive collision %u, mac trans error %u",

-          EXTRACT_BE_U_4(sflow_eth_counter->deferred_transmissions),
-          EXTRACT_BE_U_4(sflow_eth_counter->late_collisions),
-          EXTRACT_BE_U_4(sflow_eth_counter->excessive_collisions),
-          EXTRACT_BE_U_4(sflow_eth_counter->mac_transmit_errors));
+          GET_BE_U_4(sflow_eth_counter->deferred_transmissions),
+          GET_BE_U_4(sflow_eth_counter->late_collisions),
+          GET_BE_U_4(sflow_eth_counter->excessive_collisions),
+          GET_BE_U_4(sflow_eth_counter->mac_transmit_errors));

     ND_PRINT("\n\t      carrier error %u, frames too long %u, mac receive errors %u, symbol errors %u",
     ND_PRINT("\n\t      carrier error %u, frames too long %u, mac receive errors %u, symbol errors %u",

-          EXTRACT_BE_U_4(sflow_eth_counter->carrier_sense_errors),
-          EXTRACT_BE_U_4(sflow_eth_counter->frame_too_longs),
-          EXTRACT_BE_U_4(sflow_eth_counter->mac_receive_errors),
-          EXTRACT_BE_U_4(sflow_eth_counter->symbol_errors));
+          GET_BE_U_4(sflow_eth_counter->carrier_sense_errors),
+          GET_BE_U_4(sflow_eth_counter->frame_too_longs),
+          GET_BE_U_4(sflow_eth_counter->mac_receive_errors),
+          GET_BE_U_4(sflow_eth_counter->symbol_errors));

 
     return 0;
 
     return 0;

-
-trunc:
-    return 1;

 }
 
 static int
 }
 
 static int


@@ -398,34 +401,30 @@ print_sflow_counter_basevg(netdissect_options *ndo,
        return 1;
 
     sflow_100basevg_counter = (const struct sflow_100basevg_counter_t *)pointer;
        return 1;
 
     sflow_100basevg_counter = (const struct sflow_100basevg_counter_t *)pointer;

-    ND_TCHECK_SIZE(sflow_100basevg_counter);

     ND_PRINT("\n\t      in high prio frames %u, in high prio octets %" PRIu64,
     ND_PRINT("\n\t      in high prio frames %u, in high prio octets %" PRIu64,

-          EXTRACT_BE_U_4(sflow_100basevg_counter->in_highpriority_frames),
-          EXTRACT_BE_U_8(sflow_100basevg_counter->in_highpriority_octets));
+          GET_BE_U_4(sflow_100basevg_counter->in_highpriority_frames),
+          GET_BE_U_8(sflow_100basevg_counter->in_highpriority_octets));

     ND_PRINT("\n\t      in norm prio frames %u, in norm prio octets %" PRIu64,
     ND_PRINT("\n\t      in norm prio frames %u, in norm prio octets %" PRIu64,

-          EXTRACT_BE_U_4(sflow_100basevg_counter->in_normpriority_frames),
-          EXTRACT_BE_U_8(sflow_100basevg_counter->in_normpriority_octets));
+          GET_BE_U_4(sflow_100basevg_counter->in_normpriority_frames),
+          GET_BE_U_8(sflow_100basevg_counter->in_normpriority_octets));

     ND_PRINT("\n\t      in ipm errors %u, oversized %u, in data errors %u, null addressed frames %u",
     ND_PRINT("\n\t      in ipm errors %u, oversized %u, in data errors %u, null addressed frames %u",

-          EXTRACT_BE_U_4(sflow_100basevg_counter->in_ipmerrors),
-          EXTRACT_BE_U_4(sflow_100basevg_counter->in_oversized),
-          EXTRACT_BE_U_4(sflow_100basevg_counter->in_data_errors),
-          EXTRACT_BE_U_4(sflow_100basevg_counter->in_null_addressed_frames));
+          GET_BE_U_4(sflow_100basevg_counter->in_ipmerrors),
+          GET_BE_U_4(sflow_100basevg_counter->in_oversized),
+          GET_BE_U_4(sflow_100basevg_counter->in_data_errors),
+          GET_BE_U_4(sflow_100basevg_counter->in_null_addressed_frames));

     ND_PRINT("\n\t      out high prio frames %u, out high prio octets %" PRIu64
           ", trans into frames %u",
     ND_PRINT("\n\t      out high prio frames %u, out high prio octets %" PRIu64
           ", trans into frames %u",

-          EXTRACT_BE_U_4(sflow_100basevg_counter->out_highpriority_frames),
-          EXTRACT_BE_U_8(sflow_100basevg_counter->out_highpriority_octets),
-          EXTRACT_BE_U_4(sflow_100basevg_counter->transitioninto_frames));
+          GET_BE_U_4(sflow_100basevg_counter->out_highpriority_frames),
+          GET_BE_U_8(sflow_100basevg_counter->out_highpriority_octets),
+          GET_BE_U_4(sflow_100basevg_counter->transitioninto_frames));

     ND_PRINT("\n\t      in hc high prio octets %" PRIu64
           ", in hc norm prio octets %" PRIu64
           ", out hc high prio octets %" PRIu64,
     ND_PRINT("\n\t      in hc high prio octets %" PRIu64
           ", in hc norm prio octets %" PRIu64
           ", out hc high prio octets %" PRIu64,

-          EXTRACT_BE_U_8(sflow_100basevg_counter->hc_in_highpriority_octets),
-          EXTRACT_BE_U_8(sflow_100basevg_counter->hc_in_normpriority_octets),
-          EXTRACT_BE_U_8(sflow_100basevg_counter->hc_out_highpriority_octets));
+          GET_BE_U_8(sflow_100basevg_counter->hc_in_highpriority_octets),
+          GET_BE_U_8(sflow_100basevg_counter->hc_in_normpriority_octets),
+          GET_BE_U_8(sflow_100basevg_counter->hc_out_highpriority_octets));

 
     return 0;
 
     return 0;

-
-trunc:
-    return 1;

 }
 
 static int
 }
 
 static int


@@ -438,20 +437,16 @@ print_sflow_counter_vlan(netdissect_options *ndo,
        return 1;
 
     sflow_vlan_counter = (const struct sflow_vlan_counter_t *)pointer;
        return 1;
 
     sflow_vlan_counter = (const struct sflow_vlan_counter_t *)pointer;

-    ND_TCHECK_SIZE(sflow_vlan_counter);

     ND_PRINT("\n\t      vlan_id %u, octets %" PRIu64
           ", unicast_pkt %u, multicast_pkt %u, broadcast_pkt %u, discards %u",
     ND_PRINT("\n\t      vlan_id %u, octets %" PRIu64
           ", unicast_pkt %u, multicast_pkt %u, broadcast_pkt %u, discards %u",

-          EXTRACT_BE_U_4(sflow_vlan_counter->vlan_id),
-          EXTRACT_BE_U_8(sflow_vlan_counter->octets),
-          EXTRACT_BE_U_4(sflow_vlan_counter->unicast_pkt),
-          EXTRACT_BE_U_4(sflow_vlan_counter->multicast_pkt),
-          EXTRACT_BE_U_4(sflow_vlan_counter->broadcast_pkt),
-          EXTRACT_BE_U_4(sflow_vlan_counter->discards));
+          GET_BE_U_4(sflow_vlan_counter->vlan_id),
+          GET_BE_U_8(sflow_vlan_counter->octets),
+          GET_BE_U_4(sflow_vlan_counter->unicast_pkt),
+          GET_BE_U_4(sflow_vlan_counter->multicast_pkt),
+          GET_BE_U_4(sflow_vlan_counter->broadcast_pkt),
+          GET_BE_U_4(sflow_vlan_counter->discards));

 
     return 0;
 
     return 0;

-
-trunc:
-    return 1;

 }
 
 struct sflow_processor_counter_t {
 }
 
 struct sflow_processor_counter_t {


@@ -472,19 +467,15 @@ print_sflow_counter_processor(netdissect_options *ndo,
        return 1;
 
     sflow_processor_counter = (const struct sflow_processor_counter_t *)pointer;
        return 1;
 
     sflow_processor_counter = (const struct sflow_processor_counter_t *)pointer;

-    ND_TCHECK_SIZE(sflow_processor_counter);

     ND_PRINT("\n\t      5sec %u, 1min %u, 5min %u, total_mem %" PRIu64
           ", total_mem %" PRIu64,
     ND_PRINT("\n\t      5sec %u, 1min %u, 5min %u, total_mem %" PRIu64
           ", total_mem %" PRIu64,

-          EXTRACT_BE_U_4(sflow_processor_counter->five_sec_util),
-          EXTRACT_BE_U_4(sflow_processor_counter->one_min_util),
-          EXTRACT_BE_U_4(sflow_processor_counter->five_min_util),
-          EXTRACT_BE_U_8(sflow_processor_counter->total_memory),
-          EXTRACT_BE_U_8(sflow_processor_counter->free_memory));
+          GET_BE_U_4(sflow_processor_counter->five_sec_util),
+          GET_BE_U_4(sflow_processor_counter->one_min_util),
+          GET_BE_U_4(sflow_processor_counter->five_min_util),
+          GET_BE_U_8(sflow_processor_counter->total_memory),
+          GET_BE_U_8(sflow_processor_counter->free_memory));

 
     return 0;
 
     return 0;

-
-trunc:
-    return 1;

 }
 
 static int
 }
 
 static int


@@ -508,12 +499,11 @@ 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;
        if (tlen < sizeof(struct sflow_counter_record_t))
            return 1;
        sflow_counter_record = (const struct sflow_counter_record_t *)tptr;

-       ND_TCHECK_SIZE(sflow_counter_record);

 
 

-       enterprise = EXTRACT_BE_U_4(sflow_counter_record->format);
+       enterprise = GET_BE_U_4(sflow_counter_record->format);

        counter_type = enterprise & 0x0FFF;
        enterprise = enterprise >> 20;
        counter_type = enterprise & 0x0FFF;
        enterprise = enterprise >> 20;

-       counter_len  = EXTRACT_BE_U_4(sflow_counter_record->length);
+       counter_len  = GET_BE_U_4(sflow_counter_record->length);

        ND_PRINT("\n\t    enterprise %u, %s (%u) length %u",
               enterprise,
               (enterprise == 0) ? tok2str(sflow_counter_type_values,"Unknown",counter_type) : "Unknown",
        ND_PRINT("\n\t    enterprise %u, %s (%u) length %u",
               enterprise,
               (enterprise == 0) ? tok2str(sflow_counter_type_values,"Unknown",counter_type) : "Unknown",


@@ -564,9 +554,6 @@ sflow_print_counter_records(netdissect_options *ndo,
     }
 
     return 0;
     }
 
     return 0;

-
-trunc:
-    return 1;

 }
 
 static int
 }
 
 static int


@@ -580,22 +567,18 @@ sflow_print_counter_sample(netdissect_options *ndo,
        return 1;
 
     sflow_counter_sample = (const struct sflow_counter_sample_t *)pointer;
        return 1;
 
     sflow_counter_sample = (const struct sflow_counter_sample_t *)pointer;

-    ND_TCHECK_SIZE(sflow_counter_sample);

 
 

-    nrecords   = EXTRACT_BE_U_4(sflow_counter_sample->records);
+    nrecords   = GET_BE_U_4(sflow_counter_sample->records);

 
     ND_PRINT(" seqnum %u, type %u, idx %u, records %u",
 
     ND_PRINT(" seqnum %u, type %u, idx %u, records %u",

-          EXTRACT_BE_U_4(sflow_counter_sample->seqnum),
-          EXTRACT_U_1(sflow_counter_sample->type),
-          EXTRACT_BE_U_3(sflow_counter_sample->index),
+          GET_BE_U_4(sflow_counter_sample->seqnum),
+          GET_U_1(sflow_counter_sample->type),
+          GET_BE_U_3(sflow_counter_sample->index),

           nrecords);
 
     return sflow_print_counter_records(ndo, pointer + sizeof(struct sflow_counter_sample_t),
                                       len - sizeof(struct sflow_counter_sample_t),
                                       nrecords);
           nrecords);
 
     return sflow_print_counter_records(ndo, pointer + sizeof(struct sflow_counter_sample_t),
                                       len - sizeof(struct sflow_counter_sample_t),
                                       nrecords);

-
-trunc:
-    return 1;

 }
 
 static int
 }
 
 static int


@@ -610,22 +593,18 @@ sflow_print_expanded_counter_sample(netdissect_options *ndo,
        return 1;
 
     sflow_expanded_counter_sample = (const struct sflow_expanded_counter_sample_t *)pointer;
        return 1;
 
     sflow_expanded_counter_sample = (const struct sflow_expanded_counter_sample_t *)pointer;

-    ND_TCHECK_SIZE(sflow_expanded_counter_sample);

 
 

-    nrecords = EXTRACT_BE_U_4(sflow_expanded_counter_sample->records);
+    nrecords = GET_BE_U_4(sflow_expanded_counter_sample->records);

 
     ND_PRINT(" seqnum %u, type %u, idx %u, records %u",
 
     ND_PRINT(" seqnum %u, type %u, idx %u, records %u",

-          EXTRACT_BE_U_4(sflow_expanded_counter_sample->seqnum),
-          EXTRACT_BE_U_4(sflow_expanded_counter_sample->type),
-          EXTRACT_BE_U_4(sflow_expanded_counter_sample->index),
+          GET_BE_U_4(sflow_expanded_counter_sample->seqnum),
+          GET_BE_U_4(sflow_expanded_counter_sample->type),
+          GET_BE_U_4(sflow_expanded_counter_sample->index),

           nrecords);
 
     return sflow_print_counter_records(ndo, pointer + sizeof(struct sflow_expanded_counter_sample_t),
                                       len - sizeof(struct sflow_expanded_counter_sample_t),
                                       nrecords);
           nrecords);
 
     return sflow_print_counter_records(ndo, pointer + sizeof(struct sflow_expanded_counter_sample_t),
                                       len - sizeof(struct sflow_expanded_counter_sample_t),
                                       nrecords);

-
-trunc:
-    return 1;

 }
 
 static int
 }
 
 static int


@@ -638,21 +617,17 @@ print_sflow_raw_packet(netdissect_options *ndo,
        return 1;
 
     sflow_flow_raw = (const struct sflow_expanded_flow_raw_t *)pointer;
        return 1;
 
     sflow_flow_raw = (const struct sflow_expanded_flow_raw_t *)pointer;

-    ND_TCHECK_SIZE(sflow_flow_raw);

     ND_PRINT("\n\t      protocol %s (%u), length %u, stripped bytes %u, header_size %u",
     ND_PRINT("\n\t      protocol %s (%u), length %u, stripped bytes %u, header_size %u",

-          tok2str(sflow_flow_raw_protocol_values,"Unknown",EXTRACT_BE_U_4(sflow_flow_raw->protocol)),
-          EXTRACT_BE_U_4(sflow_flow_raw->protocol),
-          EXTRACT_BE_U_4(sflow_flow_raw->length),
-          EXTRACT_BE_U_4(sflow_flow_raw->stripped_bytes),
-          EXTRACT_BE_U_4(sflow_flow_raw->header_size));
+          tok2str(sflow_flow_raw_protocol_values,"Unknown",GET_BE_U_4(sflow_flow_raw->protocol)),
+          GET_BE_U_4(sflow_flow_raw->protocol),
+          GET_BE_U_4(sflow_flow_raw->length),
+          GET_BE_U_4(sflow_flow_raw->stripped_bytes),
+          GET_BE_U_4(sflow_flow_raw->header_size));

 
     /* QUESTION - should we attempt to print the raw header itself?
 
     /* QUESTION - should we attempt to print the raw header itself?

-       assuming of course there is wnough data present to do so... */
+       assuming of course there is enough data present to do so... */

 
     return 0;
 
     return 0;

-
-trunc:
-    return 1;

 }
 
 static int
 }
 
 static int


@@ -665,16 +640,12 @@ print_sflow_ethernet_frame(netdissect_options *ndo,
        return 1;
 
     sflow_ethernet_frame = (const struct sflow_ethernet_frame_t *)pointer;
        return 1;
 
     sflow_ethernet_frame = (const struct sflow_ethernet_frame_t *)pointer;

-    ND_TCHECK_SIZE(sflow_ethernet_frame);

 
     ND_PRINT("\n\t      frame len %u, type %u",
 
     ND_PRINT("\n\t      frame len %u, type %u",

-          EXTRACT_BE_U_4(sflow_ethernet_frame->length),
-          EXTRACT_BE_U_4(sflow_ethernet_frame->type));
+          GET_BE_U_4(sflow_ethernet_frame->length),
+          GET_BE_U_4(sflow_ethernet_frame->type));

 
     return 0;
 
     return 0;

-
-trunc:
-    return 1;

 }
 
 static int
 }
 
 static int


@@ -687,17 +658,13 @@ print_sflow_extended_switch_data(netdissect_options *ndo,
        return 1;
 
     sflow_extended_sw_data = (const struct sflow_extended_switch_data_t *)pointer;
        return 1;
 
     sflow_extended_sw_data = (const struct sflow_extended_switch_data_t *)pointer;

-    ND_TCHECK_SIZE(sflow_extended_sw_data);

     ND_PRINT("\n\t      src vlan %u, src pri %u, dst vlan %u, dst pri %u",
     ND_PRINT("\n\t      src vlan %u, src pri %u, dst vlan %u, dst pri %u",

-          EXTRACT_BE_U_4(sflow_extended_sw_data->src_vlan),
-          EXTRACT_BE_U_4(sflow_extended_sw_data->src_pri),
-          EXTRACT_BE_U_4(sflow_extended_sw_data->dst_vlan),
-          EXTRACT_BE_U_4(sflow_extended_sw_data->dst_pri));
+          GET_BE_U_4(sflow_extended_sw_data->src_vlan),
+          GET_BE_U_4(sflow_extended_sw_data->src_pri),
+          GET_BE_U_4(sflow_extended_sw_data->dst_vlan),
+          GET_BE_U_4(sflow_extended_sw_data->dst_pri));

 
     return 0;
 
     return 0;

-
-trunc:
-    return 1;

 }
 
 static int
 }
 
 static int


@@ -722,15 +689,14 @@ sflow_print_flow_records(netdissect_options *ndo,
            return 1;
 
        sflow_flow_record = (const struct sflow_flow_record_t *)tptr;
            return 1;
 
        sflow_flow_record = (const struct sflow_flow_record_t *)tptr;

-       ND_TCHECK_SIZE(sflow_flow_record);

 
        /* so, the funky encoding means we cannot blythly mask-off
           bits, we must also check the enterprise. */
 
 
        /* so, the funky encoding means we cannot blythly mask-off
           bits, we must also check the enterprise. */
 

-       enterprise = EXTRACT_BE_U_4(sflow_flow_record->format);
+       enterprise = GET_BE_U_4(sflow_flow_record->format);

        flow_type = enterprise & 0x0FFF;
        enterprise = enterprise >> 12;
        flow_type = enterprise & 0x0FFF;
        enterprise = enterprise >> 12;

-       flow_len  = EXTRACT_BE_U_4(sflow_flow_record->length);
+       flow_len  = GET_BE_U_4(sflow_flow_record->length);

        ND_PRINT("\n\t    enterprise %u %s (%u) length %u",
               enterprise,
               (enterprise == 0) ? tok2str(sflow_flow_type_values,"Unknown",flow_type) : "Unknown",
        ND_PRINT("\n\t    enterprise %u %s (%u) length %u",
               enterprise,
               (enterprise == 0) ? tok2str(sflow_flow_type_values,"Unknown",flow_type) : "Unknown",


@@ -785,9 +751,6 @@ sflow_print_flow_records(netdissect_options *ndo,
     }
 
     return 0;
     }
 
     return 0;

-
-trunc:
-    return 1;

 }
 
 static int
 }
 
 static int


@@ -801,27 +764,23 @@ sflow_print_flow_sample(netdissect_options *ndo,
        return 1;
 
     sflow_flow_sample = (const struct sflow_flow_sample_t *)pointer;
        return 1;
 
     sflow_flow_sample = (const struct sflow_flow_sample_t *)pointer;

-    ND_TCHECK_SIZE(sflow_flow_sample);

 
 

-    nrecords = EXTRACT_BE_U_4(sflow_flow_sample->records);
+    nrecords = GET_BE_U_4(sflow_flow_sample->records);

 
     ND_PRINT(" seqnum %u, type %u, idx %u, rate %u, pool %u, drops %u, input %u output %u records %u",
 
     ND_PRINT(" seqnum %u, type %u, idx %u, rate %u, pool %u, drops %u, input %u output %u records %u",

-          EXTRACT_BE_U_4(sflow_flow_sample->seqnum),
-          EXTRACT_U_1(sflow_flow_sample->type),
-          EXTRACT_BE_U_3(sflow_flow_sample->index),
-          EXTRACT_BE_U_4(sflow_flow_sample->rate),
-          EXTRACT_BE_U_4(sflow_flow_sample->pool),
-          EXTRACT_BE_U_4(sflow_flow_sample->drops),
-          EXTRACT_BE_U_4(sflow_flow_sample->in_interface),
-          EXTRACT_BE_U_4(sflow_flow_sample->out_interface),
+          GET_BE_U_4(sflow_flow_sample->seqnum),
+          GET_U_1(sflow_flow_sample->type),
+          GET_BE_U_3(sflow_flow_sample->index),
+          GET_BE_U_4(sflow_flow_sample->rate),
+          GET_BE_U_4(sflow_flow_sample->pool),
+          GET_BE_U_4(sflow_flow_sample->drops),
+          GET_BE_U_4(sflow_flow_sample->in_interface),
+          GET_BE_U_4(sflow_flow_sample->out_interface),

           nrecords);
 
     return sflow_print_flow_records(ndo, pointer + sizeof(struct sflow_flow_sample_t),
                                    len - sizeof(struct sflow_flow_sample_t),
                                    nrecords);
           nrecords);
 
     return sflow_print_flow_records(ndo, pointer + sizeof(struct sflow_flow_sample_t),
                                    len - sizeof(struct sflow_flow_sample_t),
                                    nrecords);

-
-trunc:
-    return 1;

 }
 
 static int
 }
 
 static int


@@ -835,25 +794,21 @@ sflow_print_expanded_flow_sample(netdissect_options *ndo,
        return 1;
 
     sflow_expanded_flow_sample = (const struct sflow_expanded_flow_sample_t *)pointer;
        return 1;
 
     sflow_expanded_flow_sample = (const struct sflow_expanded_flow_sample_t *)pointer;

-    ND_TCHECK_SIZE(sflow_expanded_flow_sample);

 
 

-    nrecords = EXTRACT_BE_U_4(sflow_expanded_flow_sample->records);
+    nrecords = GET_BE_U_4(sflow_expanded_flow_sample->records);

 
     ND_PRINT(" seqnum %u, type %u, idx %u, rate %u, pool %u, drops %u, records %u",
 
     ND_PRINT(" seqnum %u, type %u, idx %u, rate %u, pool %u, drops %u, records %u",

-          EXTRACT_BE_U_4(sflow_expanded_flow_sample->seqnum),
-          EXTRACT_BE_U_4(sflow_expanded_flow_sample->type),
-          EXTRACT_BE_U_4(sflow_expanded_flow_sample->index),
-          EXTRACT_BE_U_4(sflow_expanded_flow_sample->rate),
-          EXTRACT_BE_U_4(sflow_expanded_flow_sample->pool),
-          EXTRACT_BE_U_4(sflow_expanded_flow_sample->drops),
-          EXTRACT_BE_U_4(sflow_expanded_flow_sample->records));
+          GET_BE_U_4(sflow_expanded_flow_sample->seqnum),
+          GET_BE_U_4(sflow_expanded_flow_sample->type),
+          GET_BE_U_4(sflow_expanded_flow_sample->index),
+          GET_BE_U_4(sflow_expanded_flow_sample->rate),
+          GET_BE_U_4(sflow_expanded_flow_sample->pool),
+          GET_BE_U_4(sflow_expanded_flow_sample->drops),
+          nrecords);

 
     return sflow_print_flow_records(ndo, pointer + sizeof(struct sflow_expanded_flow_sample_t),
                                    len - sizeof(struct sflow_expanded_flow_sample_t),
                                    nrecords);
 
     return sflow_print_flow_records(ndo, pointer + sizeof(struct sflow_expanded_flow_sample_t),
                                    len - sizeof(struct sflow_expanded_flow_sample_t),
                                    nrecords);

-
-trunc:
-    return 1;

 }
 
 void
 }
 
 void


@@ -861,63 +816,92 @@ sflow_print(netdissect_options *ndo,
             const u_char *pptr, u_int len)
 {
     const struct sflow_datagram_t *sflow_datagram;
             const u_char *pptr, u_int len)
 {
     const struct sflow_datagram_t *sflow_datagram;

+    const struct sflow_v6_datagram_t *sflow_v6_datagram;

     const struct sflow_sample_header *sflow_sample;
 
     const u_char *tptr;
     u_int tlen;
     uint32_t sflow_sample_type, sflow_sample_len;
     uint32_t nsamples;
     const struct sflow_sample_header *sflow_sample;
 
     const u_char *tptr;
     u_int tlen;
     uint32_t sflow_sample_type, sflow_sample_len;
     uint32_t nsamples;

+    uint32_t ip_version;

 
     ndo->ndo_protocol = "sflow";
     tptr = pptr;
     tlen = len;
     sflow_datagram = (const struct sflow_datagram_t *)pptr;
 
     ndo->ndo_protocol = "sflow";
     tptr = pptr;
     tlen = len;
     sflow_datagram = (const struct sflow_datagram_t *)pptr;

+    sflow_v6_datagram = (const struct sflow_v6_datagram_t *)pptr;
+    ip_version = GET_BE_U_4(sflow_datagram->ip_version);
+
+    if ((len < sizeof(struct sflow_datagram_t) && (ip_version == 1)) ||
+        (len < sizeof(struct sflow_v6_datagram_t) && (ip_version == 2))) {
+        ND_PRINT("sFlowv%u", GET_BE_U_4(sflow_datagram->version));
+        ND_PRINT(" [length %u < %zu]", len, sizeof(struct sflow_datagram_t));
+        nd_print_invalid(ndo);
+        return;
+    }

     ND_TCHECK_SIZE(sflow_datagram);
 
     /*
      * Sanity checking of the header.
      */
     ND_TCHECK_SIZE(sflow_datagram);
 
     /*
      * Sanity checking of the header.
      */

-    if (EXTRACT_BE_U_4(sflow_datagram->version) != 5) {
+    if (GET_BE_U_4(sflow_datagram->version) != 5) {

         ND_PRINT("sFlow version %u packet not supported",
         ND_PRINT("sFlow version %u packet not supported",

-               EXTRACT_BE_U_4(sflow_datagram->version));
+               GET_BE_U_4(sflow_datagram->version));

         return;
     }
 
     if (ndo->ndo_vflag < 1) {
         ND_PRINT("sFlowv%u, %s agent %s, agent-id %u, length %u",
         return;
     }
 
     if (ndo->ndo_vflag < 1) {
         ND_PRINT("sFlowv%u, %s agent %s, agent-id %u, length %u",

-               EXTRACT_BE_U_4(sflow_datagram->version),
-               EXTRACT_BE_U_4(sflow_datagram->ip_version) == 1 ? "IPv4" : "IPv6",
-               ipaddr_string(ndo, sflow_datagram->agent),
-               EXTRACT_BE_U_4(sflow_datagram->agent_id),
+               GET_BE_U_4(sflow_datagram->version),
+               ip_version == 1 ? "IPv4" : "IPv6",
+               ip_version == 1 ? GET_IPADDR_STRING(sflow_datagram->agent) :
+                                 GET_IP6ADDR_STRING( sflow_v6_datagram->agent),
+               ip_version == 1 ? GET_BE_U_4(sflow_datagram->agent_id) :
+                                 GET_BE_U_4(sflow_v6_datagram->agent_id),

                len);
         return;
     }
 
     /* ok they seem to want to know everything - lets fully decode it */
                len);
         return;
     }
 
     /* ok they seem to want to know everything - lets fully decode it */

-    nsamples=EXTRACT_BE_U_4(sflow_datagram->samples);
-    ND_PRINT("sFlowv%u, %s agent %s, agent-id %u, seqnum %u, uptime %u, samples %u, length %u",
-           EXTRACT_BE_U_4(sflow_datagram->version),
-           EXTRACT_BE_U_4(sflow_datagram->ip_version) == 1 ? "IPv4" : "IPv6",
-           ipaddr_string(ndo, sflow_datagram->agent),
-           EXTRACT_BE_U_4(sflow_datagram->agent_id),
-           EXTRACT_BE_U_4(sflow_datagram->seqnum),
-           EXTRACT_BE_U_4(sflow_datagram->uptime),
-           nsamples,
-           len);
-
-    /* skip Common header */
-    tptr += sizeof(struct sflow_datagram_t);
-    tlen -= sizeof(struct sflow_datagram_t);
+    if (ip_version == 1) {
+        nsamples=GET_BE_U_4(sflow_datagram->samples);
+        ND_PRINT("sFlowv%u, %s agent %s, agent-id %u, seqnum %u, uptime %u, samples %u, length %u",
+               GET_BE_U_4(sflow_datagram->version),
+               "IPv4",
+               GET_IPADDR_STRING(sflow_datagram->agent),
+               GET_BE_U_4(sflow_datagram->agent_id),
+               GET_BE_U_4(sflow_datagram->seqnum),
+               GET_BE_U_4(sflow_datagram->uptime),
+               nsamples,
+               len);

 
 

+        /* skip Common header */
+        tptr += sizeof(struct sflow_datagram_t);
+        tlen -= sizeof(struct sflow_datagram_t);
+    } else {
+        nsamples=GET_BE_U_4(sflow_v6_datagram->samples);
+        ND_PRINT("sFlowv%u, %s agent %s, agent-id %u, seqnum %u, uptime %u, samples %u, length %u",
+               GET_BE_U_4(sflow_v6_datagram->version),
+               "IPv6",
+               GET_IP6ADDR_STRING(sflow_v6_datagram->agent),
+               GET_BE_U_4(sflow_v6_datagram->agent_id),
+               GET_BE_U_4(sflow_v6_datagram->seqnum),
+               GET_BE_U_4(sflow_v6_datagram->uptime),
+               nsamples,
+               len);
+
+        /* skip Common header */
+        tptr += sizeof(struct sflow_v6_datagram_t);
+        tlen -= sizeof(struct sflow_v6_datagram_t);
+    }

     while (nsamples > 0 && tlen > 0) {
         sflow_sample = (const struct sflow_sample_header *)tptr;
     while (nsamples > 0 && tlen > 0) {
         sflow_sample = (const struct sflow_sample_header *)tptr;

-        ND_TCHECK_SIZE(sflow_sample);

 
 

-        sflow_sample_type = (EXTRACT_BE_U_4(sflow_sample->format)&0x0FFF);
-        sflow_sample_len = EXTRACT_BE_U_4(sflow_sample->len);
+        sflow_sample_type = (GET_BE_U_4(sflow_sample->format)&0x0FFF);
+        sflow_sample_len = GET_BE_U_4(sflow_sample->len);

 
        if (tlen < sizeof(struct sflow_sample_header))
 
        if (tlen < sizeof(struct sflow_sample_header))

-           goto trunc;
+           goto invalid;

 
         tptr += sizeof(struct sflow_sample_header);
         tlen -= sizeof(struct sflow_sample_header);
 
         tptr += sizeof(struct sflow_sample_header);
         tlen -= sizeof(struct sflow_sample_header);


@@ -933,7 +917,7 @@ sflow_print(netdissect_options *ndo,
         }
 
        if (tlen < sflow_sample_len)
         }
 
        if (tlen < sflow_sample_len)

-           goto trunc;
+           goto invalid;

 
         /* did we capture enough for fully decoding the sample ? */
         ND_TCHECK_LEN(tptr, sflow_sample_len);
 
         /* did we capture enough for fully decoding the sample ? */
         ND_TCHECK_LEN(tptr, sflow_sample_len);


@@ -941,22 +925,22 @@ sflow_print(netdissect_options *ndo,
        switch(sflow_sample_type) {
         case SFLOW_FLOW_SAMPLE:
            if (sflow_print_flow_sample(ndo, tptr, tlen))
        switch(sflow_sample_type) {
         case SFLOW_FLOW_SAMPLE:
            if (sflow_print_flow_sample(ndo, tptr, tlen))

-               goto trunc;
+               goto invalid;

             break;
 
         case SFLOW_COUNTER_SAMPLE:
            if (sflow_print_counter_sample(ndo, tptr,tlen))
             break;
 
         case SFLOW_COUNTER_SAMPLE:
            if (sflow_print_counter_sample(ndo, tptr,tlen))

-               goto trunc;
+               goto invalid;

             break;
 
         case SFLOW_EXPANDED_FLOW_SAMPLE:
            if (sflow_print_expanded_flow_sample(ndo, tptr, tlen))
             break;
 
         case SFLOW_EXPANDED_FLOW_SAMPLE:
            if (sflow_print_expanded_flow_sample(ndo, tptr, tlen))

-               goto trunc;
+               goto invalid;

            break;
 
         case SFLOW_EXPANDED_COUNTER_SAMPLE:
            if (sflow_print_expanded_counter_sample(ndo, tptr,tlen))
            break;
 
         case SFLOW_EXPANDED_COUNTER_SAMPLE:
            if (sflow_print_expanded_counter_sample(ndo, tptr,tlen))

-               goto trunc;
+               goto invalid;

            break;
 
         default:
            break;
 
         default:


@@ -970,6 +954,7 @@ sflow_print(netdissect_options *ndo,
     }
     return;
 
     }
     return;
 

- trunc:
-    nd_print_trunc(ndo);
+invalid:
+    nd_print_invalid(ndo);
+    ND_TCHECK_LEN(tptr, tlen);

 }
 }