Use the new GET_ macros instead of the EXTRACT_ ones

The exceptions are currently:
Some EXTRACT_ in print-juniper.c, not used on packet buffer pointer.
An EXTRACT_BE_U_3 in addrtoname.c, not always used on packet buffer
pointer.

1 files changed, 113 insertions, 113 deletions

diff --git a/print-sflow.c b/print-sflow.c
index 78aaafb6..68bca017 100644
--- a/print-sflow.c
+++ b/print-sflow.c
@@ -310,36 +310,36 @@ print_sflow_counter_generic(netdissect_options *ndo,
     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)",
-	   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",
-	   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",
-	   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",
-	   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",
-	   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",
-	   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",
-	   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;
 
@@ -359,21 +359,21 @@ print_sflow_counter_ethernet(netdissect_options *ndo,
     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",
-	   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",
-	   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",
-	   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;
 
@@ -400,27 +400,27 @@ print_sflow_counter_basevg(netdissect_options *ndo,
     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,
-	   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,
-	   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",
-	   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",
-	   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,
-	   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;
 
@@ -441,12 +441,12 @@ print_sflow_counter_vlan(netdissect_options *ndo,
     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",
-	   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;
 
@@ -475,11 +475,11 @@ print_sflow_counter_processor(netdissect_options *ndo,
     ND_TCHECK_SIZE(sflow_processor_counter);
     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;
 
@@ -510,10 +510,10 @@ sflow_print_counter_records(netdissect_options *ndo,
 	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_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",
@@ -582,12 +582,12 @@ sflow_print_counter_sample(netdissect_options *ndo,
     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",
-	   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),
@@ -612,12 +612,12 @@ sflow_print_expanded_counter_sample(netdissect_options *ndo,
     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",
-	   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),
@@ -640,11 +640,11 @@ print_sflow_raw_packet(netdissect_options *ndo,
     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",
-	   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?
        assuming of course there is wnough data present to do so... */
@@ -668,8 +668,8 @@ print_sflow_ethernet_frame(netdissect_options *ndo,
     ND_TCHECK_SIZE(sflow_ethernet_frame);
 
     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;
 
@@ -689,10 +689,10 @@ print_sflow_extended_switch_data(netdissect_options *ndo,
     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",
-	   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;
 
@@ -727,10 +727,10 @@ sflow_print_flow_records(netdissect_options *ndo,
 	/* 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_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",
@@ -803,17 +803,17 @@ sflow_print_flow_sample(netdissect_options *ndo,
     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",
-	   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),
@@ -837,16 +837,16 @@ sflow_print_expanded_flow_sample(netdissect_options *ndo,
     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",
-	   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),
+	   GET_BE_U_4(sflow_expanded_flow_sample->records));
 
     return sflow_print_flow_records(ndo, pointer + sizeof(struct sflow_expanded_flow_sample_t),
 				    len - sizeof(struct sflow_expanded_flow_sample_t),
@@ -877,31 +877,31 @@ sflow_print(netdissect_options *ndo,
     /*
      * 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",
-               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",
-               EXTRACT_BE_U_4(sflow_datagram->version),
-               EXTRACT_BE_U_4(sflow_datagram->ip_version) == 1 ? "IPv4" : "IPv6",
+               GET_BE_U_4(sflow_datagram->version),
+               GET_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->agent_id),
                len);
         return;
     }
 
     /* ok they seem to want to know everything - lets fully decode it */
-    nsamples=EXTRACT_BE_U_4(sflow_datagram->samples);
+    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",
-           EXTRACT_BE_U_4(sflow_datagram->version),
-           EXTRACT_BE_U_4(sflow_datagram->ip_version) == 1 ? "IPv4" : "IPv6",
+           GET_BE_U_4(sflow_datagram->version),
+           GET_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),
+           GET_BE_U_4(sflow_datagram->agent_id),
+           GET_BE_U_4(sflow_datagram->seqnum),
+           GET_BE_U_4(sflow_datagram->uptime),
            nsamples,
            len);
 
@@ -913,8 +913,8 @@ sflow_print(netdissect_options *ndo,
         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))
 	    goto trunc;