diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-10-29 03:12:53 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-03 12:20:34 +0000 |
| commit | 3df2333155abf8fdfdedc51aca0fe962499f10b5 (patch) | |
| tree | f241cb1777aaf99492eeb12c8365c96e705cfe4e | |
| parent | 8571dbb908e13d63a80e6465ea19566162dad9c1 (diff) | |
Remaining ADDRESS macro to address function conversions
Change-Id: I8bc9af431e70243b05f4f0ce8c2b8ee451383788
Reviewed-on: https://code.wireshark.org/review/11463
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
61 files changed, 298 insertions, 292 deletions
diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf index f912b250d8..403b2888c6 100644 --- a/asn1/nbap/nbap.cnf +++ b/asn1/nbap/nbap.cnf @@ -764,7 +764,7 @@ transportFormatSet_type = NBAP_CPCH; umts_fp_conversation_info->channel = CHANNEL_RACH_FDD; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN; @@ -857,7 +857,7 @@ num_items = 1; umts_fp_conversation_info->channel = CHANNEL_PCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; umts_fp_conversation_info->paging_indications = paging_indications; umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN; @@ -966,7 +966,7 @@ transportFormatSet_type = NBAP_CPCH; umts_fp_conversation_info->channel = CHANNEL_FACH_FDD; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN; /*Save unique UE-identifier */ @@ -1173,7 +1173,7 @@ dch_id = 0xFFFFFFFF; umts_fp_conversation_info->channel = CHANNEL_DCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN; @@ -1289,7 +1289,7 @@ BindingID_port = 0; umts_fp_conversation_info->channel = CHANNEL_EDCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; @@ -1462,7 +1462,7 @@ BindingID_port = 0; umts_fp_conversation_info->channel = CHANNEL_EDCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; @@ -1810,7 +1810,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; umts_fp_conversation_info->channel = CHANNEL_HSDSCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port; /*Added june 3, normally just the iterator variable*/ @@ -1927,7 +1927,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; umts_fp_conversation_info->channel = CHANNEL_HSDSCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port; /*Added june 3, normally just the iterator variable*/ @@ -2050,7 +2050,7 @@ int i; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_common_channel_info[i].crnc_address); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_common_channel_info[i].crnc_address); umts_fp_conversation_info->crnc_port = nbap_common_channel_info[i].crnc_port; /*umts_fp_conversation_info->hsdsch_macdflow_id = i ;*/ /*hsdsch_macdflow_ids[i];*/ /* hsdsch_macdflow_id;*/ diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index 6b024a4641..b8646f3d5d 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -374,7 +374,7 @@ static void add_hsdsch_bind(packet_info *pinfo){ umts_fp_conversation_info->channel = CHANNEL_HSDSCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port; /*Added june 3, normally just the iterator variable*/ diff --git a/epan/address.h b/epan/address.h index 8e3c9b6019..f0a42c1eee 100644 --- a/epan/address.h +++ b/epan/address.h @@ -26,6 +26,9 @@ #include <string.h> /* for memcmp */ +#include "tvbuff.h" +#include "wmem/wmem.h" + #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -72,7 +75,7 @@ typedef struct _address { * @param addr_data [in] Pointer to the address data. */ static inline void -set_address(address *addr, int addr_type, int addr_len, const void * addr_data) { +set_address(address *addr, int addr_type, int addr_len, const void *addr_data) { addr->data = addr_data; addr->type = addr_type; addr->len = addr_len; @@ -93,11 +96,13 @@ set_address(address *addr, int addr_type, int addr_len, const void * addr_data) * @param addr_len [in] The length in bytes of the address data. For example, 4 for * AT_IPv4 or sizeof(struct e_in6_addr) for AT_IPv6. */ -#define TVB_SET_ADDRESS(addr, addr_type, tvb, offset, addr_len) \ - do { \ - const void *TVB_SET_ADDRESS_data = (const void *)tvb_get_ptr(tvb, offset, addr_len); \ - set_address((addr), (addr_type), (addr_len), TVB_SET_ADDRESS_data); \ - } while (0) +static inline void +set_address_tvb(address *addr, int addr_type, int addr_len, tvbuff_t *tvb, int offset) { + const void *p; + + p = tvb_get_ptr(tvb, offset, addr_len); + set_address(addr, addr_type, addr_len, p); +} /** Compare two addresses. * @@ -198,16 +203,17 @@ copy_address_shallow(address *to, const address *from) { * @param to [in,out] The destination address. * @param from [in] The source address. */ -#define WMEM_COPY_ADDRESS(scope, to, from) \ - do { \ - void *WMEM_COPY_ADDRESS_data; \ - copy_address_shallow((to), (from)); \ - WMEM_COPY_ADDRESS_data = wmem_alloc(scope, (from)->len); \ - if ((from)->len != 0) \ - memcpy(WMEM_COPY_ADDRESS_data, (from)->data, (from)->len); \ - (to)->data = WMEM_COPY_ADDRESS_data; \ - } while (0) +static inline void +copy_address_wmem(wmem_allocator_t *scope, address *to, const address *from) { + void *to_data; + to->type = from->type; + to->len = from->len; + to_data = wmem_alloc(scope, from->len); + if (from->len != 0) + memcpy(to_data, from->data, from->len); + to->data = to_data; +} /** Hash an address into a hash value (which must already have been set). * diff --git a/epan/address_types.c b/epan/address_types.c index 5e668128c3..29fca975f1 100644 --- a/epan/address_types.c +++ b/epan/address_types.c @@ -1097,7 +1097,7 @@ tvb_address_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, int type, const gint return NULL; } - TVB_SET_ADDRESS(&addr, type, tvb, offset, at->addr_fixed_len()); + set_address_tvb(&addr, type, at->addr_fixed_len(), tvb, offset); return address_to_str(scope, &addr); } @@ -1106,7 +1106,7 @@ gchar* tvb_address_var_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, address_ty { address addr; - TVB_SET_ADDRESS(&addr, type, tvb, offset, length); + set_address_tvb(&addr, type, length, tvb, offset); return address_to_str(scope, &addr); } @@ -1132,7 +1132,7 @@ tvb_address_with_resolution_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, int t return NULL; } - TVB_SET_ADDRESS(&addr, type, tvb, offset, at->addr_fixed_len()); + set_address_tvb(&addr, type, at->addr_fixed_len(), tvb, offset); return address_with_resolution_to_str(scope, &addr); } diff --git a/epan/conversation.c b/epan/conversation.c index f63007a12a..e664bc7cda 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -699,8 +699,8 @@ conversation_new(const guint32 setup_frame, const address *addr1, const address new_key = wmem_new(wmem_file_scope(), struct conversation_key); new_key->next = conversation_keys; conversation_keys = new_key; - WMEM_COPY_ADDRESS(wmem_file_scope(), &new_key->addr1, addr1); - WMEM_COPY_ADDRESS(wmem_file_scope(), &new_key->addr2, addr2); + copy_address_wmem(wmem_file_scope(), &new_key->addr1, addr1); + copy_address_wmem(wmem_file_scope(), &new_key->addr2, addr2); new_key->ptype = ptype; new_key->port1 = port1; new_key->port2 = port2; @@ -789,7 +789,7 @@ conversation_set_addr2(conversation_t *conv, const address *addr) conversation_remove_from_hashtable(conversation_hashtable_no_port2, conv); } conv->options &= ~NO_ADDR2; - WMEM_COPY_ADDRESS(wmem_file_scope(), &conv->key_ptr->addr2, addr); + copy_address_wmem(wmem_file_scope(), &conv->key_ptr->addr2, addr); if (conv->options & NO_PORT2) { conversation_insert_into_hashtable(conversation_hashtable_no_port2, conv); } else { diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c index 7ac2ace877..d29dfd5be8 100644 --- a/epan/dissectors/file-pcapng.c +++ b/epan/dissectors/file-pcapng.c @@ -607,11 +607,11 @@ static gint dissect_options(proto_tree *tree, packet_info *pinfo, break; } proto_tree_add_item(option_tree, hf_pcapng_option_data_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN); - TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4); + set_address_tvb(&addr, AT_IPv4, 4, tvb, offset); offset += 4; proto_tree_add_item(option_tree, hf_pcapng_option_data_ipv4_mask, tvb, offset, 4, ENC_BIG_ENDIAN); - TVB_SET_ADDRESS(&addr_mask, AT_IPv4, tvb, offset, 4); + set_address_tvb(&addr_mask, AT_IPv4, 4, tvb, offset); offset += 4; str = wmem_strdup_printf(wmem_packet_scope(), "%s/%s", @@ -626,7 +626,7 @@ static gint dissect_options(proto_tree *tree, packet_info *pinfo, } proto_tree_add_item(option_tree, hf_pcapng_option_data_ipv6, tvb, offset, 16, ENC_NA); - TVB_SET_ADDRESS(&addr, AT_IPv6, tvb, offset, 16); + set_address_tvb(&addr, AT_IPv6, 16, tvb, offset); offset += 16; proto_tree_add_item(option_tree, hf_pcapng_option_data_ipv6_mask, tvb, offset, 1, ENC_NA); @@ -656,7 +656,7 @@ static gint dissect_options(proto_tree *tree, packet_info *pinfo, } proto_tree_add_item(option_tree, hf_pcapng_option_data_eui_address, tvb, offset, 8, encoding); - TVB_SET_ADDRESS(&addr, AT_EUI64, tvb, offset, 8); + set_address_tvb(&addr, AT_EUI64, 8, tvb, offset); offset += 8; str = address_to_display(wmem_packet_scope(), &addr); @@ -824,7 +824,7 @@ static gint dissect_options(proto_tree *tree, packet_info *pinfo, } proto_tree_add_item(option_tree, hf_pcapng_option_data_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN); - TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4); + set_address_tvb(&addr, AT_IPv4, 4, tvb, offset); offset += 4; str = wmem_strdup_printf(wmem_packet_scope(), "%s", @@ -839,7 +839,7 @@ static gint dissect_options(proto_tree *tree, packet_info *pinfo, } proto_tree_add_item(option_tree, hf_pcapng_option_data_ipv6, tvb, offset, 16, ENC_NA); - TVB_SET_ADDRESS(&addr, AT_IPv6, tvb, offset, 16); + set_address_tvb(&addr, AT_IPv6, 16, tvb, offset); offset += 16; str = wmem_strdup_printf(wmem_packet_scope(), "%s", @@ -1269,7 +1269,7 @@ static gint dissect_block(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, } proto_tree_add_item(record_tree, hf_pcapng_record_ipv4, tvb, offset, 4, ENC_BIG_ENDIAN); - TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4); + set_address_tvb(&addr, AT_IPv4, 4, tvb, offset); offset += 4; offset_string_start = offset; @@ -1295,7 +1295,7 @@ static gint dissect_block(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, } proto_tree_add_item(record_tree, hf_pcapng_record_ipv6, tvb, offset, 16, ENC_NA); - TVB_SET_ADDRESS(&addr, AT_IPv6, tvb, offset, 16); + set_address_tvb(&addr, AT_IPv6, 16, tvb, offset); offset += 16; offset_string_start = offset; diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index ca3261fd9f..82f5e6abdd 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -430,8 +430,8 @@ static aeron_transport_t * aeron_transport_add(const aeron_conversation_info_t * transport->channel_id = aeron_channel_id_assign(); transport->stream = wmem_map_new(wmem_file_scope(), aeron_guint32_hash_func, aeron_guint32_compare_func); transport->last_frame = NULL; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(transport->addr1), cinfo->addr1); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(transport->addr2), cinfo->addr2); + copy_address_wmem(wmem_file_scope(), &(transport->addr1), cinfo->addr1); + copy_address_wmem(wmem_file_scope(), &(transport->addr2), cinfo->addr2); transport->session_id = session_id; transport->port1 = cinfo->port1; transport->port2 = cinfo->port2; @@ -547,7 +547,7 @@ static aeron_stream_rcv_t * aeron_stream_rcv_add(aeron_stream_t * stream, const return (rcv); } rcv = wmem_new0(wmem_file_scope(), aeron_stream_rcv_t); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(rcv->addr), addr); + copy_address_wmem(wmem_file_scope(), &(rcv->addr), addr); rcv->port = port; rcv->completed.term_id = 0; rcv->completed.term_offset = 0; @@ -908,17 +908,17 @@ static aeron_conversation_info_t * aeron_setup_conversation_info(const packet_in case HDR_TYPE_DATA: case HDR_TYPE_SETUP: /* Destination is a receiver */ - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr1, &(pinfo->src)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr1, &(pinfo->src)); cinfo->port1 = pinfo->srcport; - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr2, &(pinfo->dst)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr2, &(pinfo->dst)); cinfo->port2 = pinfo->destport; break; case HDR_TYPE_NAK: case HDR_TYPE_SM: /* Destination is the source */ - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr1, &(pinfo->dst)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr1, &(pinfo->dst)); cinfo->port1 = pinfo->destport; - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr2, &(pinfo->src)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr2, &(pinfo->src)); cinfo->port2 = pinfo->srcport; break; default: @@ -965,17 +965,17 @@ static aeron_conversation_info_t * aeron_setup_conversation_info(const packet_in case HDR_TYPE_DATA: case HDR_TYPE_SETUP: /* Destination is a receiver */ - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr1, &(pinfo->src)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr1, &(pinfo->src)); cinfo->port1 = pinfo->srcport; - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr2, &(pinfo->dst)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr2, &(pinfo->dst)); cinfo->port2 = pinfo->destport; break; case HDR_TYPE_NAK: case HDR_TYPE_SM: /* Destination is the source */ - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr1, &(pinfo->dst)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr1, &(pinfo->dst)); cinfo->port1 = pinfo->destport; - WMEM_COPY_ADDRESS(wmem_packet_scope(), cinfo->addr2, &(pinfo->src)); + copy_address_wmem(wmem_packet_scope(), cinfo->addr2, &(pinfo->src)); cinfo->port2 = pinfo->srcport; break; default: diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c index d7fd29260a..91953012a4 100644 --- a/epan/dissectors/packet-ap1394.c +++ b/epan/dissectors/packet-ap1394.c @@ -72,9 +72,9 @@ dissect_ap1394(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "IP/IEEE1394"); col_clear(pinfo->cinfo, COL_INFO); - TVB_SET_ADDRESS(&pinfo->dl_src, AT_EUI64, tvb, 8, 8); + set_address_tvb(&pinfo->dl_src, AT_EUI64, 8, tvb, 8); copy_address_shallow(&pinfo->src, &pinfo->dl_src); - TVB_SET_ADDRESS(&pinfo->dl_dst, AT_EUI64, tvb, 0, 8); + set_address_tvb(&pinfo->dl_dst, AT_EUI64, 8, tvb, 0); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); if (tree) { diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index 7d16074518..6e9d3fd356 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.c @@ -175,9 +175,9 @@ dissect_arcnet_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, src = tvb_get_guint8 (tvb, 0); dst = tvb_get_guint8 (tvb, 1); - TVB_SET_ADDRESS(&pinfo->dl_src, arcnet_address_type, tvb, 0, 1); + set_address_tvb(&pinfo->dl_src, arcnet_address_type, 1, tvb, 0); copy_address_shallow(&pinfo->src, &pinfo->dl_src); - TVB_SET_ADDRESS(&pinfo->dl_dst, arcnet_address_type, tvb, 1, 1); + set_address_tvb(&pinfo->dl_dst, arcnet_address_type, 1, tvb, 1); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); ti = proto_tree_add_item (tree, proto_arcnet, tvb, 0, -1, ENC_NA); diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c index 1e1cf07ec0..b760b5b472 100644 --- a/epan/dissectors/packet-ax25.c +++ b/epan/dissectors/packet-ax25.c @@ -156,7 +156,7 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree ) ax25_tree = proto_item_add_subtree( ti, ett_ax25 ); proto_tree_add_item( ax25_tree, hf_ax25_dst, tvb, offset, AX25_ADDR_LEN, ENC_NA); - TVB_SET_ADDRESS( &pinfo->dl_dst, AT_AX25, tvb, offset, AX25_ADDR_LEN ); + set_address_tvb(&pinfo->dl_dst, AT_AX25, AX25_ADDR_LEN, tvb, offset); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); dst_ssid = tvb_get_guint8(tvb, offset+6); @@ -164,7 +164,7 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree ) offset += AX25_ADDR_LEN; proto_tree_add_item( ax25_tree, hf_ax25_src, tvb, offset, AX25_ADDR_LEN, ENC_NA); - TVB_SET_ADDRESS( &pinfo->dl_src, AT_AX25, tvb, offset, AX25_ADDR_LEN ); + set_address_tvb(&pinfo->dl_src, AT_AX25, AX25_ADDR_LEN, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->dl_src); src_ssid = tvb_get_guint8(tvb, offset+6); diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c index df3ba7cc58..b9d81b5cad 100644 --- a/epan/dissectors/packet-bat.c +++ b/epan/dissectors/packet-bat.c @@ -251,9 +251,9 @@ static int dissect_bat_batman_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, batman_packeth->seqno = tvb_get_ntohs(tvb, offset+4); batman_packeth->gwport = tvb_get_ntohs(tvb, offset+6); orig = tvb_get_ipv4(tvb, offset+8); - TVB_SET_ADDRESS(&batman_packeth->orig, AT_IPv4, tvb, offset+8, 4); + set_address_tvb(&batman_packeth->orig, AT_IPv4, 4, tvb, offset+8); old_orig = tvb_get_ipv4(tvb, offset+12); - TVB_SET_ADDRESS(&batman_packeth->old_orig, AT_IPv4, tvb, offset+12, 4); + set_address_tvb(&batman_packeth->old_orig, AT_IPv4, 4, tvb, offset+12); batman_packeth->tq = tvb_get_guint8(tvb, offset+16); batman_packeth->hna_len = tvb_get_guint8(tvb, offset+17); @@ -457,7 +457,7 @@ static void dissect_bat_vis_v22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t vis_packeth = wmem_new(wmem_packet_scope(), struct vis_packet_v22); sender_ip = tvb_get_ipv4(tvb, 0); - TVB_SET_ADDRESS(&vis_packeth->sender_ip, AT_IPv4, tvb, 0, 4); + set_address_tvb(&vis_packeth->sender_ip, AT_IPv4, 4, tvb, 0); vis_packeth->version = tvb_get_guint8(tvb, 4); vis_packeth->gw_class = tvb_get_guint8(tvb, 5); vis_packeth->tq_max = tvb_get_ntohs(tvb, 6); @@ -534,7 +534,7 @@ static void dissect_vis_entry_v22(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t vis_datah->type = tvb_get_guint8(tvb, 0); vis_datah->data = tvb_get_ntohs(tvb, 1); ip = tvb_get_ipv4(tvb, 3); - TVB_SET_ADDRESS(&vis_datah->ip, AT_IPv4, tvb, 3, 4); + set_address_tvb(&vis_datah->ip, AT_IPv4, 4, tvb, 3); /* Set tree info */ @@ -578,7 +578,7 @@ static void dissect_bat_vis_v23(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t vis_packeth = wmem_new(wmem_packet_scope(), struct vis_packet_v23); sender_ip = tvb_get_ipv4(tvb, 0); - TVB_SET_ADDRESS(&vis_packeth->sender_ip, AT_IPv4, tvb, 0, 4); + set_address_tvb(&vis_packeth->sender_ip, AT_IPv4, 4, tvb, 0); vis_packeth->version = tvb_get_guint8(tvb, 4); vis_packeth->gw_class = tvb_get_guint8(tvb, 5); vis_packeth->tq_max = tvb_get_guint8(tvb, 6); @@ -655,7 +655,7 @@ static void dissect_vis_entry_v23(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t vis_datah->type = tvb_get_guint8(tvb, 0); vis_datah->data = tvb_get_guint8(tvb, 1); ip = tvb_get_ipv4(tvb, 2); - TVB_SET_ADDRESS(&vis_datah->ip, AT_IPv4, tvb, 2, 4); + set_address_tvb(&vis_datah->ip, AT_IPv4, 4, tvb, 2); /* Set tree info */ diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index 4289ada91a..3122c8a406 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -1055,10 +1055,10 @@ static int dissect_batadv_batman_v5(tvbuff_t *tvb, int offset, packet_info *pinf batman_packeth->gwflags = tvb_get_guint8(tvb, offset+4); batman_packeth->tq = tvb_get_guint8(tvb, offset+5); batman_packeth->seqno = tvb_get_ntohs(tvb, offset+6); - TVB_SET_ADDRESS(&batman_packeth->orig, AT_ETHER, tvb, offset+8, 6); + set_address_tvb(&batman_packeth->orig, AT_ETHER, 6, tvb, offset+8); copy_address_shallow(&pinfo->dl_src, &batman_packeth->orig); copy_address_shallow(&pinfo->src, &batman_packeth->orig); - TVB_SET_ADDRESS(&batman_packeth->prev_sender, AT_ETHER, tvb, offset+14, 6); + set_address_tvb(&batman_packeth->prev_sender, AT_ETHER, 6, tvb, offset+14); batman_packeth->num_tt = tvb_get_guint8(tvb, offset+20); batman_packeth->pad = tvb_get_guint8(tvb, offset+21); @@ -1151,10 +1151,10 @@ static int dissect_batadv_batman_v7(tvbuff_t *tvb, int offset, packet_info *pinf batman_packeth->flags = tvb_get_guint8(tvb, offset+2); batman_packeth->tq = tvb_get_guint8(tvb, offset+3); batman_packeth->seqno = tvb_get_ntohs(tvb, offset+4); - TVB_SET_ADDRESS(&batman_packeth->orig, AT_ETHER, tvb, offset+6, 6); + set_address_tvb(&batman_packeth->orig, AT_ETHER, 6, tvb, offset+6); copy_address_shallow(&pinfo->dl_src, &batman_packeth->orig); copy_address_shallow(&pinfo->src, &batman_packeth->orig); - TVB_SET_ADDRESS(&batman_packeth->prev_sender, AT_ETHER, tvb, offset+12, 6); + set_address_tvb(&batman_packeth->prev_sender, AT_ETHER, 6, tvb, offset+12); batman_packeth->ttl = tvb_get_guint8(tvb, offset+18); batman_packeth->num_tt = tvb_get_guint8(tvb, offset+19); @@ -1240,10 +1240,10 @@ static int dissect_batadv_batman_v9(tvbuff_t *tvb, int offset, packet_info *pinf batman_packeth->flags = tvb_get_guint8(tvb, offset+2); batman_packeth->tq = tvb_get_guint8(tvb, offset+3); batman_packeth->seqno = tvb_get_ntohs(tvb, offset+4); - TVB_SET_ADDRESS(&batman_packeth->orig, AT_ETHER, tvb, offset+6, 6); + set_address_tvb(&batman_packeth->orig, AT_ETHER, 6, tvb, offset+6); copy_address_shallow(&pinfo->dl_src, &batman_packeth->orig); copy_address_shallow(&pinfo->src, &batman_packeth->orig); - TVB_SET_ADDRESS(&batman_packeth->prev_sender, AT_ETHER, tvb, offset+12, 6); + set_address_tvb(&batman_packeth->prev_sender, AT_ETHER, 6, tvb, offset+12); batman_packeth->ttl = tvb_get_guint8(tvb, offset+18); batman_packeth->num_tt = tvb_get_guint8(tvb, offset+19); batman_packeth->gwflags = tvb_get_guint8(tvb, offset+20); @@ -1337,10 +1337,10 @@ static int dissect_batadv_batman_v10(tvbuff_t *tvb, int offset, packet_info *pin batman_packeth->flags = tvb_get_guint8(tvb, offset+2); batman_packeth->tq = tvb_get_guint8(tvb, offset+3); batman_packeth->seqno = tvb_get_ntohl(tvb, offset+4); - TVB_SET_ADDRESS(&batman_packeth->orig, AT_ETHER, tvb, offset+8, 6); + set_address_tvb(&batman_packeth->orig, AT_ETHER, 6, tvb, offset+8); copy_address_shallow(&pinfo->dl_src, &batman_packeth->orig); copy_address_shallow(&pinfo->src, &batman_packeth->orig); - TVB_SET_ADDRESS(&batman_packeth->prev_sender, AT_ETHER, tvb, offset+14, 6); + set_address_tvb(&batman_packeth->prev_sender, AT_ETHER, 6, tvb, offset+14); batman_packeth->ttl = tvb_get_guint8(tvb, offset+20); batman_packeth->num_tt = tvb_get_guint8(tvb, offset+21); batman_packeth->gwflags = tvb_get_guint8(tvb, offset+22); @@ -1433,10 +1433,10 @@ static int dissect_batadv_batman_v11(tvbuff_t *tvb, int offset, packet_info *pin batman_packeth->flags = tvb_get_guint8(tvb, offset+2); batman_packeth->tq = tvb_get_guint8(tvb, offset+3); batman_packeth->seqno = tvb_get_ntohl(tvb, offset+4); - TVB_SET_ADDRESS(&batman_packeth->orig, AT_ETHER, tvb, offset+8, 6); + set_address_tvb(&batman_packeth->orig, AT_ETHER, 6, tvb, offset+8); copy_address_shallow(&pinfo->dl_src, &batman_packeth->orig); copy_address_shallow(&pinfo->src, &batman_packeth->orig); - TVB_SET_ADDRESS(&batman_packeth->prev_sender, AT_ETHER, tvb, offset+14, 6); + set_address_tvb(&batman_packeth->prev_sender, AT_ETHER, 6, tvb, offset+14); batman_packeth->ttl = tvb_get_guint8(tvb, offset+20); batman_packeth->num_tt = tvb_get_guint8(tvb, offset+21); @@ -1523,10 +1523,10 @@ static int dissect_batadv_batman_v14(tvbuff_t *tvb, int offset, packet_info *pin batman_packeth->ttl = tvb_get_guint8(tvb, offset+2); batman_packeth->flags = tvb_get_guint8(tvb, offset+3); batman_packeth->seqno = tvb_get_ntohl(tvb, offset+4); - TVB_SET_ADDRESS(&batman_packeth->orig, AT_ETHER, tvb, offset+8, 6); + set_address_tvb(&batman_packeth->orig, AT_ETHER, 6, tvb, offset+8); copy_address_shallow(&pinfo->dl_src, &batman_packeth->orig); copy_address_shallow(&pinfo->src, &batman_packeth->orig); - TVB_SET_ADDRESS(&batman_packeth->prev_sender, AT_ETHER, tvb, offset+14, 6); + set_address_tvb(&batman_packeth->prev_sender, AT_ETHER, 6, tvb, offset+14); batman_packeth->gw_flags = tvb_get_guint8(tvb, offset+20); batman_packeth->tq = tvb_get_guint8(tvb, offset+21); batman_packeth->tt_num_changes = tvb_get_guint8(tvb, offset+22); @@ -1700,14 +1700,14 @@ static int dissect_batadv_iv_ogm_v15(tvbuff_t *tvb, int offset, offset, 4, ENC_BIG_ENDIAN); offset += 4; - TVB_SET_ADDRESS(&iv_ogm_packeth->orig, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, offset, 6); - TVB_SET_ADDRESS(&pinfo->src, AT_ETHER, tvb, offset, 6); + set_address_tvb(&iv_ogm_packeth->orig, AT_ETHER, 6, tvb, offset); + set_address_tvb(&pinfo->dl_src, AT_ETHER, 6, tvb, offset); + set_address_tvb(&pinfo->src, AT_ETHER, 6, tvb, offset); proto_tree_add_item(batadv_iv_ogm_tree, hf_batadv_iv_ogm_orig, tvb, offset, 6, ENC_NA); offset += 6; - TVB_SET_ADDRESS(&iv_ogm_packeth->prev_sender, AT_ETHER, tvb, offset, 6); + set_address_tvb(&iv_ogm_packeth->prev_sender, AT_ETHER, 6, tvb, offset); proto_tree_add_item(batadv_iv_ogm_tree, hf_batadv_iv_ogm_prev_sender, tvb, offset, 6, ENC_NA); offset += 6; @@ -1801,7 +1801,7 @@ static void dissect_batadv_bcast_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tre bcast_packeth = (struct bcast_packet_v6 *)wmem_alloc(wmem_packet_scope(), sizeof(struct bcast_packet_v6)); bcast_packeth->version = tvb_get_guint8(tvb, 1); - TVB_SET_ADDRESS(&bcast_packeth->orig, AT_ETHER, tvb, 2, 6); + set_address_tvb(&bcast_packeth->orig, AT_ETHER, 6, tvb, 2); copy_address_shallow(&pinfo->dl_src, &bcast_packeth->orig); copy_address_shallow(&pinfo->src, &bcast_packeth->orig); bcast_packeth->seqno = tvb_get_ntohs(tvb, 8); @@ -1858,7 +1858,7 @@ static void dissect_batadv_bcast_v10(tvbuff_t *tvb, packet_info *pinfo, proto_tr bcast_packeth = (struct bcast_packet_v10 *)wmem_alloc(wmem_packet_scope(), sizeof(struct bcast_packet_v10)); bcast_packeth->version = tvb_get_guint8(tvb, 1); - TVB_SET_ADDRESS(&bcast_packeth->orig, AT_ETHER, tvb, 2, 6); + set_address_tvb(&bcast_packeth->orig, AT_ETHER, 6, tvb, 2); copy_address_shallow(&pinfo->dl_src, &bcast_packeth->orig); copy_address_shallow(&pinfo->src, &bcast_packeth->orig); bcast_packeth->ttl = tvb_get_guint8(tvb, 8); @@ -1924,7 +1924,7 @@ static void dissect_batadv_bcast_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tr bcast_packeth->ttl = tvb_get_guint8(tvb, 2); bcast_packeth->reserved = tvb_get_guint8(tvb, 3); bcast_packeth->seqno = tvb_get_ntohl(tvb, 4); - TVB_SET_ADDRESS(&bcast_packeth->orig, AT_ETHER, tvb, 8, 6); + set_address_tvb(&bcast_packeth->orig, AT_ETHER, 6, tvb, 8); copy_address_shallow(&pinfo->dl_src, &bcast_packeth->orig); copy_address_shallow(&pinfo->src, &bcast_packeth->orig); @@ -2024,8 +2024,8 @@ static void dissect_batadv_icmp_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tree icmp_packeth->version = tvb_get_guint8(tvb, 1); icmp_packeth->msg_type = tvb_get_guint8(tvb, 2); - TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, 3, 6); - TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, 9, 6); + set_address_tvb(&icmp_packeth->dst, AT_ETHER, 6, tvb, 3); + set_address_tvb(&icmp_packeth->orig, AT_ETHER, 6, tvb, 9); copy_address_shallow(&pinfo->dl_src, &icmp_packeth->orig); copy_address_shallow(&pinfo->src, &icmp_packeth->orig); @@ -2152,8 +2152,8 @@ static void dissect_batadv_icmp_v7(tvbuff_t *tvb, packet_info *pinfo, proto_tree icmp_packeth->version = tvb_get_guint8(tvb, 1); icmp_packeth->msg_type = tvb_get_guint8(tvb, 2); icmp_packeth->ttl = tvb_get_guint8(tvb, 3); - TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, 4, 6); - TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, 10, 6); + set_address_tvb(&icmp_packeth->dst, AT_ETHER, 6, tvb, 4); + set_address_tvb(&icmp_packeth->orig, AT_ETHER, 6, tvb, 10); copy_address_shallow(&pinfo->dl_src, &icmp_packeth->orig); copy_address_shallow(&pinfo->src, &icmp_packeth->orig); @@ -2234,8 +2234,8 @@ static void dissect_batadv_icmp_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tre icmp_packeth->version = tvb_get_guint8(tvb, 1); icmp_packeth->ttl = tvb_get_guint8(tvb, 2); icmp_packeth->msg_type = tvb_get_guint8(tvb, 3); - TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, 4, 6); - TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, 10, 6); + set_address_tvb(&icmp_packeth->dst, AT_ETHER, 6, tvb, 4); + set_address_tvb(&icmp_packeth->orig, AT_ETHER, 6, tvb, 10); copy_address_shallow(&pinfo->dl_src, &icmp_packeth->orig); copy_address_shallow(&pinfo->src, &icmp_packeth->orig); @@ -2361,7 +2361,7 @@ static void dissect_batadv_icmp_v15(tvbuff_t *tvb, packet_info *pinfo, offset, 1, ENC_BIG_ENDIAN); offset += 1; - TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, offset, 6); + set_address_tvb(&icmp_packeth->dst, AT_ETHER, 6, tvb, offset); copy_address_shallow(&pinfo->dl_dst, &icmp_packeth->dst); copy_address_shallow(&pinfo->dst, &icmp_packeth->dst); @@ -2369,7 +2369,7 @@ static void dissect_batadv_icmp_v15(tvbuff_t *tvb, packet_info *pinfo, 6, ENC_NA); offset += 6; - TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, offset, 6); + set_address_tvb(&icmp_packeth->orig, AT_ETHER, 6, tvb, offset); copy_address_shallow(&pinfo->dl_src, &icmp_packeth->orig); copy_address_shallow(&pinfo->src, &icmp_packeth->orig); proto_tree_add_item(batadv_icmp_tree, hf_batadv_icmp_orig, tvb, offset, @@ -2450,7 +2450,7 @@ static void dissect_batadv_unicast_v6(tvbuff_t *tvb, packet_info *pinfo, proto_t unicast_packeth = (struct unicast_packet_v6 *)wmem_alloc(wmem_packet_scope(), sizeof(struct unicast_packet_v6)); unicast_packeth->version = tvb_get_guint8(tvb, 1); - TVB_SET_ADDRESS(&unicast_packeth->dest, AT_ETHER, tvb, 2, 6); + set_address_tvb(&unicast_packeth->dest, AT_ETHER, 6, tvb, 2); copy_address_shallow(&pinfo->dl_dst, &unicast_packeth->dest); copy_address_shallow(&pinfo->dst, &unicast_packeth->dest); @@ -2512,7 +2512,7 @@ static void dissect_batadv_unicast_v14(tvbuff_t *tvb, packet_info *pinfo, proto_ unicast_packeth->version = tvb_get_guint8(tvb, 1); unicast_packeth->ttl = tvb_get_guint8(tvb, 2); unicast_packeth->ttvn = tvb_get_guint8(tvb, 3); - TVB_SET_ADDRESS(&unicast_packeth->dest, AT_ETHER, tvb, 4, 6); + set_address_tvb(&unicast_packeth->dest, AT_ETHER, 6, tvb, 4); copy_address_shallow(&pinfo->dl_dst, &unicast_packeth->dest); copy_address_shallow(&pinfo->dst, &unicast_packeth->dest); @@ -2599,11 +2599,11 @@ static void dissect_batadv_unicast_4addr_v14(tvbuff_t *tvb, packet_info *pinfo, unicast_4addr_packeth->version = tvb_get_guint8(tvb, 1); unicast_4addr_packeth->ttl = tvb_get_guint8(tvb, 2); unicast_4addr_packeth->ttvn = tvb_get_guint8(tvb, 3); - TVB_SET_ADDRESS(&unicast_4addr_packeth->dest, AT_ETHER, tvb, 4, 6); + set_address_tvb(&unicast_4addr_packeth->dest, AT_ETHER, 6, tvb, 4); copy_address_shallow(&pinfo->dl_dst, &unicast_4addr_packeth->dest); copy_address_shallow(&pinfo->dst, &unicast_4addr_packeth->dest); - TVB_SET_ADDRESS(&unicast_4addr_packeth->src, AT_ETHER, tvb, 10, 6); + set_address_tvb(&unicast_4addr_packeth->src, AT_ETHER, 6, tvb, 10); copy_address_shallow(&pinfo->dl_src, &unicast_4addr_packeth->src); copy_address_shallow(&pinfo->src, &unicast_4addr_packeth->src); unicast_4addr_packeth->subtype = tvb_get_guint8(tvb, 16); @@ -2707,12 +2707,12 @@ static void dissect_batadv_unicast_frag_v12(tvbuff_t *tvb, packet_info *pinfo, p unicast_frag_packeth = (struct unicast_frag_packet_v12 *)wmem_alloc(wmem_packet_scope(), sizeof(struct unicast_frag_packet_v12)); unicast_frag_packeth->version = tvb_get_guint8(tvb, 1); - TVB_SET_ADDRESS(&unicast_frag_packeth->dest, AT_ETHER, tvb, 2, 6); + set_address_tvb(&unicast_frag_packeth->dest, AT_ETHER, 6, tvb, 2); copy_address_shallow(&pinfo->dl_dst, &unicast_frag_packeth->dest); copy_address_shallow(&pinfo->dst, &unicast_frag_packeth->dest); unicast_frag_packeth->ttl = tvb_get_guint8(tvb, 8); unicast_frag_packeth->flags = tvb_get_guint8(tvb, 9); - TVB_SET_ADDRESS(&unicast_frag_packeth->orig, AT_ETHER, tvb, 10, 6); + set_address_tvb(&unicast_frag_packeth->orig, AT_ETHER, 6, tvb, 10); copy_address_shallow(&pinfo->dl_src, &unicast_frag_packeth->orig); copy_address_shallow(&pinfo->src, &unicast_frag_packeth->orig); unicast_frag_packeth->seqno = tvb_get_ntohs(tvb, 16); @@ -2801,12 +2801,12 @@ static void dissect_batadv_unicast_frag_v14(tvbuff_t *tvb, packet_info *pinfo, p unicast_frag_packeth->version = tvb_get_guint8(tvb, 1); unicast_frag_packeth->ttl = tvb_get_guint8(tvb, 2); unicast_frag_packeth->ttvn = tvb_get_guint8(tvb, 3); - TVB_SET_ADDRESS(&unicast_frag_packeth->dest, AT_ETHER, tvb, 4, 6); + set_address_tvb(&unicast_frag_packeth->dest, AT_ETHER, 6, tvb, 4); copy_address_shallow(&pinfo->dl_dst, &unicast_frag_packeth->dest); copy_address_shallow(&pinfo->dst, &unicast_frag_packeth->dest); unicast_frag_packeth->flags = tvb_get_guint8(tvb, 10); unicast_frag_packeth->align = tvb_get_guint8(tvb, 11); - TVB_SET_ADDRESS(&unicast_frag_packeth->orig, AT_ETHER, tvb, 12, 6); + set_address_tvb(&unicast_frag_packeth->orig, AT_ETHER, 6, tvb, 12); copy_address_shallow(&pinfo->dl_src, &unicast_frag_packeth->orig); copy_address_shallow(&pinfo->src, &unicast_frag_packeth->orig); unicast_frag_packeth->seqno = tvb_get_ntohs(tvb, 18); @@ -2945,14 +2945,14 @@ static void dissect_batadv_unicast_frag_v15(tvbuff_t *tvb, packet_info *pinfo, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - TVB_SET_ADDRESS(&unicast_frag_packeth->dest, AT_ETHER, tvb, offset, 6); + set_address_tvb(&unicast_frag_packeth->dest, AT_ETHER, 6, tvb, offset); copy_address_shallow(&pinfo->dl_dst, &unicast_frag_packeth->dest); copy_address_shallow(&pinfo->dst, &unicast_frag_packeth->dest); proto_tree_add_item(batadv_unicast_frag_tree, hf_batadv_unicast_frag_dst, tvb, offset, 6, ENC_NA); offset += 6; - TVB_SET_ADDRESS(&unicast_frag_packeth->orig, AT_ETHER, tvb, offset, 6); + set_address_tvb(&unicast_frag_packeth->orig, AT_ETHER, 6, tvb, offset); copy_address_shallow(&pinfo->dl_src, &unicast_frag_packeth->orig); copy_address_shallow(&pinfo->src, &unicast_frag_packeth->orig); proto_tree_add_item(batadv_unicast_frag_tree, hf_batadv_unicast_frag_orig, @@ -3053,12 +3053,12 @@ static void dissect_batadv_vis_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tree vis_packeth->entries = tvb_get_guint8(tvb, 4); vis_packeth->ttl = tvb_get_guint8(tvb, 5); - TVB_SET_ADDRESS(&vis_packeth->vis_orig, AT_ETHER, tvb, 6, 6); + set_address_tvb(&vis_packeth->vis_orig, AT_ETHER, 6, tvb, 6); copy_address_shallow(&pinfo->src, &vis_packeth->vis_orig); - TVB_SET_ADDRESS(&vis_packeth->target_orig, AT_ETHER, tvb, 12, 6); + set_address_tvb(&vis_packeth->target_orig, AT_ETHER, 6, tvb, 12); copy_address_shallow(&pinfo->dl_dst, &vis_packeth->target_orig); copy_address_shallow(&pinfo->dst, &vis_packeth->target_orig); - TVB_SET_ADDRESS(&vis_packeth->sender_orig, AT_ETHER, tvb, 18, 6); + set_address_tvb(&vis_packeth->sender_orig, AT_ETHER, 6, tvb, 18); copy_address_shallow(&pinfo->dl_src, &vis_packeth->sender_orig); @@ -3172,12 +3172,12 @@ static void dissect_batadv_vis_v10(tvbuff_t *tvb, packet_info *pinfo, proto_tree vis_packeth->seqno = tvb_get_ntohl(tvb, 4); vis_packeth->ttl = tvb_get_guint8(tvb, 8); - TVB_SET_ADDRESS(&vis_packeth->vis_orig, AT_ETHER, tvb, 9, 6); + set_address_tvb(&vis_packeth->vis_orig, AT_ETHER, 6, tvb, 9); copy_address_shallow(&pinfo->src, &vis_packeth->vis_orig); - TVB_SET_ADDRESS(&vis_packeth->target_orig, AT_ETHER, tvb, 15, 6); + set_address_tvb(&vis_packeth->target_orig, AT_ETHER, 6, tvb, 15); copy_address_shallow(&pinfo->dl_dst, &vis_packeth->target_orig); copy_address_shallow(&pinfo->dst, &vis_packeth->target_orig); - TVB_SET_ADDRESS(&vis_packeth->sender_orig, AT_ETHER, tvb, 21, 6); + set_address_tvb(&vis_packeth->sender_orig, AT_ETHER, 6, tvb, 21); copy_address_shallow(&pinfo->dl_src, &vis_packeth->sender_orig); @@ -3268,12 +3268,12 @@ static void dissect_batadv_vis_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tree vis_packeth->entries = tvb_get_guint8(tvb, 8); vis_packeth->reserved = tvb_get_guint8(tvb, 9); - TVB_SET_ADDRESS(&vis_packeth->vis_orig, AT_ETHER, tvb, 10, 6); + set_address_tvb(&vis_packeth->vis_orig, AT_ETHER, 6, tvb, 10); copy_address_shallow(&pinfo->src, &vis_packeth->vis_orig); - TVB_SET_ADDRESS(&vis_packeth->target_orig, AT_ETHER, tvb, 16, 6); + set_address_tvb(&vis_packeth->target_orig, AT_ETHER, 6, tvb, 16); copy_address_shallow(&pinfo->dl_dst, &vis_packeth->target_orig); copy_address_shallow(&pinfo->dst, &vis_packeth->target_orig); - TVB_SET_ADDRESS(&vis_packeth->sender_orig, AT_ETHER, tvb, 22, 6); + set_address_tvb(&vis_packeth->sender_orig, AT_ETHER, 6, tvb, 22); copy_address_shallow(&pinfo->dl_src, &vis_packeth->sender_orig); /* Set info column */ @@ -3412,11 +3412,11 @@ static void dissect_batadv_tt_query_v14(tvbuff_t *tvb, packet_info *pinfo _U_, p tt_query_packeth->ttl = tvb_get_guint8(tvb, 2); tt_query_packeth->flags = tvb_get_guint8(tvb, 3); - TVB_SET_ADDRESS(&tt_query_packeth->dst, AT_ETHER, tvb, 4, 6); + set_address_tvb(&tt_query_packeth->dst, AT_ETHER, 6, tvb, 4); copy_address_shallow(&pinfo->dl_dst, &tt_query_packeth->dst); copy_address_shallow(&pinfo->dst, &tt_query_packeth->dst); - TVB_SET_ADDRESS(&tt_query_packeth->src, AT_ETHER, tvb, 10, 6); + set_address_tvb(&tt_query_packeth->src, AT_ETHER, 6, tvb, 10); copy_address_shallow(&pinfo->dl_src, &tt_query_packeth->src); copy_address_shallow(&pinfo->src, &tt_query_packeth->src); @@ -3558,13 +3558,13 @@ static void dissect_batadv_roam_adv_v14(tvbuff_t *tvb, packet_info *pinfo, proto roam_adv_packeth->version = tvb_get_guint8(tvb, 1); roam_adv_packeth->ttl = tvb_get_guint8(tvb, 2); - TVB_SET_ADDRESS(&roam_adv_packeth->dst, AT_ETHER, tvb, 4, 6); + set_address_tvb(&roam_adv_packeth->dst, AT_ETHER, 6, tvb, 4); copy_address_shallow(&pinfo->dl_dst, &roam_adv_packeth->dst); copy_address_shallow(&pinfo->dst, &roam_adv_packeth->dst); - TVB_SET_ADDRESS(&roam_adv_packeth->src, AT_ETHER, tvb, 10, 6); + set_address_tvb(&roam_adv_packeth->src, AT_ETHER, 6, tvb, 10); copy_address_shallow(&pinfo->dl_src, &roam_adv_packeth->src); copy_address_shallow(&pinfo->src, &roam_adv_packeth->src); - TVB_SET_ADDRESS(&roam_adv_packeth->client, AT_ETHER, tvb, 16, 6); + set_address_tvb(&roam_adv_packeth->client, AT_ETHER, 6, tvb, 16); /* Set info column */ col_add_fstr(pinfo->cinfo, COL_INFO, "Client %s", address_with_resolution_to_str(wmem_packet_scope(), &roam_adv_packeth->client)); @@ -3684,14 +3684,14 @@ static void dissect_batadv_coded_v15(tvbuff_t *tvb, packet_info *pinfo, offset, 1, ENC_BIG_ENDIAN); offset += 1; - TVB_SET_ADDRESS(&coded_packeth->first_source, AT_ETHER, tvb, offset, 6); + set_address_tvb(&coded_packeth->first_source, AT_ETHER, 6, tvb, offset); copy_address_shallow(&pinfo->dl_src, &coded_packeth->first_source); copy_address_shallow(&pinfo->src, &coded_packeth->first_source); proto_tree_add_item(batadv_coded_tree, hf_batadv_coded_first_source, tvb, offset, 6, ENC_NA); offset += 6; - TVB_SET_ADDRESS(&coded_packeth->first_orig_dest, AT_ETHER, tvb, offset, 6); + set_address_tvb(&coded_packeth->first_orig_dest, AT_ETHER, 6, tvb, offset); copy_address_shallow(&pinfo->dl_dst, &coded_packeth->first_orig_dest); copy_address_shallow(&pinfo->dst, &coded_packeth->first_orig_dest); proto_tree_add_item(batadv_coded_tree, hf_batadv_coded_first_orig_dest, @@ -3713,17 +3713,17 @@ static void dissect_batadv_coded_v15(tvbuff_t *tvb, packet_info *pinfo, offset, 1, ENC_BIG_ENDIAN); offset += 1; - TVB_SET_ADDRESS(&coded_packeth->second_dest, AT_ETHER, tvb, offset, 6); + set_address_tvb(&coded_packeth->second_dest, AT_ETHER, 6, tvb, offset); proto_tree_add_item(batadv_coded_tree, hf_batadv_coded_second_dest, tvb, offset, 6, ENC_NA); offset += 6; - TVB_SET_ADDRESS(&coded_packeth->second_source, AT_ETHER, tvb, offset, 6); + set_address_tvb(&coded_packeth->second_source, AT_ETHER, 6, tvb, offset); proto_tree_add_item(batadv_coded_tree, hf_batadv_coded_second_source, tvb, offset, 6, ENC_NA); offset += 6; - TVB_SET_ADDRESS(&coded_packeth->second_orig_dest, AT_ETHER, tvb, offset, 6); + set_address_tvb(&coded_packeth->second_orig_dest, AT_ETHER, 6, tvb, offset); proto_tree_add_item(batadv_coded_tree, hf_batadv_coded_second_orig_dest, tvb, offset, 6, ENC_NA); offset += 6; @@ -3825,14 +3825,14 @@ static void dissect_batadv_unicast_tvlv_v15(tvbuff_t *tvb, packet_info *pinfo, /* Skip 1 byte of padding. */ offset += 1; - TVB_SET_ADDRESS(&unicast_tvlv_packeth->dest, AT_ETHER, tvb, offset, 6); + set_address_tvb(&unicast_tvlv_packeth->dest, AT_ETHER, 6, tvb, offset); copy_address_shallow(&pinfo->dl_dst, &unicast_tvlv_packeth->dest); copy_address_shallow(&pinfo->dst, &unicast_tvlv_packeth->dest); proto_tree_add_item(batadv_unicast_tvlv_tree, hf_batadv_unicast_tvlv_dst, tvb, offset, 6, ENC_NA); offset += 6; - TVB_SET_ADDRESS(&unicast_tvlv_packeth->src, AT_ETHER, tvb, offset, 6); + set_address_tvb(&unicast_tvlv_packeth->src, AT_ETHER, 6, tvb, offset); copy_address_shallow(&pinfo->dl_src, &unicast_tvlv_packeth->src); copy_address_shallow(&pinfo->src, &unicast_tvlv_packeth->src); proto_tree_add_item(batadv_unicast_tvlv_tree, hf_batadv_unicast_tvlv_src, diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index feb2384d1f..34fe2ffec9 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.c @@ -316,7 +316,7 @@ dissect_btbnep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ if (extension_flag) col_append_str(pinfo->cinfo, COL_INFO, "+E"); if (bnep_type == BNEP_TYPE_GENERAL_ETHERNET || bnep_type == BNEP_TYPE_COMPRESSED_ETHERNET_DESTINATION_ONLY) { - TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, offset, 6); + set_address_tvb(&pinfo->dl_dst, AT_ETHER, 6, tvb, offset); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); addr_item = proto_tree_add_item(btbnep_tree, hf_btbnep_dst, tvb, offset, 6, ENC_NA); @@ -328,7 +328,7 @@ dissect_btbnep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ } if (bnep_type == BNEP_TYPE_GENERAL_ETHERNET || bnep_type == BNEP_TYPE_COMPRESSED_ETHERNET_SOURCE_ONLY) { - TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, offset, 6); + set_address_tvb(&pinfo->dl_src, AT_ETHER, 6, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->dl_src); addr_item = proto_tree_add_item(btbnep_tree, hf_btbnep_src, tvb, offset, 6, ENC_NA); diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 21475e2a72..27137cc4be 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -2599,9 +2599,9 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (source_addr_offset != 0) { proto_item *addr_ti; - TVB_SET_ADDRESS(&pinfo->net_src, + set_address_tvb(&pinfo->net_src, (source_addr_length == 4) ? AT_IPv4 : AT_IPv6, - tvb, source_addr_offset, source_addr_length); + source_addr_length, tvb, source_addr_offset); copy_address_shallow(&pinfo->src, &pinfo->net_src); proto_tree_add_item(ipprim_tree, @@ -2640,9 +2640,9 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (dest_addr_offset != 0) { proto_item *addr_ti; - TVB_SET_ADDRESS(&pinfo->net_dst, + set_address_tvb(&pinfo->net_dst, (dest_addr_length == 4) ? AT_IPv4 : AT_IPv6, - tvb, dest_addr_offset, dest_addr_length); + dest_addr_length, tvb, dest_addr_offset); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); proto_tree_add_item(ipprim_tree, (dest_addr_length == 4) ? @@ -2749,9 +2749,9 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (dest_addr_offset != 0) { proto_item *addr_ti; - TVB_SET_ADDRESS(&pinfo->net_dst, + set_address_tvb(&pinfo->net_dst, (dest_addr_length == 4) ? AT_IPv4 : AT_IPv6, - tvb, dest_addr_offset, dest_addr_length); + dest_addr_length, tvb, dest_addr_offset); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); proto_tree_add_item(sctpprim_tree, (dest_addr_length == 4) ? diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index cafacf9a05..a83689238d 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -1552,9 +1552,9 @@ c_pkt_data_init(c_pkt_data *d, packet_info *pinfo, guint off) /* Note: Server sends banner first. */ - WMEM_COPY_ADDRESS(wmem_file_scope(), &d->convd->server.addr, &pinfo->src); + copy_address_wmem(wmem_file_scope(), &d->convd->server.addr, &pinfo->src); d->convd->server.port = pinfo->srcport; - WMEM_COPY_ADDRESS(wmem_file_scope(), &d->convd->client.addr, &pinfo->dst); + copy_address_wmem(wmem_file_scope(), &d->convd->client.addr, &pinfo->dst); d->convd->client.port = pinfo->destport; conversation_add_proto_data(d->conv, proto_ceph, d->convd); } diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index fa8f949eab..91fab30562 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -389,7 +389,7 @@ dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } nsel = tvb_get_guint8(tvb, offset + dst_len - 1); - TVB_SET_ADDRESS(&pinfo->net_dst, get_osi_address_type(), tvb, offset, dst_len); + set_address_tvb(&pinfo->net_dst, get_osi_address_type(), dst_len, tvb, offset); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); proto_tree_add_bytes_format_value(clnp_tree, hf_clnp_dest, tvb, offset, dst_len, NULL, @@ -425,7 +425,7 @@ dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) FIXED_PART_LEN + 1 + dst_len + 1 + src_len); return; } - TVB_SET_ADDRESS(&pinfo->net_src, get_osi_address_type(), tvb, offset, src_len); + set_address_tvb(&pinfo->net_src, get_osi_address_type(), src_len, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->net_src); proto_tree_add_bytes_format_value(clnp_tree, hf_clnp_src, tvb, offset, src_len, diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index 3b7fa2016d..985fb544c2 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -1401,8 +1401,8 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason) { /* Try to match corresponding message */ dmp_key->id = (guint) dmp.subj_id; - WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->src, &(pinfo->dst)); - WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->dst, &(pinfo->src)); + copy_address_wmem(wmem_file_scope(), &dmp_key->src, &(pinfo->dst)); + copy_address_wmem(wmem_file_scope(), &dmp_key->dst, &(pinfo->src)); dmp_data = (dmp_id_val *) g_hash_table_lookup (dmp_id_hash_table, dmp_key); @@ -1419,12 +1419,12 @@ static void register_dmp_id (packet_info *pinfo, guint8 reason) if (dmp.msg_type == ACK) { dmp_key->id = (guint) dmp.subj_id; - WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->src, &(pinfo->dst)); - WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->dst, &(pinfo->src)); + copy_address_wmem(wmem_file_scope(), &dmp_key->src, &(pinfo->dst)); + copy_address_wmem(wmem_file_scope(), &dmp_key->dst, &(pinfo->src)); } else { dmp_key->id = (guint) dmp.msg_id; - WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->src, &(pinfo->src)); - WMEM_COPY_ADDRESS(wmem_file_scope(), &dmp_key->dst, &(pinfo->dst)); + copy_address_wmem(wmem_file_scope(), &dmp_key->src, &(pinfo->src)); + copy_address_wmem(wmem_file_scope(), &dmp_key->dst, &(pinfo->dst)); } dmp_data = (dmp_id_val *) g_hash_table_lookup (dmp_id_hash_table, dmp_key); diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index fad80ef0ed..04e689fe8a 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -312,13 +312,13 @@ dissect_eth_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, col_set_str(pinfo->cinfo, COL_PROTOCOL, "Ethernet"); - TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, 0, 6); + set_address_tvb(&pinfo->dl_dst, AT_ETHER, 6, tvb, 0); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); copy_address_shallow(&ehdr->dst, &pinfo->dl_dst); dst_addr = (const guint8*)pinfo->dst.data; dst_addr_name = get_ether_name(dst_addr); - TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, 6, 6); + set_address_tvb(&pinfo->dl_src, AT_ETHER, 6, tvb, 6); copy_address_shallow(&pinfo->src, &pinfo->dl_src); copy_address_shallow(&ehdr->src, &pinfo->dl_src); src_addr = (const guint8*)pinfo->src.data; diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c index 25545588e0..fac79199ee 100644 --- a/epan/dissectors/packet-exported_pdu.c +++ b/epan/dissectors/packet-exported_pdu.c @@ -131,22 +131,22 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case EXP_PDU_TAG_IPV4_SRC: proto_tree_add_item(tag_tree, hf_exported_pdu_ipv4_src, tvb, offset, 4, ENC_BIG_ENDIAN); - TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv4, tvb, offset, 4); + set_address_tvb(&pinfo->net_src, AT_IPv4, 4, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->net_src); break; case EXP_PDU_TAG_IPV4_DST: proto_tree_add_item(tag_tree, hf_exported_pdu_ipv4_dst, tvb, offset, 4, ENC_BIG_ENDIAN); - TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv4, tvb, offset, 4); + set_address_tvb(&pinfo->net_dst, AT_IPv4, 4, tvb, offset); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); break; case EXP_PDU_TAG_IPV6_SRC: proto_tree_add_item(tag_tree, hf_exported_pdu_ipv6_src, tvb, offset, 16, ENC_NA); - TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv6, tvb, offset, 16); + set_address_tvb(&pinfo->net_src, AT_IPv6, 16, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->net_src); break; case EXP_PDU_TAG_IPV6_DST: proto_tree_add_item(tag_tree, hf_exported_pdu_ipv6_dst, tvb, offset, 16, ENC_NA); - TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv6, tvb, offset, 16); + set_address_tvb(&pinfo->net_dst, AT_IPv6, 16, tvb, offset); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); break; case EXP_PDU_TAG_PORT_TYPE: diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 284e8fccde..671e5b1627 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -747,8 +747,8 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean * will use ip addresses instead and still work. */ if(!is_ifcp){ - TVB_SET_ADDRESS (&pinfo->dst, AT_FC, tvb, offset+1, 3); - TVB_SET_ADDRESS (&pinfo->src, AT_FC, tvb, offset+5, 3); + set_address_tvb (&pinfo->dst, AT_FC, 3, tvb, offset+1); + set_address_tvb (&pinfo->src, AT_FC, 3, tvb, offset+5); pinfo->srcport=0; pinfo->destport=0; } diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 9ba6022f2a..6d74bfc7b2 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -1532,7 +1532,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, if (http_type == HTTP_RESPONSE && pinfo->desegment_offset<=0 && pinfo->desegment_len<=0) { conv_data->upgrade = headers.upgrade; conv_data->startframe = pinfo->fd->num + 1; - WMEM_COPY_ADDRESS(wmem_file_scope(), &conv_data->server_addr, &pinfo->src); + copy_address_wmem(wmem_file_scope(), &conv_data->server_addr, &pinfo->src); conv_data->server_port = pinfo->srcport; } diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index 7b981f99f6..a1fa4731b7 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -1283,7 +1283,7 @@ static guint32 dissect_ies(tvbuff_t *tvb, packet_info *pinfo, guint32 offset, ie_data->peer_port = tvb_get_ntohs(tvb, offset+4); /* the ip address is big-endian, but then so is peer_address.data */ - TVB_SET_ADDRESS(&ie_data->peer_address, AT_IPv4, tvb, offset+6, 4); + set_address_tvb(&ie_data->peer_address, AT_IPv4, 4, tvb, offset+6); break; default: diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 48eb4c0afd..0b6d1759e9 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -16372,7 +16372,7 @@ set_src_addr_cols(packet_info *pinfo, tvbuff_t *tvb, int offset, const char *typ { address ether_addr; - TVB_SET_ADDRESS(ðer_addr, AT_ETHER, tvb, offset, 6); + set_address_tvb(ðer_addr, AT_ETHER, 6, tvb, offset); col_add_fstr(pinfo->cinfo, COL_RES_DL_SRC, "%s (%s)", address_with_resolution_to_str(wmem_packet_scope(), ðer_addr), type); @@ -16383,7 +16383,7 @@ set_dst_addr_cols(packet_info *pinfo, tvbuff_t *tvb, int offset, const char *typ { address ether_addr; - TVB_SET_ADDRESS(ðer_addr, AT_ETHER, tvb, offset, 6); + set_address_tvb(ðer_addr, AT_ETHER, 6, tvb, offset); col_add_fstr(pinfo->cinfo, COL_RES_DL_DST, "%s (%s)", address_with_resolution_to_str(wmem_packet_scope(), ðer_addr), type); @@ -16697,13 +16697,13 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, /* * All management frame types have the same header. */ - TVB_SET_ADDRESS(&pinfo->dl_src, wlan_address_type, tvb, 10, 6); + set_address_tvb(&pinfo->dl_src, wlan_address_type, 6, tvb, 10); copy_address_shallow(&pinfo->src, &pinfo->dl_src); - TVB_SET_ADDRESS(&pinfo->dl_dst, wlan_address_type, tvb, 4, 6); + set_address_tvb(&pinfo->dl_dst, wlan_address_type, 6, tvb, 4); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); /* for tap */ - TVB_SET_ADDRESS(&whdr->bssid, wlan_bssid_address_type, tvb, 16, 6); + set_address_tvb(&whdr->bssid, wlan_bssid_address_type, 6, tvb, 16); copy_address_shallow(&whdr->src, &pinfo->dl_src); copy_address_shallow(&whdr->dst, &pinfo->dl_dst); @@ -17365,13 +17365,13 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, - TVB_SET_ADDRESS(&pinfo->dl_src, wlan_address_type, tvb, sa_offset, 6); + set_address_tvb(&pinfo->dl_src, wlan_address_type, 6, tvb, sa_offset); copy_address_shallow(&pinfo->src, &pinfo->dl_src); - TVB_SET_ADDRESS(&pinfo->dl_dst, wlan_address_type, tvb, da_offset, 6); + set_address_tvb(&pinfo->dl_dst, wlan_address_type, 6, tvb, da_offset); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); /* for tap */ - TVB_SET_ADDRESS(&whdr->bssid, wlan_bssid_address_type, tvb, bssid_offset, 6); + set_address_tvb(&whdr->bssid, wlan_bssid_address_type, 6, tvb, bssid_offset); copy_address_shallow(&whdr->src, &pinfo->dl_src); copy_address_shallow(&whdr->dst, &pinfo->dl_dst); diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 7dcaa95b7e..c2214c9ca0 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -744,7 +744,7 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g ieee_hints->dst16 = packet->dst16; } - TVB_SET_ADDRESS(&pinfo->dl_dst, ieee802_15_4_short_address_type, tvb, offset, 2); + set_address_tvb(&pinfo->dl_dst, ieee802_15_4_short_address_type, 2, tvb, offset); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); if (tree) { @@ -838,7 +838,7 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g } } - TVB_SET_ADDRESS(&pinfo->dl_src, ieee802_15_4_short_address_type, tvb, offset, 2); + set_address_tvb(&pinfo->dl_src, ieee802_15_4_short_address_type, 2, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->dl_src); /* Add the addressing info to the tree. */ diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index b7ab4f64e8..26dbe5f670 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -1674,12 +1674,12 @@ skip_lrh: proto_tree_add_item(global_route_header_tree, hf_infiniband_source_gid, tvb, offset, 16, ENC_NA); /* set source GID in packet view*/ - TVB_SET_ADDRESS(&pinfo->src, AT_IB, tvb, offset, GID_SIZE); + set_address_tvb(&pinfo->src, AT_IB, GID_SIZE, tvb, offset); offset += 16; proto_tree_add_item(global_route_header_tree, hf_infiniband_destination_gid, tvb, offset, 16, ENC_NA); /* set destination GID in packet view*/ - TVB_SET_ADDRESS(&pinfo->dst, AT_IB, tvb, offset, GID_SIZE); + set_address_tvb(&pinfo->dst, AT_IB, GID_SIZE, tvb, offset); offset += 16; packetLength -= 40; /* Shave 40 bytes for GRH */ @@ -4967,11 +4967,11 @@ skip_lrh: offset += 2; /* Set source GID in packet view. */ - TVB_SET_ADDRESS(&pinfo->src, AT_IB, tvb, offset, GID_SIZE); + set_address_tvb(&pinfo->src, AT_IB, GID_SIZE, tvb, offset); offset += 16; /* Set destination GID in packet view. */ - TVB_SET_ADDRESS(&pinfo->dst, AT_IB, tvb, offset, GID_SIZE); + set_address_tvb(&pinfo->dst, AT_IB, GID_SIZE, tvb, offset); offset += 16; if (nxtHdr != 0x1B) diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 899fe1760d..ed4f73cb48 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -2282,7 +2282,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } } src32 = tvb_get_ntohl(tvb, offset + IPH_SRC); - TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv4, tvb, offset + IPH_SRC, 4); + set_address_tvb(&pinfo->net_src, AT_IPv4, 4, tvb, offset + IPH_SRC); copy_address_shallow(&pinfo->src, &pinfo->net_src); copy_address_shallow(&iph->ip_src, &pinfo->src); if (tree) { @@ -2324,7 +2324,7 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) dst_off = 0; dst32 = tvb_get_ntohl(tvb, offset + IPH_DST + dst_off); - TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv4, tvb, offset + IPH_DST + dst_off, 4); + set_address_tvb(&pinfo->net_dst, AT_IPv4, 4, tvb, offset + IPH_DST + dst_off); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); copy_address_shallow(&iph->ip_dst, &pinfo->net_dst); diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 254c80e959..556aeb11ab 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -1286,7 +1286,7 @@ dissect_opts(tvbuff_t *tvb, int offset, proto_tree *tree, packet_info *pinfo, co } proto_tree_add_item(opt_tree, hf_ipv6_opt_mipv6_home_address, tvb, offset, 16, ENC_NA); - TVB_SET_ADDRESS(&pinfo->src, AT_IPv6, tvb, offset, 16); + set_address_tvb(&pinfo->src, AT_IPv6, 16, tvb, offset); offset += 16; break; } @@ -2051,9 +2051,9 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Get extension header and payload length */ plen = g_ntohs(ipv6->ip6_plen); - TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv6, tvb, offset + IP6H_SRC, 16); + set_address_tvb(&pinfo->net_src, AT_IPv6, 16, tvb, offset + IP6H_SRC); copy_address_shallow(&pinfo->src, &pinfo->net_src); - TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv6, tvb, offset + IP6H_DST, 16); + set_address_tvb(&pinfo->net_dst, AT_IPv6, 16, tvb, offset + IP6H_DST); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); ipv6_info = wmem_new0(wmem_packet_scope(), ipv6_meta_t); diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index 38e76c8a35..6188c81ddd 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -332,10 +332,10 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Adjust the tvbuff length to include only the IPX datagram. */ set_actual_length(tvb, ipxh->ipx_length); - TVB_SET_ADDRESS(&pinfo->net_src, AT_IPX, tvb, 18, 10); + set_address_tvb(&pinfo->net_src, AT_IPX, 10, tvb, 18); copy_address_shallow(&pinfo->src, &pinfo->net_src); copy_address_shallow(&ipxh->ipx_src, &pinfo->net_src); - TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPX, tvb, 6, 10); + set_address_tvb(&pinfo->net_dst, AT_IPX, 10, tvb, 6); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); copy_address_shallow(&ipxh->ipx_dst, &pinfo->net_dst); diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 540f61f51c..ca315fd3df 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -2863,7 +2863,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ if (addresses_equal(&decr->initiator, &null_addr)) { /* XXX - We assume that we're seeing the second packet in an exchange here. * Is there a way to verify this? */ - WMEM_COPY_ADDRESS(wmem_file_scope(), &decr->initiator, &pinfo->src); + copy_address_wmem(wmem_file_scope(), &decr->initiator, &pinfo->src); } decr_data = decr; diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 3a69017bb7..39737b9d01 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -602,7 +602,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /* The initiator welcome frame */ tpt_conv_data->tpt_ptype = pinfo->ptype; tpt_conv_data->initiator_welcome_frame = pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); + copy_address_wmem(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); tpt_conv_data->initiator_tpt_port = pinfo->srcport; welcome_addr = &tpt_conv_data->initiator_address; @@ -615,7 +615,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tpt_conv_data->receiver_tpt_port = tpt_conv_data->initiator_tpt_port; tpt_conv_data->receiver_address = tpt_conv_data->initiator_address; tpt_conv_data->initiator_welcome_frame = pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); + copy_address_wmem(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); tpt_conv_data->initiator_tpt_port = pinfo->srcport; welcome_addr = &tpt_conv_data->initiator_address; @@ -624,7 +624,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /* The receiver welcome frame */ tpt_conv_data->tpt_ptype = pinfo->ptype; tpt_conv_data->receiver_welcome_frame = pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->receiver_tpt_address, &pinfo->src); + copy_address_wmem(wmem_file_scope(), &tpt_conv_data->receiver_tpt_address, &pinfo->src); tpt_conv_data->receiver_tpt_port = pinfo->srcport; welcome_addr = &tpt_conv_data->receiver_address; @@ -765,14 +765,14 @@ static jxta_stream_conversation_data *get_tpt_conversation(packet_info * pinfo) tpt_conv_data = wmem_new(wmem_file_scope(), jxta_stream_conversation_data); tpt_conv_data->tpt_ptype = pinfo->ptype; - WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); + copy_address_wmem(wmem_file_scope(), &tpt_conv_data->initiator_tpt_address, &pinfo->src); tpt_conv_data->initiator_tpt_port = pinfo->srcport; tpt_conv_data->initiator_welcome_frame = 0; tpt_conv_data->initiator_address.type = AT_NONE; tpt_conv_data->initiator_address.len = 0; tpt_conv_data->initiator_address.data = NULL; - WMEM_COPY_ADDRESS(wmem_file_scope(), &tpt_conv_data->receiver_tpt_address, &pinfo->dst); + copy_address_wmem(wmem_file_scope(), &tpt_conv_data->receiver_tpt_address, &pinfo->dst); tpt_conv_data->receiver_tpt_port = pinfo->destport; tpt_conv_data->receiver_welcome_frame = 0; tpt_conv_data->receiver_address.type = AT_NONE; diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index cc0293c40f..dbb7f681c2 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -2343,8 +2343,8 @@ process_l2tpv3_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int tunnel = &tmp_tunnel; memset(tunnel, 0, sizeof(l2tpv3_tunnel_t)); tunnel->conv = l2tp_conv; - WMEM_COPY_ADDRESS(wmem_file_scope(), &tunnel->lcce1, &pinfo->src); - WMEM_COPY_ADDRESS(wmem_file_scope(), &tunnel->lcce2, &pinfo->dst); + copy_address_wmem(wmem_file_scope(), &tunnel->lcce1, &pinfo->src); + copy_address_wmem(wmem_file_scope(), &tunnel->lcce2, &pinfo->dst); } } } diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index 8f7126eb13..81a3239ad3 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -279,9 +279,9 @@ static lbm_istream_substream_entry_t * lbm_stream_istream_substream_add(lbm_istr return (entry); } entry = wmem_new(wmem_file_scope(), lbm_istream_substream_entry_t); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->src_addr), src_addr); + copy_address_wmem(wmem_file_scope(), &(entry->src_addr), src_addr); entry->src_port = src_port; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->dst_addr), dst_addr); + copy_address_wmem(wmem_file_scope(), &(entry->dst_addr), dst_addr); entry->dst_port = dst_port; entry->lbm_stream_id = stream_id; entry->parent = stream; @@ -418,10 +418,10 @@ static lbm_dstream_entry_t * lbm_stream_dstream_add(const lbm_uim_stream_destina } entry = wmem_new(wmem_file_scope(), lbm_dstream_entry_t); entry->domain_1 = endpoint_a->domain; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->addr_1), &(endpoint_a->addr)); + copy_address_wmem(wmem_file_scope(), &(entry->addr_1), &(endpoint_a->addr)); entry->port_1 = endpoint_a->port; entry->domain_2 = endpoint_b->domain; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->addr_2), &(endpoint_b->addr)); + copy_address_wmem(wmem_file_scope(), &(entry->addr_2), &(endpoint_b->addr)); entry->port_2 = endpoint_b->port; lbm_stream_order_dstream_key(entry); entry->channel = lbm_channel_assign(LBM_CHANNEL_STREAM_TCP); @@ -488,9 +488,9 @@ static lbm_dstream_substream_entry_t * lbm_stream_dstream_substream_add(lbm_dstr return (entry); } entry = wmem_new(wmem_file_scope(), lbm_dstream_substream_entry_t); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->src_addr), src_addr); + copy_address_wmem(wmem_file_scope(), &(entry->src_addr), src_addr); entry->src_port = src_port; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->dst_addr), dst_addr); + copy_address_wmem(wmem_file_scope(), &(entry->dst_addr), dst_addr); entry->dst_port = dst_port; entry->lbm_stream_id = stream_id; entry->parent = stream; @@ -6156,7 +6156,7 @@ static lbmc_message_entry_t * lbmc_message_create(guint64 channel, const address } entry = wmem_new(wmem_file_scope(), lbmc_message_entry_t); entry->channel = channel; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->addr), dest_address); + copy_address_wmem(wmem_file_scope(), &(entry->addr), dest_address); entry->port = port; entry->first_sqn = info->first_sqn; entry->fragment_count = 0; @@ -9733,10 +9733,10 @@ static int dissect_nhdr_destination(tvbuff_t * tvb, int offset, packet_info * pi { info->set = TRUE; info->endpoint_a.domain = tvb_get_ntohl(tvb, offset + O_LBMC_DESTINATION_HDR_T_DOMAIN_ID); - TVB_SET_ADDRESS(&(info->endpoint_a.addr), AT_IPv4, tvb, offset + O_LBMC_DESTINATION_HDR_T_IPADDR, L_LBMC_DESTINATION_HDR_T_IPADDR); + set_address_tvb(&(info->endpoint_a.addr), AT_IPv4, L_LBMC_DESTINATION_HDR_T_IPADDR, tvb, offset + O_LBMC_DESTINATION_HDR_T_IPADDR); info->endpoint_a.port = tvb_get_ntohs(tvb, offset + O_LBMC_DESTINATION_HDR_T_PORT); info->endpoint_b.domain = tvb_get_ntohl(tvb, offset + O_LBMC_DESTINATION_HDR_T_ORIG_DOMAIN_ID); - TVB_SET_ADDRESS(&(info->endpoint_b.addr), AT_IPv4, tvb, offset + O_LBMC_DESTINATION_HDR_T_ORIG_IPADDR, L_LBMC_DESTINATION_HDR_T_ORIG_IPADDR); + set_address_tvb(&(info->endpoint_b.addr), AT_IPv4, L_LBMC_DESTINATION_HDR_T_ORIG_IPADDR, tvb, offset + O_LBMC_DESTINATION_HDR_T_ORIG_IPADDR); info->endpoint_b.port = tvb_get_ntohs(tvb, offset + O_LBMC_DESTINATION_HDR_T_ORIG_PORT); } return (L_LBMC_DESTINATION_HDR_T); diff --git a/epan/dissectors/packet-lbmpdmtcp.c b/epan/dissectors/packet-lbmpdmtcp.c index 3f09b0ef13..d9db12d4b2 100644 --- a/epan/dissectors/packet-lbmpdmtcp.c +++ b/epan/dissectors/packet-lbmpdmtcp.c @@ -100,9 +100,9 @@ static lbmtcp_transport_t * lbmtcp_transport_add(const address * address1, guint return (entry); } entry = wmem_new(wmem_file_scope(), lbmtcp_transport_t); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->addr1), address1); + copy_address_wmem(wmem_file_scope(), &(entry->addr1), address1); entry->port1 = port1; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->addr2), address2); + copy_address_wmem(wmem_file_scope(), &(entry->addr2), address2); entry->port2 = port2; lbmtcp_order_key(entry); entry->channel = lbm_channel_assign(LBM_CHANNEL_TCP); diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index 956721ac0a..89dd0d0db6 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -264,7 +264,7 @@ static lbtrdma_transport_t * lbtrdma_transport_add(const address * source_addres return (entry); } entry = wmem_new(wmem_file_scope(), lbtrdma_transport_t); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->source_address), source_address); + copy_address_wmem(wmem_file_scope(), &(entry->source_address), source_address); entry->session_id = session_id; entry->port = port; entry->channel = lbm_channel_assign(LBM_CHANNEL_TRANSPORT_LBTRDMA); @@ -3954,7 +3954,7 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr lbtrm_item = proto_tree_add_item(tree, hf_lbmr_tir_lbtrm, tvb, offset, (gint)transport_len, ENC_NA); lbtrm_tree = proto_item_add_subtree(lbtrm_item, ett_lbmr_tir_lbtrm); - TVB_SET_ADDRESS(&multicast_group, AT_IPv4, tvb, offset + O_LBMR_TIR_LBTRM_T_MCAST_ADDR, L_LBMR_TIR_LBTRM_T_MCAST_ADDR); + set_address_tvb(&multicast_group, AT_IPv4, L_LBMR_TIR_LBTRM_T_MCAST_ADDR, tvb, offset + O_LBMR_TIR_LBTRM_T_MCAST_ADDR); session_id = tvb_get_ntohl(tvb, offset + O_LBMR_TIR_LBTRM_T_SESSION_ID); udp_dest_port = tvb_get_ntohs(tvb, offset + O_LBMR_TIR_LBTRM_T_UDP_DEST_PORT); src_ucast_port = tvb_get_ntohs(tvb, offset + O_LBMR_TIR_LBTRM_T_SRC_UCAST_PORT); @@ -4054,7 +4054,7 @@ static int dissect_lbmr_tir_transport(tvbuff_t * tvb, int offset, lbm_uint8_t tr expert_add_info_format(pinfo, transport_len_item, &ei_lbmr_analysis_length_incorrect, "Wrong transport length for LBMR TIR LBTRDMA info"); return (0); } - TVB_SET_ADDRESS(&source_addr, AT_IPv4, tvb, offset + O_LBMR_TIR_LBTRDMA_T_IP, L_LBMR_TIR_LBTRDMA_T_IP); + set_address_tvb(&source_addr, AT_IPv4, L_LBMR_TIR_LBTRDMA_T_IP, tvb, offset + O_LBMR_TIR_LBTRDMA_T_IP); session_id = tvb_get_ntohl(tvb, offset + O_LBMR_TIR_LBTRDMA_T_SESSION_ID); port = tvb_get_ntohs(tvb, offset + O_LBMR_TIR_LBTRDMA_T_PORT); proto_tree_add_item(lbtrdma_tree, hf_lbmr_tir_lbtrdma_ip, tvb, offset + O_LBMR_TIR_LBTRDMA_T_IP, L_LBMR_TIR_LBTRDMA_T_IP, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-lbtrm.c b/epan/dissectors/packet-lbtrm.c index 5ee8ae2e64..135301c4c8 100644 --- a/epan/dissectors/packet-lbtrm.c +++ b/epan/dissectors/packet-lbtrm.c @@ -156,10 +156,10 @@ lbtrm_transport_t * lbtrm_transport_add(const address * source_address, guint16 return (entry); } entry = wmem_new(wmem_file_scope(), lbtrm_transport_t); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->source_address), source_address); + copy_address_wmem(wmem_file_scope(), &(entry->source_address), source_address); entry->source_port = source_port; entry->session_id = session_id; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->multicast_group), multicast_group); + copy_address_wmem(wmem_file_scope(), &(entry->multicast_group), multicast_group); entry->dest_port = dest_port; entry->channel = lbm_channel_assign(LBM_CHANNEL_TRANSPORT_LBTRM); entry->frame = wmem_tree_new(wmem_file_scope()); diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c index 86107c7709..149c0ed1a7 100644 --- a/epan/dissectors/packet-lbtru.c +++ b/epan/dissectors/packet-lbtru.c @@ -114,7 +114,7 @@ lbtru_transport_t * lbtru_transport_add(const address * source_address, guint16 return (entry); } entry = wmem_new(wmem_file_scope(), lbtru_transport_t); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->source_address), source_address); + copy_address_wmem(wmem_file_scope(), &(entry->source_address), source_address); entry->source_port = source_port; entry->session_id = session_id; entry->channel = lbm_channel_assign(LBM_CHANNEL_TRANSPORT_LBTRU); @@ -163,7 +163,7 @@ static lbtru_client_transport_t * lbtru_client_transport_add(lbtru_transport_t * return (entry); } entry = wmem_new0(wmem_file_scope(), lbtru_client_transport_t); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->receiver_address), receiver_address); + copy_address_wmem(wmem_file_scope(), &(entry->receiver_address), receiver_address); entry->receiver_port = receiver_port; entry->transport = transport; entry->id = transport->next_client_id++; diff --git a/epan/dissectors/packet-lbttcp.c b/epan/dissectors/packet-lbttcp.c index 60c9b3aff3..b67f2e7eee 100644 --- a/epan/dissectors/packet-lbttcp.c +++ b/epan/dissectors/packet-lbttcp.c @@ -76,7 +76,7 @@ static lbttcp_transport_t * lbttcp_transport_create(const address * source_addre lbttcp_transport_t * transport = NULL; transport = wmem_new(wmem_file_scope(), lbttcp_transport_t); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(transport->source_address), source_address); + copy_address_wmem(wmem_file_scope(), &(transport->source_address), source_address); transport->source_port = source_port; transport->session_id = session_id; transport->channel = lbm_channel_assign(LBM_CHANNEL_TRANSPORT_LBTTCP); @@ -154,7 +154,7 @@ static lbttcp_client_transport_t * lbttcp_client_transport_add(lbttcp_transport_ return (entry); } entry = wmem_new(wmem_file_scope(), lbttcp_client_transport_t); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(entry->receiver_address), receiver_address); + copy_address_wmem(wmem_file_scope(), &(entry->receiver_address), receiver_address); entry->receiver_port = receiver_port; entry->id = transport->next_client_id++; diff --git a/epan/dissectors/packet-logcat.c b/epan/dissectors/packet-logcat.c index 11f269e279..d1e3d581e7 100644 --- a/epan/dissectors/packet-logcat.c +++ b/epan/dissectors/packet-logcat.c @@ -158,7 +158,7 @@ dissect_logcat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ string_length = tvb_strsize(tvb, offset); proto_tree_add_item(maintree, hf_logcat_tag, tvb, offset, string_length, ENC_ASCII | ENC_NA); - TVB_SET_ADDRESS(&pinfo->src, AT_STRINGZ, tvb, offset, string_length + 1); + set_address_tvb(&pinfo->src, AT_STRINGZ, string_length + 1, tvb, offset); set_address(&pinfo->dst, AT_STRINGZ, 7, "Logcat"); offset += string_length; diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c index 3067a965ca..c611b06ecb 100644 --- a/epan/dissectors/packet-mstp.c +++ b/epan/dissectors/packet-mstp.c @@ -354,9 +354,9 @@ dissect_mstp_wtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) #endif /* set the MS/TP MAC address in the source/destination */ - TVB_SET_ADDRESS(&pinfo->dl_dst, mstp_address_type, tvb, offset+3, 1); + set_address_tvb(&pinfo->dl_dst, mstp_address_type, 1, tvb, offset+3); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); - TVB_SET_ADDRESS(&pinfo->dl_src, mstp_address_type, tvb, offset+4, 1); + set_address_tvb(&pinfo->dl_src, mstp_address_type, 1, tvb, offset+4); copy_address_shallow(&pinfo->src, &pinfo->dl_src); #ifdef BACNET_MSTP_SUMMARY_IN_TREE diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 31434b1f8d..91880f6e11 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -18670,7 +18670,7 @@ BindingID_port = 0; umts_fp_conversation_info->channel = CHANNEL_EDCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; @@ -23362,7 +23362,7 @@ int i; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_common_channel_info[i].crnc_address); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_common_channel_info[i].crnc_address); umts_fp_conversation_info->crnc_port = nbap_common_channel_info[i].crnc_port; /*umts_fp_conversation_info->hsdsch_macdflow_id = i ;*/ /*hsdsch_macdflow_ids[i];*/ /* hsdsch_macdflow_id;*/ @@ -23814,7 +23814,7 @@ dissect_nbap_HSDSCH_FDD_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ umts_fp_conversation_info->channel = CHANNEL_HSDSCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port; /*Added june 3, normally just the iterator variable*/ @@ -24152,7 +24152,7 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn umts_fp_conversation_info->channel = CHANNEL_HSDSCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port; /*Added june 3, normally just the iterator variable*/ @@ -28682,7 +28682,7 @@ dch_id = 0xFFFFFFFF; umts_fp_conversation_info->channel = CHANNEL_DCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN; @@ -28828,7 +28828,7 @@ BindingID_port = 0; umts_fp_conversation_info->channel = CHANNEL_EDCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; @@ -32388,7 +32388,7 @@ transportFormatSet_type = NBAP_CPCH; umts_fp_conversation_info->channel = CHANNEL_FACH_FDD; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN; /*Save unique UE-identifier */ @@ -32553,7 +32553,7 @@ num_items = 1; umts_fp_conversation_info->channel = CHANNEL_PCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; umts_fp_conversation_info->paging_indications = paging_indications; umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN; @@ -32696,7 +32696,7 @@ transportFormatSet_type = NBAP_CPCH; umts_fp_conversation_info->channel = CHANNEL_RACH_FDD; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = actx->pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &dst_addr); umts_fp_conversation_info->crnc_port = BindingID_port; umts_fp_conversation_info->rlc_mode = FP_RLC_MODE_UNKNOWN; @@ -55228,7 +55228,7 @@ static void add_hsdsch_bind(packet_info *pinfo){ umts_fp_conversation_info->channel = CHANNEL_HSDSCH; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = pinfo->fd->num; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &nbap_hsdsch_channel_info[i].crnc_address); umts_fp_conversation_info->crnc_port = nbap_hsdsch_channel_info[i].crnc_port; /*Added june 3, normally just the iterator variable*/ diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index e40dc439cc..1dfe064991 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -5716,28 +5716,28 @@ dissect_v9_v10_pdu_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdutree, case VENDOR_CACE << 16 | 0: /* caceLocalIPv4Address */ ti = proto_tree_add_item(pdutree, hf_pie_cace_local_ipv4_address, tvb, offset, length, ENC_BIG_ENDIAN); - TVB_SET_ADDRESS(&local_addr, AT_IPv4, tvb, offset, 4); + set_address_tvb(&local_addr, AT_IPv4, 4, tvb, offset); got_flags |= GOT_LOCAL_ADDR; break; case VENDOR_CACE << 16 | 1: /* caceRemoteIPv4Address */ ti = proto_tree_add_item(pdutree, hf_pie_cace_remote_ipv4_address, tvb, offset, length, ENC_BIG_ENDIAN); - TVB_SET_ADDRESS(&remote_addr, AT_IPv4, tvb, offset, 4); + set_address_tvb(&remote_addr, AT_IPv4, 4, tvb, offset); got_flags |= GOT_REMOTE_ADDR; break; case VENDOR_CACE << 16 | 2: /* caceLocalIPv6Address */ ti = proto_tree_add_item(pdutree, hf_pie_cace_local_ipv6_address, tvb, offset, length, ENC_NA); - TVB_SET_ADDRESS(&local_addr, AT_IPv6, tvb, offset, 16); + set_address_tvb(&local_addr, AT_IPv6, 16, tvb, offset); got_flags |= GOT_LOCAL_ADDR; break; case VENDOR_CACE << 16 | 3: /* caceRemoteIPv6Address */ ti = proto_tree_add_item(pdutree, hf_pie_cace_remote_ipv6_address, tvb, offset, length, ENC_NA); - TVB_SET_ADDRESS(&remote_addr, AT_IPv6, tvb, offset, 16); + set_address_tvb(&remote_addr, AT_IPv6, 16, tvb, offset); got_flags |= GOT_REMOTE_ADDR; break; @@ -7172,8 +7172,8 @@ dissect_v9_v10_options_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *p if ((tmplt_p == NULL) && (tmplt.fields_p[TF_SCOPES] || tmplt.fields_p[TF_ENTRIES])) { /* create permanent template copy for storage in template table */ tmplt_p = (v9_v10_tmplt_t *)wmem_memdup(wmem_file_scope(), &tmplt, sizeof(tmplt)); - WMEM_COPY_ADDRESS(wmem_file_scope(), &tmplt_p->src_addr, &pinfo->net_src); - WMEM_COPY_ADDRESS(wmem_file_scope(), &tmplt_p->dst_addr, &pinfo->net_dst); + copy_address_wmem(wmem_file_scope(), &tmplt_p->src_addr, &pinfo->net_src); + copy_address_wmem(wmem_file_scope(), &tmplt_p->dst_addr, &pinfo->net_dst); /* Remember when we saw this template */ tmplt_p->template_frame_number = pinfo->fd->num; /* Add completed entry into table */ @@ -7272,8 +7272,8 @@ dissect_v9_v10_data_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdut /* create permanent template copy for storage in template table */ tmplt_p = (v9_v10_tmplt_t *)wmem_memdup(wmem_file_scope(), &tmplt, sizeof(tmplt)); - WMEM_COPY_ADDRESS(wmem_file_scope(), &tmplt_p->src_addr, &pinfo->net_src); - WMEM_COPY_ADDRESS(wmem_file_scope(), &tmplt_p->dst_addr, &pinfo->net_dst); + copy_address_wmem(wmem_file_scope(), &tmplt_p->src_addr, &pinfo->net_src); + copy_address_wmem(wmem_file_scope(), &tmplt_p->dst_addr, &pinfo->net_dst); /* Remember when we saw this template */ tmplt_p->template_frame_number = pinfo->fd->num; g_hash_table_insert(v9_v10_tmplt_table, tmplt_p, tmplt_p); diff --git a/epan/dissectors/packet-netrom.c b/epan/dissectors/packet-netrom.c index e4a1c96325..22ebf2b874 100644 --- a/epan/dissectors/packet-netrom.c +++ b/epan/dissectors/packet-netrom.c @@ -206,14 +206,14 @@ dissect_netrom_proto(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset = 0; /* source */ - TVB_SET_ADDRESS(&pinfo->dl_src, AT_AX25, tvb, offset, AX25_ADDR_LEN); - TVB_SET_ADDRESS(&pinfo->src, AT_AX25, tvb, offset, AX25_ADDR_LEN); + set_address_tvb(&pinfo->dl_src, AT_AX25, AX25_ADDR_LEN, tvb, offset); + set_address_tvb(&pinfo->src, AT_AX25, AX25_ADDR_LEN, tvb, offset); /* src_ssid = tvb_get_guint8(tvb, offset+6); */ offset += AX25_ADDR_LEN; /* step over src addr */ /* destination */ - TVB_SET_ADDRESS(&pinfo->dl_dst, AT_AX25, tvb, offset, AX25_ADDR_LEN); - TVB_SET_ADDRESS(&pinfo->dst, AT_AX25, tvb, offset, AX25_ADDR_LEN); + set_address_tvb(&pinfo->dl_dst, AT_AX25, AX25_ADDR_LEN, tvb, offset); + set_address_tvb(&pinfo->dst, AT_AX25, AX25_ADDR_LEN, tvb, offset); /* dst_ssid = tvb_get_guint8(tvb, offset+6); */ offset += AX25_ADDR_LEN; /* step over dst addr */ diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index cccf3895e0..d97c74146d 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -331,7 +331,7 @@ static p_mul_seq_val *lookup_seq_val (guint32 message_id, guint16 seq_no, p_mul_key->id = message_id; p_mul_key->seq = seq_no; - WMEM_COPY_ADDRESS(wmem_file_scope(), &p_mul_key->addr, addr); + copy_address_wmem(wmem_file_scope(), &p_mul_key->addr, addr); pkg_data = (p_mul_seq_val *) g_hash_table_lookup (p_mul_id_hash_table, p_mul_key); @@ -391,7 +391,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin /* Try to match corresponding address PDU */ p_mul_key->id = message_id; p_mul_key->seq = 0; - WMEM_COPY_ADDRESS(wmem_file_scope(), &p_mul_key->addr, addr); + copy_address_wmem(wmem_file_scope(), &p_mul_key->addr, addr); need_set_address = TRUE; p_mul_data = (p_mul_seq_val *) g_hash_table_lookup (p_mul_id_hash_table, p_mul_key); @@ -445,7 +445,7 @@ static p_mul_seq_val *register_p_mul_id (packet_info *pinfo, address *addr, guin p_mul_key->id = message_id; p_mul_key->seq = seq_no; if (!need_set_address) { - WMEM_COPY_ADDRESS(wmem_file_scope(), &p_mul_key->addr, addr); + copy_address_wmem(wmem_file_scope(), &p_mul_key->addr, addr); } p_mul_data = (p_mul_seq_val *) g_hash_table_lookup (p_mul_id_hash_table, p_mul_key); @@ -949,7 +949,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v if (pdu_type == Ack_PDU) { /* Source ID of Ack Sender */ - TVB_SET_ADDRESS (&dst, AT_IPv4, tvb, offset, 4); + set_address_tvb (&dst, AT_IPv4, 4, tvb, offset); proto_tree_add_item (p_mul_tree, hf_source_id_ack, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -959,7 +959,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v offset += 2; } else { /* Source Id */ - TVB_SET_ADDRESS (&src, AT_IPv4, tvb, offset, 4); + set_address_tvb (&src, AT_IPv4, 4, tvb, offset); proto_tree_add_item (p_mul_tree, hf_source_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -1034,7 +1034,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v field_tree = proto_item_add_subtree (en, ett_dest_entry); /* Destination Id */ - TVB_SET_ADDRESS (&dst, AT_IPv4, tvb, offset, 4); + set_address_tvb (&dst, AT_IPv4, 4, tvb, offset); proto_tree_add_item (field_tree, hf_dest_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; @@ -1095,7 +1095,7 @@ static int dissect_p_mul (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v } /* Source Id */ - TVB_SET_ADDRESS (&src, AT_IPv4, tvb, offset, 4); + set_address_tvb (&src, AT_IPv4, 4, tvb, offset); proto_tree_add_item (field_tree, hf_source_id, tvb, offset, 4, ENC_BIG_ENDIAN); offset += 4; diff --git a/epan/dissectors/packet-ppcap.c b/epan/dissectors/packet-ppcap.c index 6f22f62b29..bdacc8c250 100644 --- a/epan/dissectors/packet-ppcap.c +++ b/epan/dissectors/packet-ppcap.c @@ -305,13 +305,13 @@ dissect_ppcap_source_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ppc { proto_tree_add_item(ppcap_tree1, hf_ppcap_source_ip_address1, tvb, offset, msg_len, ENC_NA); - TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv4, tvb, offset, 4); + set_address_tvb(&pinfo->net_src, AT_IPv4, 4, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->net_src); } else { proto_tree_add_item(ppcap_tree1, hf_ppcap_source_ip_address2, tvb, offset, msg_len, ENC_NA); - TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv6, tvb, offset, 6); + set_address_tvb(&pinfo->net_src, AT_IPv6, 6, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->net_src); } } @@ -320,7 +320,7 @@ dissect_ppcap_source_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ppc { proto_tree_add_item(ppcap_tree1, hf_ppcap_source_nodeid, tvb, offset, msg_len, ENC_ASCII|ENC_NA); - TVB_SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, tvb, offset, msg_len); + set_address_tvb(&pinfo->net_src, AT_STRINGZ, msg_len, tvb, offset); copy_address_shallow(&pinfo->src, &pinfo->net_src); } if (msg_len%4) @@ -395,13 +395,13 @@ dissect_ppcap_destination_address(tvbuff_t *tvb, packet_info * pinfo, proto_tree if (msg_len%16 != 0) { proto_tree_add_item(ppcap_tree1, hf_ppcap_destination_ip_address1, tvb, offset, msg_len, ENC_NA); - TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv4, tvb, offset, 4); + set_address_tvb(&pinfo->net_dst, AT_IPv4, 4, tvb, offset); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); } else { proto_tree_add_item(ppcap_tree1, hf_ppcap_destination_ip_address2, tvb, offset, msg_len, ENC_NA); - TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv6, tvb, offset, 6); + set_address_tvb(&pinfo->net_dst, AT_IPv6, 6, tvb, offset); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); } } @@ -411,7 +411,7 @@ dissect_ppcap_destination_address(tvbuff_t *tvb, packet_info * pinfo, proto_tree char *string; string = tvb_get_string_enc(wmem_packet_scope(), tvb, offset, msg_len, ENC_UTF_8|ENC_NA); proto_tree_add_string(ppcap_tree1, hf_ppcap_destination_nodeid, tvb, offset, msg_len, string); - TVB_SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, tvb, offset, msg_len); + set_address_tvb(&pinfo->net_dst, AT_STRINGZ, msg_len, tvb, offset); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); } diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index bc09538121..62714526a6 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -599,9 +599,9 @@ static const gchar *dissect_ascend_data_filter(proto_tree* tree, tvbuff_t* tvb, } if (type == 3) { /* IPv6 */ - TVB_SET_ADDRESS(&srcip, AT_IPv6, tvb, 4, 16); + set_address_tvb(&srcip, AT_IPv6, 16, tvb, 4); } else { - TVB_SET_ADDRESS(&srcip, AT_IPv4, tvb, 4, 4); + set_address_tvb(&srcip, AT_IPv4, 4, tvb, 4); } srclen=tvb_get_guint8(tvb, 4+iplen*2); srcport=tvb_get_ntohs(tvb, 9+iplen*2); @@ -615,9 +615,9 @@ static const gchar *dissect_ascend_data_filter(proto_tree* tree, tvbuff_t* tvb, } if (type == 3) { /* IPv6-*/ - TVB_SET_ADDRESS(&dstip, AT_IPv6, tvb, 4+iplen, 16); + set_address_tvb(&dstip, AT_IPv6, 16, tvb, 4+iplen); } else { - TVB_SET_ADDRESS(&dstip, AT_IPv4, tvb, 4+iplen, 4); + set_address_tvb(&dstip, AT_IPv4, 4, tvb, 4+iplen); } dstlen=tvb_get_guint8(tvb, 5+iplen*2); dstport=tvb_get_ntohs(tvb, 10+iplen*2); diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index ae99baab06..2fb50d5e27 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -2436,7 +2436,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, * later. */ rsvph->session_type = RSVP_SESSION_TYPE_IPV4; - TVB_SET_ADDRESS(&rsvph->destination, AT_IPv4, tvb, offset2, 4); + set_address_tvb(&rsvph->destination, AT_IPv4, 4, tvb, offset2); rsvph->protocol = tvb_get_guint8(tvb, offset2+4); rsvph->udp_dest_port = tvb_get_ntohs(tvb, offset2+6); @@ -2488,7 +2488,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, * later. */ rsvph->session_type = RSVP_SESSION_TYPE_IPV4_LSP; - TVB_SET_ADDRESS(&rsvph->destination, AT_IPv4, tvb, offset2, 4); + set_address_tvb(&rsvph->destination, AT_IPv4, 4, tvb, offset2); rsvph->udp_dest_port = tvb_get_ntohs(tvb, offset2+6); rsvph->ext_tunnel_id = tvb_get_ntohl(tvb, offset2 + 8); break; @@ -2523,7 +2523,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, * later. */ rsvph->session_type = RSVP_SESSION_TYPE_IPV6_LSP; - TVB_SET_ADDRESS(&rsvph->destination, AT_IPv6, tvb, offset2, 16); + set_address_tvb(&rsvph->destination, AT_IPv6, 16, tvb, offset2); rsvph->udp_dest_port = tvb_get_ntohs(tvb, offset2+18); rsvph->ext_tunnel_id_ipv6_pre = tvb_get_ntoh64(tvb, offset2+20); rsvph->ext_tunnel_id_ipv6_post = tvb_get_ntoh64(tvb, offset2+28); @@ -2543,7 +2543,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, * later. */ rsvph->session_type = RSVP_SESSION_TYPE_AGGREGATE_IPV4; - TVB_SET_ADDRESS(&rsvph->destination, AT_IPv4, tvb, offset2, 4); + set_address_tvb(&rsvph->destination, AT_IPv4, 4, tvb, offset2); rsvph->dscp = tvb_get_guint8(tvb, offset2+7); rsvph->ext_tunnel_id = tvb_get_ntohl(tvb, offset2 + 8); break; @@ -2570,7 +2570,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, * later. */ rsvph->session_type = RSVP_SESSION_TYPE_IPV4_UNI; - TVB_SET_ADDRESS(&rsvph->destination, AT_IPv4, tvb, offset2, 4); + set_address_tvb(&rsvph->destination, AT_IPv4, 4, tvb, offset2); rsvph->udp_dest_port = tvb_get_ntohs(tvb, offset2+6); rsvph->ext_tunnel_id = tvb_get_ntohl(tvb, offset2 + 8); @@ -2598,7 +2598,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, * later. */ rsvph->session_type = RSVP_SESSION_TYPE_P2MP_LSP_TUNNEL_IPV4; - TVB_SET_ADDRESS(&rsvph->destination, AT_IPv4, tvb, offset2, 4); + set_address_tvb(&rsvph->destination, AT_IPv4, 4, tvb, offset2); rsvph->udp_dest_port = tvb_get_ntohs(tvb, offset2+6); rsvph->ext_tunnel_id = tvb_get_ntohl(tvb, offset2 + 8); @@ -2626,7 +2626,7 @@ dissect_rsvp_session(proto_item *ti, proto_tree *rsvp_object_tree, * later. */ rsvph->session_type = RSVP_SESSION_TYPE_IPV4_E_NNI; - TVB_SET_ADDRESS(&rsvph->destination, AT_IPv4, tvb, offset2, 4); + set_address_tvb(&rsvph->destination, AT_IPv4, 4, tvb, offset2); rsvph->udp_dest_port = tvb_get_ntohs(tvb, offset2+6); rsvph->ext_tunnel_id = tvb_get_ntohl(tvb, offset2 + 8); @@ -3314,7 +3314,7 @@ dissect_rsvp_template_filter(proto_item *ti, proto_tree *rsvp_object_tree, /* * Save this information to build the conversation request key later. */ - TVB_SET_ADDRESS(&rsvph->source, AT_IPv4, tvb, offset2, 4); + set_address_tvb(&rsvph->source, AT_IPv4, 4, tvb, offset2); rsvph->udp_source_port = tvb_get_ntohs(tvb, offset2+6); break; @@ -3345,7 +3345,7 @@ dissect_rsvp_template_filter(proto_item *ti, proto_tree *rsvp_object_tree, /* * Save this information to build the conversation request key later. */ - TVB_SET_ADDRESS(&rsvph->source, AT_IPv4, tvb, offset2, 4); + set_address_tvb(&rsvph->source, AT_IPv4, 4, tvb, offset2); rsvph->udp_source_port = tvb_get_ntohs(tvb, offset2+6); break; @@ -3368,7 +3368,7 @@ dissect_rsvp_template_filter(proto_item *ti, proto_tree *rsvp_object_tree, /* * Save this information to build the conversation request key later. */ - TVB_SET_ADDRESS(&rsvph->source, AT_IPv6, tvb, offset2, 16); + set_address_tvb(&rsvph->source, AT_IPv6, 16, tvb, offset2); rsvph->udp_source_port = tvb_get_ntohs(tvb, offset2+18); break; @@ -3382,7 +3382,7 @@ dissect_rsvp_template_filter(proto_item *ti, proto_tree *rsvp_object_tree, /* * Save this information to build the conversation request key later. */ - TVB_SET_ADDRESS(&rsvph->source, AT_IPv4, tvb, offset2, 4); + set_address_tvb(&rsvph->source, AT_IPv4, 4, tvb, offset2); break; default: @@ -7527,7 +7527,7 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea break; } - WMEM_COPY_ADDRESS(wmem_file_scope(), &request_key.source_info.source, &rsvph->source); + copy_address_wmem(wmem_file_scope(), &request_key.source_info.source, &rsvph->source); request_key.source_info.udp_source_port = rsvph->udp_source_port; /* See if a request with this key already exists */ diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index c91ca00828..492799c6f6 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -757,10 +757,10 @@ dissect_sflow_245_address_type(tvbuff_t *tvb, packet_info *pinfo, if (addr) { switch (len) { case 4: - TVB_SET_ADDRESS(addr, AT_IPv4, tvb, offset, len); + set_address_tvb(addr, AT_IPv4, len, tvb, offset); break; case 16: - TVB_SET_ADDRESS(addr, AT_IPv6, tvb, offset, len); + set_address_tvb(addr, AT_IPv6, len, tvb, offset); break; } } diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 6fc80da83b..c87e53ac54 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -4394,8 +4394,8 @@ guint sip_is_packet_resend(packet_info *pinfo, /* Fill in key and value details */ g_snprintf(p_key->call_id, MAX_CALL_ID_SIZE, "%s", call_id); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(p_key->dest_address), &pinfo->net_dst); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(p_key->source_address), &pinfo->net_src); + copy_address_wmem(wmem_file_scope(), &(p_key->dest_address), &pinfo->net_dst); + copy_address_wmem(wmem_file_scope(), &(p_key->source_address), &pinfo->net_src); p_key->dest_port = pinfo->destport; if (sip_retrans_the_same_sport) { p_key->source_port = pinfo->srcport; diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index a4891dd732..5eb6f02db5 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -282,7 +282,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ * is used to identify packets originating at the client. */ if ((pinfo->destport == UDP_PORT_SLIMP3_V2) && (pinfo->srcport == UDP_PORT_SLIMP3_V2)) { - TVB_SET_ADDRESS(&tmp_addr, AT_ETHER, tvb, offset+12, 6); + set_address_tvb(&tmp_addr, AT_ETHER, 6, tvb, offset+12); to_server = addresses_equal(&tmp_addr, &pinfo->dl_src); } else if (pinfo->destport == UDP_PORT_SLIMP3_V2) { diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index 85f1a5649d..b8dc3deb5d 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -244,12 +244,12 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } switch (halen) { case 4: - TVB_SET_ADDRESS(&pinfo->dl_src, AT_IPv4, tvb, 6, 4); + set_address_tvb(&pinfo->dl_src, AT_IPv4, 4, tvb, 6); copy_address_shallow(&pinfo->src, &pinfo->dl_src); proto_tree_add_item(fh_tree, &hfi_sll_src_ipv4, tvb, 6, 4, ENC_BIG_ENDIAN); break; case 6: - TVB_SET_ADDRESS(&pinfo->dl_src, AT_ETHER, tvb, 6, 6); + set_address_tvb(&pinfo->dl_src, AT_ETHER, 6, tvb, 6); copy_address_shallow(&pinfo->src, &pinfo->dl_src); proto_tree_add_item(fh_tree, &hfi_sll_src_eth, tvb, 6, 6, ENC_NA); break; diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 02f9ba0586..bf7647dfe4 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -1728,13 +1728,13 @@ dissect_fid0_1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Set DST addr */ - TVB_SET_ADDRESS(&pinfo->net_dst, sna_address_type, tvb, 2, SNA_FID01_ADDR_LEN); + set_address_tvb(&pinfo->net_dst, sna_address_type, SNA_FID01_ADDR_LEN, tvb, 2); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); proto_tree_add_item(tree, hf_sna_th_oaf, tvb, 4, 2, ENC_BIG_ENDIAN); /* Set SRC addr */ - TVB_SET_ADDRESS(&pinfo->net_src, sna_address_type, tvb, 4, SNA_FID01_ADDR_LEN); + set_address_tvb(&pinfo->net_src, sna_address_type, SNA_FID01_ADDR_LEN, tvb, 4); copy_address_shallow(&pinfo->src, &pinfo->net_src); proto_tree_add_item(tree, hf_sna_th_snf, tvb, 6, 2, ENC_BIG_ENDIAN); @@ -1780,14 +1780,14 @@ dissect_fid2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } /* Set DST addr */ - TVB_SET_ADDRESS(&pinfo->net_dst, sna_address_type, tvb, 2, SNA_FID2_ADDR_LEN); + set_address_tvb(&pinfo->net_dst, sna_address_type, SNA_FID2_ADDR_LEN, tvb, 2); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); /* Byte 3 */ proto_tree_add_item(tree, hf_sna_th_oaf, tvb, 3, 1, ENC_BIG_ENDIAN); /* Set SRC addr */ - TVB_SET_ADDRESS(&pinfo->net_src, sna_address_type, tvb, 3, SNA_FID2_ADDR_LEN); + set_address_tvb(&pinfo->net_src, sna_address_type, SNA_FID2_ADDR_LEN, tvb, 3); copy_address_shallow(&pinfo->src, &pinfo->net_src); id = tvb_get_ntohs(tvb, 4); diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 01f67fb9f8..f69d69f5d5 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -295,16 +295,16 @@ static int get_address_v5(tvbuff_t *tvb, int offset, { case 1: /* IPv4 address */ if ( hash_info) { - TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4); - WMEM_COPY_ADDRESS(wmem_file_scope(), &hash_info->dst_addr, &addr); + set_address_tvb(&addr, AT_IPv4, 4, tvb, offset); + copy_address_wmem(wmem_file_scope(), &hash_info->dst_addr, &addr); } offset += 4; break; case 4: /* IPv6 address */ if ( hash_info) { - TVB_SET_ADDRESS(&addr, AT_IPv6, tvb, offset, 16); - WMEM_COPY_ADDRESS(wmem_file_scope(), &hash_info->dst_addr, &addr); + set_address_tvb(&addr, AT_IPv6, 16, tvb, offset); + copy_address_wmem(wmem_file_scope(), &hash_info->dst_addr, &addr); } offset += 16; break; @@ -698,8 +698,8 @@ state_machine_v4( socks_hash_entry_t *hash_info, tvbuff_t *tvb, hash_info->port = tvb_get_ntohs(tvb, offset + 2); /* get remote address */ - TVB_SET_ADDRESS(&addr, AT_IPv4, tvb, offset, 4); - WMEM_COPY_ADDRESS(wmem_file_scope(), &hash_info->dst_addr, &addr); + set_address_tvb(&addr, AT_IPv4, 4, tvb, offset); + copy_address_wmem(wmem_file_scope(), &hash_info->dst_addr, &addr); hash_info->clientState = clientDone; } diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 40b043996e..f649fb3c4f 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -4217,7 +4217,7 @@ ssl_assoc_from_key_list(gpointer key _U_, gpointer data, gpointer user_data) void ssl_set_server(SslSession *session, address *addr, port_type ptype, guint32 port) { - WMEM_COPY_ADDRESS(wmem_file_scope(), &session->srv_addr, addr); + copy_address_wmem(wmem_file_scope(), &session->srv_addr, addr); session->srv_ptype = ptype; session->srv_port = port; } diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index cb202464cf..508c2e7a34 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -2125,18 +2125,18 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ /* Data type header */ if (hdr_size > 5 && user <4) { /* W6 Originating Processor */ - TVB_SET_ADDRESS(&pinfo->src, tipc_address_type, tipc_tvb, offset + 24, 4); + set_address_tvb(&pinfo->src, tipc_address_type, 4, tipc_tvb, offset + 24); /* W7 Destination Processor */ - TVB_SET_ADDRESS(&pinfo->dst, tipc_address_type, tipc_tvb, offset + 28, 4); + set_address_tvb(&pinfo->dst, tipc_address_type, 4, tipc_tvb, offset + 28); } else { /* Short data hdr */ /* W2 Previous Processor */ - TVB_SET_ADDRESS(&pinfo->src, tipc_address_type, tipc_tvb, offset + 8, 4); + set_address_tvb(&pinfo->src, tipc_address_type, 4, tipc_tvb, offset + 8); } } else { /* W2 Previous Processor */ - TVB_SET_ADDRESS(&pinfo->src, tipc_address_type, tipc_tvb, offset + 8, 4); + set_address_tvb(&pinfo->src, tipc_address_type, 4, tipc_tvb, offset + 8); } break; case TIPCv2: @@ -2161,28 +2161,28 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ if (datatype_hdr) { if (hdr_size > 6) { /* W6 Originating Processor */ - TVB_SET_ADDRESS(&pinfo->src, tipc_address_type, tipc_tvb, offset + 24, 4); + set_address_tvb(&pinfo->src, tipc_address_type, 4, tipc_tvb, offset + 24); /* W7 Destination Processor */ - TVB_SET_ADDRESS(&pinfo->dst, tipc_address_type, tipc_tvb, offset + 28, 4); + set_address_tvb(&pinfo->dst, tipc_address_type, 4, tipc_tvb, offset + 28); } else { /* W3 Previous Processor */ - TVB_SET_ADDRESS(&pinfo->src, tipc_address_type, tipc_tvb, offset + 12, 4); + set_address_tvb(&pinfo->src, tipc_address_type, 4, tipc_tvb, offset + 12); } } else { if (user != TIPCv2_NEIGHBOUR_DISCOVERY) { /* W6 Originating Processor */ - TVB_SET_ADDRESS(&pinfo->src, tipc_address_type, tipc_tvb, offset + 24, 4); + set_address_tvb(&pinfo->src, tipc_address_type, 4, tipc_tvb, offset + 24); /* W7 Destination Processor */ - TVB_SET_ADDRESS(&pinfo->dst, tipc_address_type, tipc_tvb, offset + 28, 4); + set_address_tvb(&pinfo->dst, tipc_address_type, 4, tipc_tvb, offset + 28); } else { /* W2 Destination Domain */ - TVB_SET_ADDRESS(&pinfo->dst, tipc_address_type, tipc_tvb, offset + 8, 4); + set_address_tvb(&pinfo->dst, tipc_address_type, 4, tipc_tvb, offset + 8); /* W3 Previous Node */ - TVB_SET_ADDRESS(&pinfo->src, tipc_address_type, tipc_tvb, offset + 12, 4); + set_address_tvb(&pinfo->src, tipc_address_type, 4, tipc_tvb, offset + 12); } } break; diff --git a/epan/dissectors/packet-tn5250.c b/epan/dissectors/packet-tn5250.c index f88511a4e7..db2e9db84b 100644 --- a/epan/dissectors/packet-tn5250.c +++ b/epan/dissectors/packet-tn5250.c @@ -5180,9 +5180,9 @@ add_tn5250_conversation(packet_info *pinfo, int tn5250e) * it to the list of information structures. */ tn5250_info = wmem_new(wmem_file_scope(), tn5250_conv_info_t); - WMEM_COPY_ADDRESS(wmem_file_scope(), &(tn5250_info->outbound_addr),&(pinfo->dst)); + copy_address_wmem(wmem_file_scope(), &(tn5250_info->outbound_addr),&(pinfo->dst)); tn5250_info->outbound_port = pinfo->destport; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(tn5250_info->inbound_addr),&(pinfo->src)); + copy_address_wmem(wmem_file_scope(), &(tn5250_info->inbound_addr),&(pinfo->src)); tn5250_info->inbound_port = pinfo->srcport; conversation_add_proto_data(conversation, proto_tn5250, tn5250_info); tn5250_info->next = tn5250_info_items; diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index e49ca58b6b..11f3fe586f 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -428,8 +428,8 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Get the data */ trh->fc = tvb_get_guint8(tr_tvb, 1); - TVB_SET_ADDRESS(&trh->src, AT_ETHER, tr_tvb, 8, 6); - TVB_SET_ADDRESS(&trh->dst, AT_ETHER, tr_tvb, 2, 6); + set_address_tvb(&trh->src, AT_ETHER, 6, tr_tvb, 8); + set_address_tvb(&trh->dst, AT_ETHER, 6, tr_tvb, 2); /* if the high bit on the first byte of src hwaddr is 1, then this packet is source-routed */ diff --git a/epan/dissectors/packet-ua.c b/epan/dissectors/packet-ua.c index 4973d9687a..941ccc190f 100644 --- a/epan/dissectors/packet-ua.c +++ b/epan/dissectors/packet-ua.c @@ -211,7 +211,7 @@ static void _dissect_ua_msg(tvbuff_t *tvb, } case 0x01: /* remote IP */ { - TVB_SET_ADDRESS(&remote_rtp_addr, AT_IPv4, tvb, suboffset+2, 4); + set_address_tvb(&remote_rtp_addr, AT_IPv4, 4, tvb, suboffset+2); break; } case 0x02: /* remote port */ diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index 68f136a767..3386c9c437 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -4525,7 +4525,7 @@ umts_fp_init_protocol(void) umts_fp_conversation_info->channel = uat_umts_fp_ep_and_ch_records[i].channel_type; umts_fp_conversation_info->dl_frame_number = 0; umts_fp_conversation_info->ul_frame_number = 1; - WMEM_COPY_ADDRESS(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &src_addr); + copy_address_wmem(wmem_file_scope(), &(umts_fp_conversation_info->crnc_address), &src_addr); umts_fp_conversation_info->crnc_port = uat_umts_fp_ep_and_ch_records[i].src_port; umts_fp_conversation_info->rlc_mode = (enum fp_rlc_mode) uat_umts_fp_ep_and_ch_records[i].rlc_mode; /*Save unique UE-identifier */ diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index c9a93ae87c..5a3b8b66c6 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -552,9 +552,9 @@ dissect_vines_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val_to_str_const(vip_tctl, proto_vals, "Unknown VIP protocol"), vip_tctl); - TVB_SET_ADDRESS(&pinfo->net_src, AT_VINES, tvb, offset+12, VINES_ADDR_LEN); + set_address_tvb(&pinfo->net_src, AT_VINES, VINES_ADDR_LEN, tvb, offset+12); copy_address_shallow(&pinfo->src, &pinfo->net_src); - TVB_SET_ADDRESS(&pinfo->net_dst, AT_VINES, tvb, offset+6, VINES_ADDR_LEN); + set_address_tvb(&pinfo->net_dst, AT_VINES, VINES_ADDR_LEN, tvb, offset+6); copy_address_shallow(&pinfo->dst, &pinfo->net_dst); /* helpers to transport control */ diff --git a/epan/dissectors/packet-vuze-dht.c b/epan/dissectors/packet-vuze-dht.c index 885fcb61be..f7baecebc6 100644 --- a/epan/dissectors/packet-vuze-dht.c +++ b/epan/dissectors/packet-vuze-dht.c @@ -304,11 +304,11 @@ dissect_vuze_dht_address(tvbuff_t *tvb, packet_info _U_*pinfo, proto_tree *tree, { case TL_IPv4: proto_tree_add_item(sub_tree, hf_vuze_dht_address_v4, tvb, offset, ip_length, ENC_BIG_ENDIAN); - TVB_SET_ADDRESS( &addr, AT_IPv4, tvb, offset, ip_length); + set_address_tvb( &addr, AT_IPv4, ip_length, tvb, offset); break; case TL_IPv6: proto_tree_add_item(sub_tree, hf_vuze_dht_address_v6, tvb, offset, ip_length, ENC_NA); - TVB_SET_ADDRESS( &addr, AT_IPv6, tvb, offset, ip_length); + set_address_tvb( &addr, AT_IPv6, ip_length, tvb, offset); break; default: addr.type = AT_NONE; diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c index e7da2a2eec..a068135451 100644 --- a/plugins/docsis/packet-macmgmt.c +++ b/plugins/docsis/packet-macmgmt.c @@ -156,9 +156,9 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) col_clear(pinfo->cinfo, COL_INFO); - TVB_SET_ADDRESS (&pinfo->dl_src, AT_ETHER, tvb, 6, 6); + set_address_tvb (&pinfo->dl_src, AT_ETHER, 6, tvb, 6); copy_address_shallow(&pinfo->src, &pinfo->dl_src); - TVB_SET_ADDRESS (&pinfo->dl_dst, AT_ETHER, tvb, 0, 6); + set_address_tvb (&pinfo->dl_dst, AT_ETHER, 6, tvb, 0); copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); if (tree) |