adopt MacOS deprecation workaround from FreeRADIUS

[tcpdump] / print-sflow.c

diff --git a/print-sflow.c b/print-sflow.c
index f27370a456e9d33dcaecd383f5192acf01254b69..1a23d49ed29ee42da613e096d15fd2ca5cb0ce47 100644 (file)
--- a/print-sflow.c
+++ b/print-sflow.c
@@ -313,10 +313,10 @@ print_sflow_counter_generic(const u_char *pointer, u_int len) {
 
 
     sflow_gen_counter = (const struct sflow_generic_counter_t *)pointer;
-    printf("\n\t      ifindex %u, iftype %u, ifspeed %u, ifdirection %u (%s)",
+    printf("\n\t      ifindex %u, iftype %u, ifspeed %" PRIu64 ", ifdirection %u (%s)",
           EXTRACT_32BITS(sflow_gen_counter->ifindex),
           EXTRACT_32BITS(sflow_gen_counter->iftype),
-          EXTRACT_32BITS(sflow_gen_counter->ifspeed),
+          EXTRACT_64BITS(sflow_gen_counter->ifspeed),
           EXTRACT_32BITS(sflow_gen_counter->ifdirection),
           tok2str(sflow_iface_direction_values, "Unknown",
                   EXTRACT_32BITS(sflow_gen_counter->ifdirection)));
@@ -840,7 +840,7 @@ sflow_print(const u_char *pptr, u_int len) {
                EXTRACT_32BITS(sflow_datagram->version),
                EXTRACT_32BITS(sflow_datagram->ip_version) == 1 ? "IPv4" : "IPv6",
               ipaddr_string(sflow_datagram->agent),
-               EXTRACT_32BITS(sflow_datagram->samples),
+               EXTRACT_32BITS(sflow_datagram->agent_id),
                len);
         return;
     }