diff options
137 files changed, 736 insertions, 736 deletions
diff --git a/asn1/h225/h225.cnf b/asn1/h225/h225.cnf index 9315e047a2..9a15e11c9e 100644 --- a/asn1/h225/h225.cnf +++ b/asn1/h225/h225.cnf @@ -457,9 +457,9 @@ IsupNumber/nationalStandardPartyNumber isupNationalStandardPartyNumber conversation_t *conv=NULL; if (ipv4_address!=0) { - SET_ADDRESS(&src_addr, AT_IPv4, 4, &ipv4_address); + set_address(&src_addr, AT_IPv4, 4, &ipv4_address); } else if (memcmp(ipv6_address.bytes, ipv6_address_zeros.bytes, sizeof(ipv6_address.bytes))!=0) { - SET_ADDRESS(&src_addr, AT_IPv6, 16, ipv6_address.bytes); + set_address(&src_addr, AT_IPv6, 16, ipv6_address.bytes); } else { return offset; } diff --git a/asn1/h245/h245.cnf b/asn1/h245/h245.cnf index 3d817e51c7..e2a3ceb62f 100644 --- a/asn1/h245/h245.cnf +++ b/asn1/h245/h245.cnf @@ -848,7 +848,7 @@ if (h245_pi != NULL) if (upcoming_channel && upcoming_channel->upcoming_addr) { tvb_memcpy(value_tvb, upcoming_channel->upcoming_addr->addr_buf, 0, 4); - SET_ADDRESS(&upcoming_channel->upcoming_addr->addr, AT_IPv4, 4, upcoming_channel->upcoming_addr->addr_buf); + set_address(&upcoming_channel->upcoming_addr->addr, AT_IPv4, 4, upcoming_channel->upcoming_addr->addr_buf); } #.END #---------------------------------------------------------------------------------------- @@ -869,7 +869,7 @@ if (h245_pi != NULL) if (upcoming_channel && upcoming_channel->upcoming_addr) { tvb_memcpy(value_tvb, upcoming_channel->upcoming_addr->addr_buf, 0, 16); - SET_ADDRESS(&upcoming_channel->upcoming_addr->addr, AT_IPv6, 16, upcoming_channel->upcoming_addr->addr_buf); + set_address(&upcoming_channel->upcoming_addr->addr, AT_IPv6, 16, upcoming_channel->upcoming_addr->addr_buf); } #.END #---------------------------------------------------------------------------------------- diff --git a/asn1/h245/packet-h245-template.c b/asn1/h245/packet-h245-template.c index d4d9ef2dc4..3407a52714 100644 --- a/asn1/h245/packet-h245-template.c +++ b/asn1/h245/packet-h245-template.c @@ -335,7 +335,7 @@ static void update_unicast_addr(unicast_addr_t *req_addr, unicast_addr_t *ack_ad { if (ack_addr->addr.type!=AT_NONE && ack_addr->port!=0) { memcpy(req_addr->addr_buf, ack_addr->addr_buf, sizeof(req_addr->addr_buf)); - SET_ADDRESS(&req_addr->addr, ack_addr->addr.type, ack_addr->addr.len, req_addr->addr_buf); + set_address(&req_addr->addr, ack_addr->addr.type, ack_addr->addr.len, req_addr->addr_buf); req_addr->port = ack_addr->port; } } diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c index 8ae19bd9e4..4f8e20bffd 100644 --- a/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -71,10 +71,10 @@ dissect_mpeg_audio_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Audio Layer %d", mpa_layer(&mpa) + 1); if (MPA_BITRATE_VALID(&mpa) && MPA_FREQUENCY_VALID(&mpa)) { data_size = (int)(MPA_DATA_BYTES(&mpa) - sizeof mpa); - SET_ADDRESS(&pinfo->src, AT_NONE, 0, NULL); + set_address(&pinfo->src, AT_NONE, 0, NULL); col_add_fstr(pinfo->cinfo, COL_DEF_SRC, "%d kb/s", mpa_bitrate(&mpa) / 1000); - SET_ADDRESS(&pinfo->dst, AT_NONE, 0, NULL); + set_address(&pinfo->dst, AT_NONE, 0, NULL); col_add_fstr(pinfo->cinfo, COL_DEF_DST, "%g kHz", mpa_frequency(&mpa) / (float)1000); } diff --git a/asn1/nbap/nbap.cnf b/asn1/nbap/nbap.cnf index 96c29dd2b8..f912b250d8 100644 --- a/asn1/nbap/nbap.cnf +++ b/asn1/nbap/nbap.cnf @@ -740,9 +740,9 @@ transportFormatSet_type = NBAP_CPCH; { return offset; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); conversation = find_conversation(actx->pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, BindingID_port, @@ -833,9 +833,9 @@ num_items = 1; { return offset; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); conversation = find_conversation(actx->pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, BindingID_port, @@ -942,9 +942,9 @@ transportFormatSet_type = NBAP_CPCH; { return offset; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); conversation = find_conversation(actx->pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, BindingID_port, @@ -1148,9 +1148,9 @@ dch_id = 0xFFFFFFFF; return offset; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); conversation = find_conversation(actx->pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, BindingID_port, @@ -1256,9 +1256,9 @@ BindingID_port = 0; { return offset; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); conversation = find_conversation(actx->pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, BindingID_port, @@ -1342,7 +1342,7 @@ BindingID_port = 0; } /* Set address for collection of DDI entries */ - COPY_ADDRESS(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr); + copy_address(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr); nbap_edch_channel_info[e_dch_macdflow_id].crnc_port = BindingID_port; set_umts_fp_conv_data(conversation, umts_fp_conversation_info); @@ -1365,7 +1365,7 @@ guint32 no_ddi_entries, i; } /* Check if we have conversation info */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); p_conv = find_conversation(actx->pinfo->fd->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr, PT_UDP, nbap_edch_channel_info[e_dch_macdflow_id].crnc_port, 0, NO_ADDR_B); @@ -1390,7 +1390,7 @@ guint32 no_ddi_entries, i; );*/ } -/* COPY_ADDRESS(&(nbap_edch_port_info->crnc_address[e_dch_macdflow_id]),&dst_addr);*/ +/* copy_address(&(nbap_edch_port_info->crnc_address[e_dch_macdflow_id]),&dst_addr);*/ p_conv_data->dch_crc_present = g_nbap_msg_info_for_fp.dch_crc_present; /* Figure out which type of E-DCH frame, based on DDI value (DDI = 0 => type 2)*/ @@ -1424,9 +1424,9 @@ BindingID_port = 0; * Basically the idea here is that we create a new converation (Which is ok? maybe?) * And then hijack the old conversation and let lower tree items configure that hijacked data. * */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); old_conversation = find_conversation(actx->pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, BindingID_port, @@ -1481,7 +1481,7 @@ BindingID_port = 0; } /* Set address for collection of DDI entries */ - COPY_ADDRESS(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr); + copy_address(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr); nbap_edch_channel_info[e_dch_macdflow_id].crnc_port = BindingID_port; @@ -1543,7 +1543,7 @@ num_items = 1; /*Do the configurations*/ /* Check if we have conversation info */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); p_conv = find_conversation(actx->pinfo->fd->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr, PT_UDP, nbap_edch_channel_info[e_dch_macdflow_id].crnc_port, 0, NO_ADDR_B); @@ -1568,7 +1568,7 @@ num_items = 1; );*/ } -/* COPY_ADDRESS(&(nbap_edch_port_info->crnc_address[e_dch_macdflow_id]),&dst_addr);*/ +/* copy_address(&(nbap_edch_port_info->crnc_address[e_dch_macdflow_id]),&dst_addr);*/ p_conv_data->dch_crc_present = g_nbap_msg_info_for_fp.dch_crc_present; /* Figure out which type of E-DCH frame, based on DDI value (DDI = 0 => type 2)*/ @@ -1715,10 +1715,10 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; return offset; } - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); /* Set address for collection of HSDSCH entries */ - COPY_ADDRESS(&(nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_address),&dst_addr); + copy_address(&(nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_address),&dst_addr); nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_port = BindingID_port; @@ -1778,7 +1778,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; } /* Set port to zero use that as an indication of whether we have data or not */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); for (i = 0; i < maxNrOfMACdFlows; i++) { if (nbap_hsdsch_channel_info[i].crnc_port != 0){ nbap_debug("Frame %%u HSDSCH-MACdFlows-Information:hsdsch_macdflow_id %%u Look for conv on IP %%s Port %%u", @@ -1854,10 +1854,10 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; return offset; } - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); /* Set address for collection of HSDSCH entries */ - COPY_ADDRESS(&(nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_address),&dst_addr); + copy_address(&(nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_address),&dst_addr); nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_port = BindingID_port; @@ -1891,7 +1891,7 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; } /* Set port to zero use that as an indication of whether we have data or not */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); nbap_debug("Frame %%u HSDSCH-MACdFlows-Information Start", actx->pinfo->fd->num); @@ -1986,10 +1986,10 @@ nbap_edch_channel_info[e_dch_macdflow_id].no_ddi_entries = num_items; return offset; } - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); /* Set address for collection of common entries */ - COPY_ADDRESS(&(nbap_common_channel_info[common_macdflow_id].crnc_address),&dst_addr); + copy_address(&(nbap_common_channel_info[common_macdflow_id].crnc_address),&dst_addr); nbap_common_channel_info[common_macdflow_id].crnc_port = BindingID_port; @@ -2025,7 +2025,7 @@ int i; return offset; } /* Set port to zero use that as an indication of whether we have data or not */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); for (i = 0; i < maxNrOfCommonMACFlows; i++) { if (nbap_common_channel_info[i].crnc_port != 0){ @@ -2120,7 +2120,7 @@ int i; } /*Find the conversations assoicated with the HS-DSCH flows in this packet and set proper H-RNTI*/ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); for (i = 0; i < maxNrOfMACdFlows; i++) { if (nbap_hsdsch_channel_info[i].crnc_port != 0){ conversation = find_conversation(actx->pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr, diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index 29ae5e718c..6b024a4641 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -348,7 +348,7 @@ static void add_hsdsch_bind(packet_info *pinfo){ } /* Set port to zero use that as an indication of whether we have data or not */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); for (i = 0; i < maxNrOfMACdFlows; i++) { if (nbap_hsdsch_channel_info[i].crnc_port != 0){ conversation = find_conversation(pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr, diff --git a/asn1/pcap/pcap.cnf b/asn1/pcap/pcap.cnf index 78bc3ee70c..1bdb0b8097 100644 --- a/asn1/pcap/pcap.cnf +++ b/asn1/pcap/pcap.cnf @@ -427,4 +427,4 @@ PositionPeriodicResult N pcap.proc.imsg id-PositionPeriodicResult PositionPeriodicTermination N pcap.proc.imsg id-PositionPeriodicTermination -#.END
\ No newline at end of file +#.END diff --git a/asn1/sbc-ap/sbc-ap.cnf b/asn1/sbc-ap/sbc-ap.cnf index cbeeec8a7f..a9b73a450f 100644 --- a/asn1/sbc-ap/sbc-ap.cnf +++ b/asn1/sbc-ap/sbc-ap.cnf @@ -175,4 +175,4 @@ Write-Replace-Warning-Response N sbc_ap.proc.sout id-Write-Replace-Warning Stop-Warning-Request N sbc_ap.proc.imsg id-Stop-Warning Stop-Warning-Response N sbc_ap.proc.sout id-Stop-Warning -#.END
\ No newline at end of file +#.END diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index 88cc0992d4..58f943211e 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -232,7 +232,7 @@ void t38_add_address(packet_info *pinfo, return; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); /* * Check if the ip address and port combination is not @@ -488,7 +488,7 @@ init_t38_info_conv(packet_info *pinfo) p_add_proto_data(wmem_file_scope(), pinfo, proto_t38, 0, p_t38_packet_conv); } - if (ADDRESSES_EQUAL(&p_conv->key_ptr->addr1, &pinfo->net_src)) { + if (addresses_equal(&p_conv->key_ptr->addr1, &pinfo->net_src)) { p_t38_conv_info = &(p_t38_conv->src_t38_info); p_t38_packet_conv_info = &(p_t38_packet_conv->src_t38_info); } else { diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 2a384bc59a..2fcf3a08e6 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -1578,7 +1578,7 @@ eth_addr_resolve(hashether_t *tp) { } /* No match whatsoever. */ - SET_ADDRESS(ðer_addr, AT_ETHER, 6, addr); + set_address(ðer_addr, AT_ETHER, 6, addr); address_to_str_buf(ðer_addr, tp->resolved_name, MAXNAMELEN); tp->status = HASHETHER_STATUS_RESOLVED_DUMMY; return tp; diff --git a/epan/conversation.c b/epan/conversation.c index c46b91bec1..1b9c95357e 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -236,8 +236,8 @@ conversation_match_exact(gconstpointer v, gconstpointer w) */ if (v1->port1 == v2->port1 && v1->port2 == v2->port2 && - ADDRESSES_EQUAL(&v1->addr1, &v2->addr1) && - ADDRESSES_EQUAL(&v1->addr2, &v2->addr2)) { + addresses_equal(&v1->addr1, &v2->addr1) && + addresses_equal(&v1->addr2, &v2->addr2)) { /* * Yes. It's the same conversation, and the two * address/port pairs are going in the same direction. @@ -253,8 +253,8 @@ conversation_match_exact(gconstpointer v, gconstpointer w) */ if (v1->port2 == v2->port1 && v1->port1 == v2->port2 && - ADDRESSES_EQUAL(&v1->addr2, &v2->addr1) && - ADDRESSES_EQUAL(&v1->addr1, &v2->addr2)) { + addresses_equal(&v1->addr2, &v2->addr1) && + addresses_equal(&v1->addr1, &v2->addr2)) { /* * Yes. It's the same conversation, and the two * address/port pairs are going in opposite directions. @@ -319,7 +319,7 @@ conversation_match_no_addr2(gconstpointer v, gconstpointer w) */ if (v1->port1 == v2->port1 && v1->port2 == v2->port2 && - ADDRESSES_EQUAL(&v1->addr1, &v2->addr1)) { + addresses_equal(&v1->addr1, &v2->addr1)) { /* * Yes. It's the same conversation, and the two * address/port pairs are going in the same direction. @@ -382,8 +382,8 @@ conversation_match_no_port2(gconstpointer v, gconstpointer w) * address 2 values the same? */ if (v1->port1 == v2->port1 && - ADDRESSES_EQUAL(&v1->addr1, &v2->addr1) && - ADDRESSES_EQUAL(&v1->addr2, &v2->addr2)) { + addresses_equal(&v1->addr1, &v2->addr1) && + addresses_equal(&v1->addr2, &v2->addr2)) { /* * Yes. It's the same conversation, and the two * address/port pairs are going in the same direction. @@ -443,7 +443,7 @@ conversation_match_no_addr2_or_port2(gconstpointer v, gconstpointer w) * and second address 1 values the same? */ if (v1->port1 == v2->port1 && - ADDRESSES_EQUAL(&v1->addr1, &v2->addr1)) { + addresses_equal(&v1->addr1, &v2->addr1)) { /* * Yes. It's the same conversation, and the two * address/port pairs are going in the same direction. diff --git a/epan/conversation_table.c b/epan/conversation_table.c index f1f397780d..b342d3fb5c 100644 --- a/epan/conversation_table.c +++ b/epan/conversation_table.c @@ -255,15 +255,15 @@ conversation_equal(gconstpointer key1, gconstpointer key2) { if (ck1->port1 == ck2->port1 && ck1->port2 == ck2->port2 && - ADDRESSES_EQUAL(&ck1->addr1, &ck2->addr1) && - ADDRESSES_EQUAL(&ck1->addr2, &ck2->addr2)) { + addresses_equal(&ck1->addr1, &ck2->addr1) && + addresses_equal(&ck1->addr2, &ck2->addr2)) { return TRUE; } if (ck1->port2 == ck2->port1 && ck1->port1 == ck2->port2 && - ADDRESSES_EQUAL(&ck1->addr2, &ck2->addr1) && - ADDRESSES_EQUAL(&ck1->addr1, &ck2->addr2)) { + addresses_equal(&ck1->addr2, &ck2->addr1) && + addresses_equal(&ck1->addr1, &ck2->addr2)) { return TRUE; } } @@ -614,7 +614,7 @@ add_conversation_table_data_with_conv_id( addr1 = dst; port2 = src_port; port1 = dst_port; - } else if (CMP_ADDRESS(src, dst) < 0) { + } else if (cmp_address(src, dst) < 0) { addr1 = src; addr2 = dst; port1 = src_port; @@ -656,8 +656,8 @@ add_conversation_table_data_with_conv_id( conv_key_t *new_key; conv_item_t new_conv_item; - COPY_ADDRESS(&new_conv_item.src_address, addr1); - COPY_ADDRESS(&new_conv_item.dst_address, addr2); + copy_address(&new_conv_item.src_address, addr1); + copy_address(&new_conv_item.dst_address, addr2); new_conv_item.dissector_info = ct_info; new_conv_item.ptype = ptype; new_conv_item.src_port = port1; @@ -684,8 +684,8 @@ add_conversation_table_data_with_conv_id( /* ct->conversations address is not a constant but src/dst_address.data are */ new_key = g_new(conv_key_t, 1); - SET_ADDRESS(&new_key->addr1, conv_item->src_address.type, conv_item->src_address.len, conv_item->src_address.data); - SET_ADDRESS(&new_key->addr2, conv_item->dst_address.type, conv_item->dst_address.len, conv_item->dst_address.data); + set_address(&new_key->addr1, conv_item->src_address.type, conv_item->src_address.len, conv_item->src_address.data); + set_address(&new_key->addr2, conv_item->dst_address.type, conv_item->dst_address.len, conv_item->dst_address.data); new_key->port1 = port1; new_key->port2 = port2; new_key->conv_id = conv_id; @@ -694,7 +694,7 @@ add_conversation_table_data_with_conv_id( /* update the conversation struct */ conv_item->modified = TRUE; - if ( (!CMP_ADDRESS(src, addr1)) && (!CMP_ADDRESS(dst, addr2)) && (src_port==port1) && (dst_port==port2) ) { + if ( (!cmp_address(src, addr1)) && (!cmp_address(dst, addr2)) && (src_port==port1) && (dst_port==port2) ) { conv_item->tx_frames += num_frames; conv_item->tx_bytes += num_bytes; } else { @@ -738,7 +738,7 @@ host_match(gconstpointer v, gconstpointer w) const host_key_t *v2 = (const host_key_t *)w; if (v1->port == v2->port && - ADDRESSES_EQUAL(&v1->myaddress, &v2->myaddress)) { + addresses_equal(&v1->myaddress, &v2->myaddress)) { return 1; } /* @@ -782,7 +782,7 @@ add_hostlist_table_data(conv_hash_t *ch, const address *addr, guint32 port, gboo host_key_t *new_key; hostlist_talker_t host; - COPY_ADDRESS(&host.myaddress, addr); + copy_address(&host.myaddress, addr); host.dissector_info = host_info; host.ptype=port_type_val; host.port=port; @@ -798,7 +798,7 @@ add_hostlist_table_data(conv_hash_t *ch, const address *addr, guint32 port, gboo /* hl->hosts address is not a constant but address.data is */ new_key = g_new(host_key_t,1); - SET_ADDRESS(&new_key->myaddress, talker->myaddress.type, talker->myaddress.len, talker->myaddress.data); + set_address(&new_key->myaddress, talker->myaddress.type, talker->myaddress.len, talker->myaddress.data); new_key->port = port; g_hash_table_insert(ch->hashtable, new_key, GUINT_TO_POINTER(talker_idx)); } diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c index 6028f215db..87fb5f6539 100644 --- a/epan/dissectors/packet-6lowpan.c +++ b/epan/dissectors/packet-6lowpan.c @@ -2335,8 +2335,8 @@ dissect_6lowpan_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 memcpy(siid, src_ifcid, LOWPAN_IFC_ID_LEN); offset += 2; } - SET_ADDRESS(&pinfo->src, AT_EUI64, 8, src_ifcid); - SET_ADDRESS(&pinfo->net_src, AT_EUI64, 8, src_ifcid); + set_address(&pinfo->src, AT_EUI64, 8, src_ifcid); + set_address(&pinfo->net_src, AT_EUI64, 8, src_ifcid); /* Get and display the destination address. */ if (!(mesh_header & LOWPAN_MESH_HEADER_F)) { @@ -2375,8 +2375,8 @@ dissect_6lowpan_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 memcpy(diid, dst_ifcid, LOWPAN_IFC_ID_LEN); offset += 2; } - SET_ADDRESS(&pinfo->dst, AT_EUI64, 8, dst_ifcid); - SET_ADDRESS(&pinfo->net_dst, AT_EUI64, 8, dst_ifcid); + set_address(&pinfo->dst, AT_EUI64, 8, dst_ifcid); + set_address(&pinfo->net_dst, AT_EUI64, 8, dst_ifcid); /* Adjust the mesh header length. */ if (tree) { diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index 2c7acc4fb6..d75e0b925f 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -895,8 +895,8 @@ static aeron_conversation_info_t * aeron_setup_conversation_info(const packet_in /* Address is even, so it's the control group (in addr1). Decrement the last byte of addr2 for the data group. */ addr2[addr_len - 1]--; } - SET_ADDRESS(cinfo->addr1, AT_IPv4, addr_len, (void *) addr1); - SET_ADDRESS(cinfo->addr2, AT_IPv4, addr_len, (void *) addr2); + set_address(cinfo->addr1, AT_IPv4, addr_len, (void *) addr1); + set_address(cinfo->addr2, AT_IPv4, addr_len, (void *) addr2); cinfo->port1 = pinfo->destport; cinfo->port2 = cinfo->port1; } @@ -952,8 +952,8 @@ static aeron_conversation_info_t * aeron_setup_conversation_info(const packet_in /* Address is even, so it's the control group (in addr1). Decrement the last byte of addr2 for the data group. */ addr2[addr_len - 1]--; } - SET_ADDRESS(cinfo->addr1, AT_IPv6, addr_len, (void *) addr1); - SET_ADDRESS(cinfo->addr2, AT_IPv6, addr_len, (void *) addr2); + set_address(cinfo->addr1, AT_IPv6, addr_len, (void *) addr1); + set_address(cinfo->addr2, AT_IPv6, addr_len, (void *) addr2); cinfo->port1 = pinfo->destport; cinfo->port2 = cinfo->port1; } diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c index e8845674cc..d7fd29260a 100644 --- a/epan/dissectors/packet-ap1394.c +++ b/epan/dissectors/packet-ap1394.c @@ -73,9 +73,9 @@ dissect_ap1394(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); TVB_SET_ADDRESS(&pinfo->dl_src, AT_EUI64, tvb, 8, 8); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); TVB_SET_ADDRESS(&pinfo->dl_dst, AT_EUI64, tvb, 0, 8); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); if (tree) { ti = proto_tree_add_protocol_format(tree, proto_ap1394, tvb, 0, 18, diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index 7aec361f56..7d16074518 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.c @@ -176,9 +176,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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); TVB_SET_ADDRESS(&pinfo->dl_dst, arcnet_address_type, tvb, 1, 1); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + 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-arp.c b/epan/dissectors/packet-arp.c index 72d30d9c8f..ae727fe1c2 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -385,14 +385,14 @@ arpproaddr_to_str(const guint8 *ad, int ad_len, guint16 type) return "<No address>"; if (ARP_PRO_IS_IPv4(type, ad_len)) { /* IPv4 address. */ - SET_ADDRESS(&addr, AT_IPv4, 4, ad); + set_address(&addr, AT_IPv4, 4, ad); return address_to_str(wmem_packet_scope(), &addr); } if (ARP_HW_IS_AX25(type, ad_len)) { { /* AX.25 address */ - SET_ADDRESS(&addr, AT_AX25, AX25_ADDR_LEN, ad); + set_address(&addr, AT_AX25, AX25_ADDR_LEN, ad); return address_to_str(wmem_packet_scope(), &addr); } @@ -701,8 +701,8 @@ check_for_duplicate_addresses(packet_info *pinfo, proto_tree *tree, proto_item *ti; address mac_addr, result_mac_addr; - SET_ADDRESS(&mac_addr, AT_ETHER, 6, mac); - SET_ADDRESS(&result_mac_addr, AT_ETHER, 6, result->mac); + set_address(&mac_addr, AT_ETHER, 6, mac); + set_address(&result_mac_addr, AT_ETHER, 6, result->mac); /* Create subtree */ duplicate_tree = proto_tree_add_subtree_format(tree, tvb, 0, 0, ett_arp_duplicate_address, &ti, diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index be2b53db12..c62655a317 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -1448,10 +1448,10 @@ dissect_ddp_short(tvbuff_t *tvb, packet_info *pinfo, guint8 dnode, src->node = snode; dst->net = 0; dst->node = dnode; - SET_ADDRESS(&pinfo->net_src, atalk_address_type, sizeof(struct atalk_ddp_addr), src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); - SET_ADDRESS(&pinfo->net_dst, atalk_address_type, sizeof(struct atalk_ddp_addr), dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + set_address(&pinfo->net_src, atalk_address_type, sizeof(struct atalk_ddp_addr), src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); + set_address(&pinfo->net_dst, atalk_address_type, sizeof(struct atalk_ddp_addr), dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); pinfo->ptype = PT_DDP; pinfo->destport = dport; @@ -1499,10 +1499,10 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) src->node = ddp.snode; dst->net = ddp.dnet; dst->node = ddp.dnode; - SET_ADDRESS(&pinfo->net_src, atalk_address_type, sizeof(struct atalk_ddp_addr), src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); - SET_ADDRESS(&pinfo->net_dst, atalk_address_type, sizeof(struct atalk_ddp_addr), dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + set_address(&pinfo->net_src, atalk_address_type, sizeof(struct atalk_ddp_addr), src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); + set_address(&pinfo->net_dst, atalk_address_type, sizeof(struct atalk_ddp_addr), dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); pinfo->ptype = PT_DDP; pinfo->destport = ddp.dport; diff --git a/epan/dissectors/packet-ax25.c b/epan/dissectors/packet-ax25.c index d1547f22b4..1e1cf07ec0 100644 --- a/epan/dissectors/packet-ax25.c +++ b/epan/dissectors/packet-ax25.c @@ -157,7 +157,7 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree ) 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 ); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); dst_ssid = tvb_get_guint8(tvb, offset+6); /* step over dst addr point at src addr */ @@ -165,7 +165,7 @@ dissect_ax25( tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree ) 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 ); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); src_ssid = tvb_get_guint8(tvb, offset+6); /* step over src addr point at either 1st via addr or control byte */ diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c index e851a0d379..4289ada91a 100644 --- a/epan/dissectors/packet-batadv.c +++ b/epan/dissectors/packet-batadv.c @@ -1056,8 +1056,8 @@ static int dissect_batadv_batman_v5(tvbuff_t *tvb, int offset, packet_info *pinf 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &batman_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &batman_packeth->orig); + 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); batman_packeth->num_tt = tvb_get_guint8(tvb, offset+20); @@ -1152,8 +1152,8 @@ static int dissect_batadv_batman_v7(tvbuff_t *tvb, int offset, packet_info *pinf 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &batman_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &batman_packeth->orig); + 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); batman_packeth->ttl = tvb_get_guint8(tvb, offset+18); batman_packeth->num_tt = tvb_get_guint8(tvb, offset+19); @@ -1241,8 +1241,8 @@ static int dissect_batadv_batman_v9(tvbuff_t *tvb, int offset, packet_info *pinf 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &batman_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &batman_packeth->orig); + 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); batman_packeth->ttl = tvb_get_guint8(tvb, offset+18); batman_packeth->num_tt = tvb_get_guint8(tvb, offset+19); @@ -1338,8 +1338,8 @@ static int dissect_batadv_batman_v10(tvbuff_t *tvb, int offset, packet_info *pin 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &batman_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &batman_packeth->orig); + 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); batman_packeth->ttl = tvb_get_guint8(tvb, offset+20); batman_packeth->num_tt = tvb_get_guint8(tvb, offset+21); @@ -1434,8 +1434,8 @@ static int dissect_batadv_batman_v11(tvbuff_t *tvb, int offset, packet_info *pin 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &batman_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &batman_packeth->orig); + 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); batman_packeth->ttl = tvb_get_guint8(tvb, offset+20); batman_packeth->num_tt = tvb_get_guint8(tvb, offset+21); @@ -1524,8 +1524,8 @@ static int dissect_batadv_batman_v14(tvbuff_t *tvb, int offset, packet_info *pin 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &batman_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &batman_packeth->orig); + 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); batman_packeth->gw_flags = tvb_get_guint8(tvb, offset+20); batman_packeth->tq = tvb_get_guint8(tvb, offset+21); @@ -1802,8 +1802,8 @@ static void dissect_batadv_bcast_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tre bcast_packeth->version = tvb_get_guint8(tvb, 1); TVB_SET_ADDRESS(&bcast_packeth->orig, AT_ETHER, tvb, 2, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &bcast_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &bcast_packeth->orig); + 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); /* Set info column */ @@ -1859,8 +1859,8 @@ static void dissect_batadv_bcast_v10(tvbuff_t *tvb, packet_info *pinfo, proto_tr bcast_packeth->version = tvb_get_guint8(tvb, 1); TVB_SET_ADDRESS(&bcast_packeth->orig, AT_ETHER, tvb, 2, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &bcast_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &bcast_packeth->orig); + 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); bcast_packeth->seqno = tvb_get_ntohl(tvb, 9); @@ -1925,8 +1925,8 @@ static void dissect_batadv_bcast_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tr 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &bcast_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &bcast_packeth->orig); + copy_address_shallow(&pinfo->dl_src, &bcast_packeth->orig); + copy_address_shallow(&pinfo->src, &bcast_packeth->orig); /* Set info column */ col_add_fstr(pinfo->cinfo, COL_INFO, "Seq=%u", bcast_packeth->seqno); @@ -2027,10 +2027,10 @@ static void dissect_batadv_icmp_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tree TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, 3, 6); TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, 9, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &icmp_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &icmp_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &icmp_packeth->dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &icmp_packeth->dst); + copy_address_shallow(&pinfo->dl_src, &icmp_packeth->orig); + copy_address_shallow(&pinfo->src, &icmp_packeth->orig); + copy_address_shallow(&pinfo->dl_dst, &icmp_packeth->dst); + copy_address_shallow(&pinfo->dst, &icmp_packeth->dst); icmp_packeth->ttl = tvb_get_guint8(tvb, 15); icmp_packeth->uid = tvb_get_guint8(tvb, 16); @@ -2155,10 +2155,10 @@ static void dissect_batadv_icmp_v7(tvbuff_t *tvb, packet_info *pinfo, proto_tree TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, 4, 6); TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, 10, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &icmp_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &icmp_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &icmp_packeth->dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &icmp_packeth->dst); + copy_address_shallow(&pinfo->dl_src, &icmp_packeth->orig); + copy_address_shallow(&pinfo->src, &icmp_packeth->orig); + copy_address_shallow(&pinfo->dl_dst, &icmp_packeth->dst); + copy_address_shallow(&pinfo->dst, &icmp_packeth->dst); icmp_packeth->seqno = tvb_get_ntohs(tvb, 16); icmp_packeth->uid = tvb_get_guint8(tvb, 17); @@ -2237,10 +2237,10 @@ static void dissect_batadv_icmp_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tre TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, 4, 6); TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, 10, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &icmp_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &icmp_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &icmp_packeth->dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &icmp_packeth->dst); + copy_address_shallow(&pinfo->dl_src, &icmp_packeth->orig); + copy_address_shallow(&pinfo->src, &icmp_packeth->orig); + copy_address_shallow(&pinfo->dl_dst, &icmp_packeth->dst); + copy_address_shallow(&pinfo->dst, &icmp_packeth->dst); icmp_packeth->seqno = tvb_get_ntohs(tvb, 16); icmp_packeth->uid = tvb_get_guint8(tvb, 17); @@ -2362,16 +2362,16 @@ static void dissect_batadv_icmp_v15(tvbuff_t *tvb, packet_info *pinfo, offset += 1; TVB_SET_ADDRESS(&icmp_packeth->dst, AT_ETHER, tvb, offset, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &icmp_packeth->dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &icmp_packeth->dst); + copy_address_shallow(&pinfo->dl_dst, &icmp_packeth->dst); + copy_address_shallow(&pinfo->dst, &icmp_packeth->dst); proto_tree_add_item(batadv_icmp_tree, hf_batadv_icmp_dst, tvb, offset, 6, ENC_NA); offset += 6; TVB_SET_ADDRESS(&icmp_packeth->orig, AT_ETHER, tvb, offset, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &icmp_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &icmp_packeth->orig); + 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, 6, ENC_NA); offset += 6; @@ -2451,8 +2451,8 @@ static void dissect_batadv_unicast_v6(tvbuff_t *tvb, packet_info *pinfo, proto_t unicast_packeth->version = tvb_get_guint8(tvb, 1); TVB_SET_ADDRESS(&unicast_packeth->dest, AT_ETHER, tvb, 2, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_packeth->dest); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_packeth->dest); + copy_address_shallow(&pinfo->dl_dst, &unicast_packeth->dest); + copy_address_shallow(&pinfo->dst, &unicast_packeth->dest); unicast_packeth->ttl = tvb_get_guint8(tvb, 8); @@ -2513,8 +2513,8 @@ static void dissect_batadv_unicast_v14(tvbuff_t *tvb, packet_info *pinfo, proto_ 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_packeth->dest); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_packeth->dest); + copy_address_shallow(&pinfo->dl_dst, &unicast_packeth->dest); + copy_address_shallow(&pinfo->dst, &unicast_packeth->dest); /* Set info column */ col_clear(pinfo->cinfo, COL_INFO); @@ -2600,12 +2600,12 @@ static void dissect_batadv_unicast_4addr_v14(tvbuff_t *tvb, packet_info *pinfo, 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_4addr_packeth->dest); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_4addr_packeth->dest); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &unicast_4addr_packeth->src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &unicast_4addr_packeth->src); + 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); unicast_4addr_packeth->reserved = tvb_get_guint8(tvb, 17); @@ -2708,13 +2708,13 @@ static void dissect_batadv_unicast_frag_v12(tvbuff_t *tvb, packet_info *pinfo, p unicast_frag_packeth->version = tvb_get_guint8(tvb, 1); TVB_SET_ADDRESS(&unicast_frag_packeth->dest, AT_ETHER, tvb, 2, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_frag_packeth->dest); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_frag_packeth->dest); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &unicast_frag_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &unicast_frag_packeth->orig); + 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); save_fragmented = pinfo->fragmented; @@ -2802,13 +2802,13 @@ static void dissect_batadv_unicast_frag_v14(tvbuff_t *tvb, packet_info *pinfo, p 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_frag_packeth->dest); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_frag_packeth->dest); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &unicast_frag_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &unicast_frag_packeth->orig); + 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); save_fragmented = pinfo->fragmented; @@ -2946,15 +2946,15 @@ static void dissect_batadv_unicast_frag_v15(tvbuff_t *tvb, packet_info *pinfo, offset += 1; TVB_SET_ADDRESS(&unicast_frag_packeth->dest, AT_ETHER, tvb, offset, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_frag_packeth->dest); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_frag_packeth->dest); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &unicast_frag_packeth->orig); - COPY_ADDRESS_SHALLOW(&pinfo->src, &unicast_frag_packeth->orig); + 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, tvb, offset, 6, ENC_NA); offset += 6; @@ -3054,12 +3054,12 @@ static void dissect_batadv_vis_v6(tvbuff_t *tvb, packet_info *pinfo, proto_tree vis_packeth->ttl = tvb_get_guint8(tvb, 5); TVB_SET_ADDRESS(&vis_packeth->vis_orig, AT_ETHER, tvb, 6, 6); - COPY_ADDRESS_SHALLOW(&pinfo->src, &vis_packeth->vis_orig); + copy_address_shallow(&pinfo->src, &vis_packeth->vis_orig); TVB_SET_ADDRESS(&vis_packeth->target_orig, AT_ETHER, tvb, 12, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &vis_packeth->target_orig); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &vis_packeth->target_orig); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &vis_packeth->sender_orig); + copy_address_shallow(&pinfo->dl_src, &vis_packeth->sender_orig); /* Set info column */ @@ -3173,12 +3173,12 @@ static void dissect_batadv_vis_v10(tvbuff_t *tvb, packet_info *pinfo, proto_tree vis_packeth->ttl = tvb_get_guint8(tvb, 8); TVB_SET_ADDRESS(&vis_packeth->vis_orig, AT_ETHER, tvb, 9, 6); - COPY_ADDRESS_SHALLOW(&pinfo->src, &vis_packeth->vis_orig); + copy_address_shallow(&pinfo->src, &vis_packeth->vis_orig); TVB_SET_ADDRESS(&vis_packeth->target_orig, AT_ETHER, tvb, 15, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &vis_packeth->target_orig); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &vis_packeth->target_orig); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &vis_packeth->sender_orig); + copy_address_shallow(&pinfo->dl_src, &vis_packeth->sender_orig); /* Set info column */ @@ -3269,12 +3269,12 @@ static void dissect_batadv_vis_v14(tvbuff_t *tvb, packet_info *pinfo, proto_tree vis_packeth->reserved = tvb_get_guint8(tvb, 9); TVB_SET_ADDRESS(&vis_packeth->vis_orig, AT_ETHER, tvb, 10, 6); - COPY_ADDRESS_SHALLOW(&pinfo->src, &vis_packeth->vis_orig); + copy_address_shallow(&pinfo->src, &vis_packeth->vis_orig); TVB_SET_ADDRESS(&vis_packeth->target_orig, AT_ETHER, tvb, 16, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &vis_packeth->target_orig); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &vis_packeth->target_orig); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &vis_packeth->sender_orig); + copy_address_shallow(&pinfo->dl_src, &vis_packeth->sender_orig); /* Set info column */ col_add_fstr(pinfo->cinfo, COL_INFO, "[%s] Seq=%u", @@ -3413,12 +3413,12 @@ static void dissect_batadv_tt_query_v14(tvbuff_t *tvb, packet_info *pinfo _U_, p tt_query_packeth->flags = tvb_get_guint8(tvb, 3); TVB_SET_ADDRESS(&tt_query_packeth->dst, AT_ETHER, tvb, 4, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &tt_query_packeth->dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &tt_query_packeth->dst); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &tt_query_packeth->src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &tt_query_packeth->src); + copy_address_shallow(&pinfo->dl_src, &tt_query_packeth->src); + copy_address_shallow(&pinfo->src, &tt_query_packeth->src); tt_query_packeth->ttvn = tvb_get_guint8(tvb, 16); tt_query_packeth->tt_data = tvb_get_ntohs(tvb, 17); @@ -3559,11 +3559,11 @@ 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &roam_adv_packeth->dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &roam_adv_packeth->dst); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &roam_adv_packeth->src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &roam_adv_packeth->src); + 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 info column */ @@ -3685,15 +3685,15 @@ static void dissect_batadv_coded_v15(tvbuff_t *tvb, packet_info *pinfo, offset += 1; TVB_SET_ADDRESS(&coded_packeth->first_source, AT_ETHER, tvb, offset, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &coded_packeth->first_source); - COPY_ADDRESS_SHALLOW(&pinfo->src, &coded_packeth->first_source); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &coded_packeth->first_orig_dest); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &coded_packeth->first_orig_dest); + 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, tvb, offset, 6, ENC_NA); offset += 6; @@ -3826,15 +3826,15 @@ static void dissect_batadv_unicast_tvlv_v15(tvbuff_t *tvb, packet_info *pinfo, offset += 1; TVB_SET_ADDRESS(&unicast_tvlv_packeth->dest, AT_ETHER, tvb, offset, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &unicast_tvlv_packeth->dest); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &unicast_tvlv_packeth->dest); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &unicast_tvlv_packeth->src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &unicast_tvlv_packeth->src); + 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, tvb, offset, 6, ENC_NA); offset += 6; diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 140496fff8..99a4e3c897 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -1779,7 +1779,7 @@ decode_path_prefix4(proto_tree *tree, packet_info *pinfo, int hf_path_id, int hf return -1; } /* put prefix into protocol tree */ - SET_ADDRESS(&addr, AT_IPv4, 4, ip_addr.addr_bytes); + set_address(&addr, AT_IPv4, 4, ip_addr.addr_bytes); prefix_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4 + 1 + length, ett_bgp_prefix, NULL, "%s/%u PathId %u ", address_to_str(wmem_packet_scope(), &addr), plen, path_identifier); @@ -1815,7 +1815,7 @@ decode_prefix4(proto_tree *tree, packet_info *pinfo, proto_item *parent_item, in } /* put prefix into protocol tree */ - SET_ADDRESS(&addr, AT_IPv4, 4, ip_addr.addr_bytes); + set_address(&addr, AT_IPv4, 4, ip_addr.addr_bytes); prefix_tree = proto_tree_add_subtree_format(tree, tvb, offset, tlen != 0 ? tlen : 1 + length, ett_bgp_prefix, NULL, "%s/%u", address_to_str(wmem_packet_scope(), &addr), plen); @@ -1853,7 +1853,7 @@ decode_prefix6(proto_tree *tree, packet_info *pinfo, int hf_addr, tvbuff_t *tvb, } /* put prefix into protocol tree */ - SET_ADDRESS(&addr_str, AT_IPv6, 16, addr.bytes); + set_address(&addr_str, AT_IPv6, 16, addr.bytes); prefix_tree = proto_tree_add_subtree_format(tree, tvb, offset, tlen != 0 ? tlen : 1 + length, ett_bgp_prefix, NULL, "%s/%u", address_to_str(wmem_packet_scope(), &addr_str), plen); @@ -1890,7 +1890,7 @@ decode_fspec_match_prefix6(proto_tree *tree, proto_item *parent_item, int hf_add } /* put prefix into protocol tree */ - SET_ADDRESS(&addr_str, AT_IPv6, 16, addr.bytes); + set_address(&addr_str, AT_IPv6, 16, addr.bytes); prefix_tree = proto_tree_add_subtree_format(tree, tvb, offset, tlen != 0 ? tlen : 1 + length, ett_bgp_prefix, NULL, "%s/%u", address_to_str(wmem_packet_scope(), &addr_str), plen); @@ -4041,7 +4041,7 @@ decode_prefix_MP(proto_tree *tree, int hf_addr4, int hf_addr6, return -1; } - SET_ADDRESS(&addr, AT_IPv4, 4, ip4addr.addr_bytes); + set_address(&addr, AT_IPv4, 4, ip4addr.addr_bytes); prefix_tree = proto_tree_add_subtree_format(tree, tvb, start_offset, (offset + length) - start_offset, ett_bgp_prefix, NULL, @@ -4147,7 +4147,7 @@ decode_prefix_MP(proto_tree *tree, int hf_addr4, int hf_addr6, tag, plen + 16); return -1; } - SET_ADDRESS(&addr, AT_IPv4, 4, ip4addr.addr_bytes); + set_address(&addr, AT_IPv4, 4, ip4addr.addr_bytes); prefix_tree = proto_tree_add_subtree_format(tree, tvb, start_offset, (offset + length) - start_offset, ett_bgp_prefix, NULL, @@ -4194,7 +4194,7 @@ decode_prefix_MP(proto_tree *tree, int hf_addr4, int hf_addr6, tag, plen + (labnum * 3*8) + 8*8); return -1; } - SET_ADDRESS(&addr, AT_IPv4, 4, ip4addr.addr_bytes); + set_address(&addr, AT_IPv4, 4, ip4addr.addr_bytes); prefix_tree = proto_tree_add_subtree_format(tree, tvb, start_offset, (offset + 8 + length) - start_offset, ett_bgp_prefix, NULL, "BGP Prefix"); @@ -4255,7 +4255,7 @@ decode_prefix_MP(proto_tree *tree, int hf_addr4, int hf_addr6, } /* XXX - break off IPv6 into its own field */ - SET_ADDRESS(&addr, AT_IPv6, 16, ip6addr.bytes); + set_address(&addr, AT_IPv6, 16, ip6addr.bytes); proto_tree_add_string_format(tree, hf_bgp_label_stack, tvb, start_offset, (offset + length) - start_offset, wmem_strbuf_get_str(stack_strbuf), "Label Stack=%s, IPv6=%s/%u", @@ -4295,7 +4295,7 @@ decode_prefix_MP(proto_tree *tree, int hf_addr4, int hf_addr6, tag, plen + 16); return -1; } - SET_ADDRESS(&addr, AT_IPv6, 16, ip6addr.bytes); + set_address(&addr, AT_IPv6, 16, ip6addr.bytes); prefix_tree = proto_tree_add_subtree_format(tree, tvb, start_offset, (offset + length) - start_offset, ett_bgp_prefix, NULL, @@ -4346,7 +4346,7 @@ decode_prefix_MP(proto_tree *tree, int hf_addr4, int hf_addr6, } /* XXX - break up into multiple fields */ - SET_ADDRESS(&addr, AT_IPv6, 16, ip6addr.bytes); + set_address(&addr, AT_IPv6, 16, ip6addr.bytes); proto_tree_add_string_format(tree, hf_bgp_label_stack, tvb, start_offset, (offset + 8 + length) - start_offset, wmem_strbuf_get_str(stack_strbuf), "Label Stack=%s RD=%u:%u, IPv6=%s/%u", @@ -4367,7 +4367,7 @@ decode_prefix_MP(proto_tree *tree, int hf_addr4, int hf_addr6, } /* XXX - break up into multiple fields */ - SET_ADDRESS(&addr, AT_IPv6, 16, &ip6addr); + set_address(&addr, AT_IPv6, 16, &ip6addr); proto_tree_add_string_format(tree, hf_bgp_label_stack, tvb, start_offset, (offset + 8 + length) - start_offset, wmem_strbuf_get_str(stack_strbuf), "Label Stack=%s RD=%s:%u, IPv6=%s/%u", @@ -4388,7 +4388,7 @@ decode_prefix_MP(proto_tree *tree, int hf_addr4, int hf_addr6, } /* XXX - break up into multiple fields */ - SET_ADDRESS(&addr, AT_IPv6, 16, ip6addr.bytes); + set_address(&addr, AT_IPv6, 16, ip6addr.bytes); proto_tree_add_string_format(tree, hf_bgp_label_stack, tvb, start_offset, (offset + 8 + length) - start_offset, "Label Stack=%s RD=%u.%u:%u, IPv6=%s/%u", diff --git a/epan/dissectors/packet-btbnep.c b/epan/dissectors/packet-btbnep.c index 73a669b981..feb2384d1f 100644 --- a/epan/dissectors/packet-btbnep.c +++ b/epan/dissectors/packet-btbnep.c @@ -317,7 +317,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_DESTINATION_ONLY) { TVB_SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, tvb, offset, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); addr_item = proto_tree_add_item(btbnep_tree, hf_btbnep_dst, tvb, offset, 6, ENC_NA); addr_tree = proto_item_add_subtree(addr_item, ett_addr); @@ -329,7 +329,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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); addr_item = proto_tree_add_item(btbnep_tree, hf_btbnep_src, tvb, offset, 6, ENC_NA); addr_tree = proto_item_add_subtree(addr_item, ett_addr); diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index 9ed71f28c8..03248a8a67 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -488,13 +488,13 @@ dissect_bthci_acl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat expert_add_info(pinfo, bthci_acl_itam, &ei_invalid_session); } - SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, (int)strlen(src_name) + 1, src_name); - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, src_bd_addr); - SET_ADDRESS(&pinfo->src, AT_STRINGZ, (int)strlen(src_addr_name) + 1, src_addr_name); + set_address(&pinfo->net_src, AT_STRINGZ, (int)strlen(src_name) + 1, src_name); + set_address(&pinfo->dl_src, AT_ETHER, 6, src_bd_addr); + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(src_addr_name) + 1, src_addr_name); - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, (int)strlen(dst_name) + 1, dst_name); - SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, dst_bd_addr); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, (int)strlen(dst_addr_name) + 1, dst_addr_name); + set_address(&pinfo->net_dst, AT_STRINGZ, (int)strlen(dst_name) + 1, dst_name); + set_address(&pinfo->dl_dst, AT_ETHER, 6, dst_bd_addr); + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(dst_addr_name) + 1, dst_addr_name); if (!pinfo->fd->flags.visited) { address *addr; diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 19e8fbe81c..f9aeed3ef4 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -3098,12 +3098,12 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat break; } - SET_ADDRESS(&pinfo->src, AT_STRINGZ, 5, "host"); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, 11, "controller"); - SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, 5, "host"); - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, 11, "controller"); - SET_ADDRESS(&pinfo->dl_src, AT_STRINGZ, 5, "host"); - SET_ADDRESS(&pinfo->dl_dst, AT_STRINGZ, 11, "controller"); + set_address(&pinfo->src, AT_STRINGZ, 5, "host"); + set_address(&pinfo->dst, AT_STRINGZ, 11, "controller"); + set_address(&pinfo->net_src, AT_STRINGZ, 5, "host"); + set_address(&pinfo->net_dst, AT_STRINGZ, 11, "controller"); + set_address(&pinfo->dl_src, AT_STRINGZ, 5, "host"); + set_address(&pinfo->dl_dst, AT_STRINGZ, 11, "controller"); if (!pinfo->fd->flags.visited) { address *addr; diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index 90f790df64..ce3c59b834 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -3974,12 +3974,12 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat break; } - SET_ADDRESS(&pinfo->src, AT_STRINGZ, 11, "controller"); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, 5, "host"); - SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, 11, "controller"); - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, 5, "host"); - SET_ADDRESS(&pinfo->dl_src, AT_STRINGZ, 11, "controller"); - SET_ADDRESS(&pinfo->dl_dst, AT_STRINGZ, 5, "host"); + set_address(&pinfo->src, AT_STRINGZ, 11, "controller"); + set_address(&pinfo->dst, AT_STRINGZ, 5, "host"); + set_address(&pinfo->net_src, AT_STRINGZ, 11, "controller"); + set_address(&pinfo->net_dst, AT_STRINGZ, 5, "host"); + set_address(&pinfo->dl_src, AT_STRINGZ, 11, "controller"); + set_address(&pinfo->dl_dst, AT_STRINGZ, 5, "host"); if (!pinfo->fd->flags.visited) { address *addr; diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c index 4f2883ebff..81e9cc940d 100644 --- a/epan/dissectors/packet-bthci_sco.c +++ b/epan/dissectors/packet-bthci_sco.c @@ -197,23 +197,23 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void g_snprintf(remote_addr_name, remote_length, "%s (%s)", remote_ether_addr, remote_name); if (pinfo->p2p_dir == P2P_DIR_RECV) { - SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, (int)strlen(remote_name) + 1, remote_name); - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, remote_bdaddr->bd_addr); - SET_ADDRESS(&pinfo->src, AT_STRINGZ, (int)strlen(remote_addr_name) + 1, remote_addr_name); + set_address(&pinfo->net_src, AT_STRINGZ, (int)strlen(remote_name) + 1, remote_name); + set_address(&pinfo->dl_src, AT_ETHER, 6, remote_bdaddr->bd_addr); + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(remote_addr_name) + 1, remote_addr_name); } else if (pinfo->p2p_dir == P2P_DIR_SENT) { - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, (int)strlen(remote_name) + 1, remote_name); - SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, remote_bdaddr->bd_addr); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, (int)strlen(remote_addr_name) + 1, remote_addr_name); + set_address(&pinfo->net_dst, AT_STRINGZ, (int)strlen(remote_name) + 1, remote_name); + set_address(&pinfo->dl_dst, AT_ETHER, 6, remote_bdaddr->bd_addr); + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(remote_addr_name) + 1, remote_addr_name); } } else { if (pinfo->p2p_dir == P2P_DIR_RECV) { - SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, 1, ""); - SET_ADDRESS(&pinfo->dl_src, AT_STRINGZ, 1, ""); - SET_ADDRESS(&pinfo->src, AT_STRINGZ, 10, "remote ()"); + set_address(&pinfo->net_src, AT_STRINGZ, 1, ""); + set_address(&pinfo->dl_src, AT_STRINGZ, 1, ""); + set_address(&pinfo->src, AT_STRINGZ, 10, "remote ()"); } else if (pinfo->p2p_dir == P2P_DIR_SENT) { - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, 1, ""); - SET_ADDRESS(&pinfo->dl_dst, AT_STRINGZ, 1, ""); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, 10, "remote ()"); + set_address(&pinfo->net_dst, AT_STRINGZ, 1, ""); + set_address(&pinfo->dl_dst, AT_STRINGZ, 1, ""); + set_address(&pinfo->dst, AT_STRINGZ, 10, "remote ()"); } } @@ -257,13 +257,13 @@ dissect_bthci_sco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void g_snprintf(localhost_addr_name, localhost_length, "%s (%s)", localhost_ether_addr, localhost_name); if (pinfo->p2p_dir == P2P_DIR_RECV) { - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, (int)strlen(localhost_name) + 1, localhost_name); - SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, localhost_bdaddr); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, (int)strlen(localhost_addr_name) + 1, localhost_addr_name); + set_address(&pinfo->net_dst, AT_STRINGZ, (int)strlen(localhost_name) + 1, localhost_name); + set_address(&pinfo->dl_dst, AT_ETHER, 6, localhost_bdaddr); + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(localhost_addr_name) + 1, localhost_addr_name); } else if (pinfo->p2p_dir == P2P_DIR_SENT) { - SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, (int)strlen(localhost_name) + 1, localhost_name); - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, localhost_bdaddr); - SET_ADDRESS(&pinfo->src, AT_STRINGZ, (int)strlen(localhost_addr_name) + 1, localhost_addr_name); + set_address(&pinfo->net_src, AT_STRINGZ, (int)strlen(localhost_name) + 1, localhost_name); + set_address(&pinfo->dl_src, AT_ETHER, 6, localhost_bdaddr); + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(localhost_addr_name) + 1, localhost_addr_name); } proto_tree_add_item(bthci_sco_tree, hf_bthci_sco_data, tvb, offset, tvb_reported_length(tvb), ENC_NA); diff --git a/epan/dissectors/packet-btle.c b/epan/dissectors/packet-btle.c index a7d4583b27..3de949becd 100644 --- a/epan/dissectors/packet-btle.c +++ b/epan/dissectors/packet-btle.c @@ -444,13 +444,13 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) case 0x06: /* ADV_SCAN_IND */ offset = dissect_bd_addr(hf_advertising_address, pinfo, btle_tree, tvb, offset, TRUE, interface_id, adapter_id, src_bd_addr); - SET_ADDRESS(&pinfo->net_src, AT_ETHER, 6, src_bd_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &pinfo->net_src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + set_address(&pinfo->net_src, AT_ETHER, 6, src_bd_addr); + copy_address_shallow(&pinfo->dl_src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, 10, "broadcast"); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &pinfo->net_dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + set_address(&pinfo->net_dst, AT_STRINGZ, 10, "broadcast"); + copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); if (!pinfo->fd->flags.visited) { address *addr; @@ -479,13 +479,13 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) offset = dissect_bd_addr(hf_advertising_address, pinfo, btle_tree, tvb, offset, TRUE, interface_id, adapter_id, src_bd_addr); offset = dissect_bd_addr(hf_initiator_addresss, pinfo, btle_tree, tvb, offset, FALSE, interface_id, adapter_id, dst_bd_addr); - SET_ADDRESS(&pinfo->net_src, AT_ETHER, 6, src_bd_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &pinfo->net_src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + set_address(&pinfo->net_src, AT_ETHER, 6, src_bd_addr); + copy_address_shallow(&pinfo->dl_src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); - SET_ADDRESS(&pinfo->net_dst, AT_ETHER, 6, dst_bd_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &pinfo->net_dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + set_address(&pinfo->net_dst, AT_ETHER, 6, dst_bd_addr); + copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); if (!pinfo->fd->flags.visited) { address *addr; @@ -504,13 +504,13 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) offset = dissect_bd_addr(hf_scanning_address, pinfo, btle_tree, tvb, offset, TRUE, interface_id, adapter_id, src_bd_addr); offset = dissect_bd_addr(hf_advertising_address, pinfo, btle_tree, tvb, offset, FALSE, interface_id, adapter_id, dst_bd_addr); - SET_ADDRESS(&pinfo->net_src, AT_ETHER, 6, src_bd_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &pinfo->net_src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + set_address(&pinfo->net_src, AT_ETHER, 6, src_bd_addr); + copy_address_shallow(&pinfo->dl_src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); - SET_ADDRESS(&pinfo->net_dst, AT_ETHER, 6, dst_bd_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &pinfo->net_dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + set_address(&pinfo->net_dst, AT_ETHER, 6, dst_bd_addr); + copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); if (!pinfo->fd->flags.visited) { address *addr; @@ -528,13 +528,13 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) case 0x04: /* SCAN_RSP */ offset = dissect_bd_addr(hf_advertising_address, pinfo, btle_tree, tvb, offset, TRUE, interface_id, adapter_id, src_bd_addr); - SET_ADDRESS(&pinfo->net_src, AT_ETHER, 6, src_bd_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &pinfo->net_src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + set_address(&pinfo->net_src, AT_ETHER, 6, src_bd_addr); + copy_address_shallow(&pinfo->dl_src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, 10, "broadcast"); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &pinfo->net_dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + set_address(&pinfo->net_dst, AT_STRINGZ, 10, "broadcast"); + copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); if (!pinfo->fd->flags.visited) { address *addr; @@ -566,13 +566,13 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) offset = dissect_bd_addr(hf_initiator_addresss, pinfo, btle_tree, tvb, offset, FALSE, interface_id, adapter_id, src_bd_addr); offset = dissect_bd_addr(hf_advertising_address, pinfo, btle_tree, tvb, offset, TRUE, interface_id, adapter_id, dst_bd_addr); - SET_ADDRESS(&pinfo->net_src, AT_ETHER, 6, src_bd_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &pinfo->net_src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + set_address(&pinfo->net_src, AT_ETHER, 6, src_bd_addr); + copy_address_shallow(&pinfo->dl_src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); - SET_ADDRESS(&pinfo->net_dst, AT_ETHER, 6, dst_bd_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &pinfo->net_dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + set_address(&pinfo->net_dst, AT_ETHER, 6, dst_bd_addr); + copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); if (!pinfo->fd->flags.visited) { address *addr; @@ -683,13 +683,13 @@ dissect_btle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) g_snprintf(str_addr, str_addr_len, "unknown_0x%08x", connection_address->access_address); - SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, str_addr_len, str_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &pinfo->net_src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + set_address(&pinfo->net_src, AT_STRINGZ, str_addr_len, str_addr); + copy_address_shallow(&pinfo->dl_src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, str_addr_len, str_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &pinfo->net_dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + set_address(&pinfo->net_dst, AT_STRINGZ, str_addr_len, str_addr); + copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); if (!pinfo->fd->flags.visited) { address *addr; diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index df8a461b2e..21475e2a72 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -2602,7 +2602,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) TVB_SET_ADDRESS(&pinfo->net_src, (source_addr_length == 4) ? AT_IPv4 : AT_IPv6, tvb, source_addr_offset, source_addr_length); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); proto_tree_add_item(ipprim_tree, (source_addr_length == 4) ? @@ -2643,7 +2643,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) TVB_SET_ADDRESS(&pinfo->net_dst, (dest_addr_length == 4) ? AT_IPv4 : AT_IPv6, tvb, dest_addr_offset, dest_addr_length); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); proto_tree_add_item(ipprim_tree, (dest_addr_length == 4) ? hf_catapult_dct2000_ipprim_dst_addr_v4 : @@ -2752,7 +2752,7 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) TVB_SET_ADDRESS(&pinfo->net_dst, (dest_addr_length == 4) ? AT_IPv4 : AT_IPv6, tvb, dest_addr_offset, dest_addr_length); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); proto_tree_add_item(sctpprim_tree, (dest_addr_length == 4) ? hf_catapult_dct2000_sctpprim_dst_addr_v4 : diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c index 79d23e6260..cafacf9a05 100644 --- a/epan/dissectors/packet-ceph.c +++ b/epan/dissectors/packet-ceph.c @@ -1560,7 +1560,7 @@ c_pkt_data_init(c_pkt_data *d, packet_info *pinfo, guint off) } /*** Set up src and dst pointers correctly. ***/ - if (ADDRESSES_EQUAL(&d->convd->client.addr, &pinfo->src) && + if (addresses_equal(&d->convd->client.addr, &pinfo->src) && d->convd->client.port == pinfo->srcport) { d->src = &d->convd->client; diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index ea55c31c2a..fa8f949eab 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -390,7 +390,7 @@ dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } nsel = tvb_get_guint8(tvb, offset + dst_len - 1); TVB_SET_ADDRESS(&pinfo->net_dst, get_osi_address_type(), tvb, offset, dst_len); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); proto_tree_add_bytes_format_value(clnp_tree, hf_clnp_dest, tvb, offset, dst_len, NULL, "%s", @@ -426,7 +426,7 @@ dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } TVB_SET_ADDRESS(&pinfo->net_src, get_osi_address_type(), tvb, offset, src_len); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); proto_tree_add_bytes_format_value(clnp_tree, hf_clnp_src, tvb, offset, src_len, NULL, diff --git a/epan/dissectors/packet-dbus.c b/epan/dissectors/packet-dbus.c index e336e51acf..fc124ae978 100644 --- a/epan/dissectors/packet-dbus.c +++ b/epan/dissectors/packet-dbus.c @@ -396,7 +396,7 @@ dissect_dbus_field_signature(tvbuff_t *tvb, packet_info *pinfo, dbus_info_t *din offset = dissect_dbus_sig(tvb, dinfo, tree, offset, 's', &addr_val); if (offset != -1) - SET_ADDRESS((field_code == DBUS_HEADER_FIELD_DESTINATION) ? &dinfo->pinfo->dst : &dinfo->pinfo->src, + set_address((field_code == DBUS_HEADER_FIELD_DESTINATION) ? &dinfo->pinfo->dst : &dinfo->pinfo->src, AT_STRINGZ, (int)strlen(addr_val.str)+1, wmem_strdup(pinfo->pool, addr_val.str)); return offset; } diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index bbbfae05eb..bb0e57fb48 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -612,8 +612,8 @@ dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ dccph = wmem_new0(wmem_packet_scope(), e_dccphdr); dccph->sport = tvb_get_ntohs(tvb, offset); dccph->dport = tvb_get_ntohs(tvb, offset + 2); - COPY_ADDRESS_SHALLOW(&dccph->ip_src, &pinfo->src); - COPY_ADDRESS_SHALLOW(&dccph->ip_dst, &pinfo->dst); + copy_address_shallow(&dccph->ip_src, &pinfo->src); + copy_address_shallow(&dccph->ip_dst, &pinfo->dst); col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCCP"); col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index e1e835926c..f44f3c1b33 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -581,11 +581,11 @@ netlogon_auth_equal (gconstpointer k1, gconstpointer k2) const netlogon_auth_key *key1 = (const netlogon_auth_key *)k1; const netlogon_auth_key *key2 = (const netlogon_auth_key *)k2; if(key1->name == NULL || key2->name ==NULL) - return ((key1->srcport == key2->srcport) && (key1->dstport == key2->dstport) && ADDRESSES_EQUAL(&key1->src,&key2->src) && - ADDRESSES_EQUAL(&key1->dst,&key2->dst)); + return ((key1->srcport == key2->srcport) && (key1->dstport == key2->dstport) && addresses_equal(&key1->src,&key2->src) && + addresses_equal(&key1->dst,&key2->dst)); else - return ((strcmp(key1->name,key2->name)==0) && ADDRESSES_EQUAL(&key1->src,&key2->src) && - ADDRESSES_EQUAL(&key1->dst,&key2->dst)); + return ((strcmp(key1->name,key2->name)==0) && addresses_equal(&key1->src,&key2->src) && + addresses_equal(&key1->dst,&key2->dst)); } static guint @@ -2392,14 +2392,14 @@ static void generate_hash_key(packet_info *pinfo,unsigned char is_server,netlogo if(is_server) { key->dstport = pinfo->srcport; key->srcport = pinfo->destport; - COPY_ADDRESS(&key->dst,&pinfo->src); - COPY_ADDRESS(&key->src,&pinfo->dst); + copy_address(&key->dst,&pinfo->src); + copy_address(&key->src,&pinfo->dst); /* name has been durably allocated */ key->name = name; } else { - COPY_ADDRESS(&key->dst,&pinfo->dst); - COPY_ADDRESS(&key->src,&pinfo->src); + copy_address(&key->dst,&pinfo->dst); + copy_address(&key->src,&pinfo->src); key->dstport = pinfo->destport; key->srcport = pinfo->srcport; /* name has been durably allocated */ diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index b5258d43f9..6c5ca8f130 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -827,8 +827,8 @@ dcerpc_value(packet_info *pinfo) /* clone binding */ binding = g_new(decode_dcerpc_bind_values_t,1); - COPY_ADDRESS(&binding->addr_a, &pinfo->src); - COPY_ADDRESS(&binding->addr_b, &pinfo->dst); + copy_address(&binding->addr_a, &pinfo->src); + copy_address(&binding->addr_b, &pinfo->dst); binding->ptype = pinfo->ptype; binding->port_a = pinfo->srcport; binding->port_b = pinfo->destport; @@ -880,8 +880,8 @@ decode_dcerpc_binding_cmp(gconstpointer a, gconstpointer b) /* don't compare uuid and ver! */ if ( - ADDRESSES_EQUAL(&binding_a->addr_a, &binding_b->addr_a) && - ADDRESSES_EQUAL(&binding_a->addr_b, &binding_b->addr_b) && + addresses_equal(&binding_a->addr_a, &binding_b->addr_a) && + addresses_equal(&binding_a->addr_b, &binding_b->addr_b) && binding_a->ptype == binding_b->ptype && binding_a->port_a == binding_b->port_a && binding_a->port_b == binding_b->port_b && @@ -940,8 +940,8 @@ dcerpc_decode_as_change(const char *name, const gpointer pattern, gpointer handl /* clone the new binding and append it to the list */ stored_binding = g_new(decode_dcerpc_bind_values_t,1); *stored_binding = *binding; - COPY_ADDRESS(&stored_binding->addr_a, &binding->addr_a); - COPY_ADDRESS(&stored_binding->addr_b, &binding->addr_b); + copy_address(&stored_binding->addr_a, &binding->addr_a); + copy_address(&stored_binding->addr_b, &binding->addr_b); stored_binding->ifname = g_string_new(binding->ifname->str); decode_dcerpc_bindings = g_slist_append (decode_dcerpc_bindings, stored_binding); @@ -1021,8 +1021,8 @@ dcerpc_fragment_equal(gconstpointer k1, gconstpointer k2) the comparison of addresses. */ return (((key1->id == key2->id) - && (ADDRESSES_EQUAL(&key1->src, &key2->src)) - && (ADDRESSES_EQUAL(&key1->dst, &key2->dst)) + && (addresses_equal(&key1->src, &key2->src)) + && (addresses_equal(&key1->dst, &key2->dst)) && (memcmp (&key1->act_id, &key2->act_id, sizeof (e_guid_t)) == 0)) ? TRUE : FALSE); } @@ -1051,8 +1051,8 @@ dcerpc_fragment_persistent_key(const packet_info *pinfo, const guint32 id, dcerpc_fragment_key *key = g_slice_new(dcerpc_fragment_key); e_dce_dg_common_hdr_t *hdr = (e_dce_dg_common_hdr_t *)data; - COPY_ADDRESS(&key->src, &pinfo->src); - COPY_ADDRESS(&key->dst, &pinfo->dst); + copy_address(&key->src, &pinfo->src); + copy_address(&key->dst, &pinfo->dst); key->id = id; key->act_id = hdr->act_id; diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index d4014dbbd8..8ab4fe05d6 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -337,7 +337,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_ dcom_iter = dcom_machines; while(dcom_iter != NULL) { machine = (dcom_machine_t *)dcom_iter->data; - if(CMP_ADDRESS(&machine->ip, addr) == 0) { + if(cmp_address(&machine->ip, addr) == 0) { break; } dcom_iter = g_list_next(dcom_iter); @@ -346,7 +346,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_ /* create new machine if not found */ if(dcom_iter == NULL) { machine = g_new(dcom_machine_t,1); - COPY_ADDRESS(&machine->ip, addr); + copy_address(&machine->ip, addr); machine->objects = NULL; machine->first_packet = pinfo->fd->num; dcom_machines = g_list_append(dcom_machines, machine); @@ -1840,8 +1840,8 @@ dissect_dcom_DUALSTRINGARRAY(tvbuff_t *tvb, gint offset, packet_info *pinfo, if(first_ip != curr_ip) { address first_ip_addr, curr_ip_addr; - SET_ADDRESS(&first_ip_addr, AT_IPv4, 4, &first_ip); - SET_ADDRESS(&curr_ip_addr, AT_IPv4, 4, &curr_ip); + set_address(&first_ip_addr, AT_IPv4, 4, &first_ip); + set_address(&curr_ip_addr, AT_IPv4, 4, &curr_ip); expert_add_info_format(pinfo, pi, &ei_dcom_dualstringarray_mult_ip, "DUALSTRINGARRAY: multiple IP's %s %s", address_to_str(wmem_packet_scope(), &first_ip_addr), address_to_str(wmem_packet_scope(), &curr_ip_addr)); @@ -2101,7 +2101,7 @@ dissect_dcom_OBJREF(tvbuff_t *tvb, gint offset, packet_info *pinfo, if(pinfo->net_src.type == AT_IPv4) { address addr; - SET_ADDRESS(&addr, AT_IPv4, 4, ip); + set_address(&addr, AT_IPv4, 4, ip); dcom_if = dcom_interface_new(pinfo, &addr, &iid, oxid, oid, &ipid); diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 08d8b92885..ac7f38fb2d 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -353,7 +353,7 @@ set_dnet_address(packet_info *pinfo, address *paddr_src, address *paddr_tgt) if (paddr_tgt->type != AT_STRINGZ && paddr_src->type == AT_ETHER) { char *addr = dnet_ntoa((const guint8 *)paddr_src->data); if (addr != NULL) - SET_ADDRESS(paddr_tgt, AT_STRINGZ, 1, + set_address(paddr_tgt, AT_STRINGZ, 1, wmem_strdup(pinfo->pool, addr)); } } diff --git a/epan/dissectors/packet-devicenet.c b/epan/dissectors/packet-devicenet.c index 4412654b1d..d75f662cd2 100644 --- a/epan/dissectors/packet-devicenet.c +++ b/epan/dissectors/packet-devicenet.c @@ -461,7 +461,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Set source address */ src_address = (guint8*)wmem_alloc(pinfo->pool, 1); *src_address = (guint8)(can_id.id & MESSAGE_GROUP_1_MAC_ID_MASK); - SET_ADDRESS(&pinfo->src, devicenet_address_type, 1, (const void*)src_address); + set_address(&pinfo->src, devicenet_address_type, 1, (const void*)src_address); message_id = can_id.id & MESSAGE_GROUP_1_MSG_MASK; col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(message_id, devicenet_grp_msg1_vals, "Other Group 1 Message")); @@ -486,7 +486,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Set source address */ src_address = (guint8*)wmem_alloc(pinfo->pool, 1); *src_address = (guint8)((can_id.id & MESSAGE_GROUP_2_MAC_ID_MASK) >> 3); - SET_ADDRESS(&pinfo->src, devicenet_address_type, 1, (const void*)src_address); + set_address(&pinfo->src, devicenet_address_type, 1, (const void*)src_address); content_tree = proto_tree_add_subtree(devicenet_tree, tvb, offset, -1, ett_devicenet_contents, NULL, "Contents"); @@ -532,7 +532,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Set source address */ src_address = (guint8*)wmem_alloc(pinfo->pool, 1); *src_address = (guint8)(can_id.id & MESSAGE_GROUP_3_MAC_ID_MASK); - SET_ADDRESS(&pinfo->src, devicenet_address_type, 1, (const void*)src_address); + set_address(&pinfo->src, devicenet_address_type, 1, (const void*)src_address); message_id = can_id.id & MESSAGE_GROUP_3_MSG_MASK; col_set_str(pinfo->cinfo, COL_INFO, val_to_str_const(message_id, devicenet_grp_msg3_vals, "Unknown")); @@ -547,7 +547,7 @@ static int dissect_devicenet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* XXX - This may be source address depending on message type. Need to adjust accordingly) */ dest_address = (guint8*)wmem_alloc(pinfo->pool, 1); *dest_address = (guint8)source_mac; - SET_ADDRESS(&pinfo->dst, devicenet_address_type, 1, (const void*)dest_address); + set_address(&pinfo->dst, devicenet_address_type, 1, (const void*)dest_address); offset++; if (byte1 & MESSAGE_GROUP_3_FRAG_MASK) diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index f855bdb545..f2240eb037 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -511,7 +511,7 @@ dissect_diameter_base_framed_ipv6_prefix(tvbuff_t *tvb, packet_info *pinfo _U_, tvb_memcpy(tvb, (guint8 *)&value.bytes, 2, prefix_len_bytes); value.bytes[prefix_len_bytes] = value.bytes[prefix_len_bytes] & (0xff<<(prefix_len % 8)); proto_tree_add_ipv6(tree, hf_framed_ipv6_prefix_ipv6, tvb, 2, prefix_len_bytes, &value); - SET_ADDRESS(&addr, AT_IPv6, 16, value.bytes); + set_address(&addr, AT_IPv6, 16, value.bytes); diam_sub_dis->avp_str = wmem_strdup_printf(wmem_packet_scope(), "%s/%u", address_to_str(wmem_packet_scope(), &addr), prefix_len); } diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c index 815d6a2e3e..3b7fa2016d 100644 --- a/epan/dissectors/packet-dmp.c +++ b/epan/dissectors/packet-dmp.c @@ -1376,8 +1376,8 @@ static gint dmp_id_hash_equal (gconstpointer k1, gconstpointer k2) if (dmp1->id != dmp2->id) return 0; - return (ADDRESSES_EQUAL (&dmp1->src, &dmp2->src) && - ADDRESSES_EQUAL (&dmp1->dst, &dmp2->dst)); + return (addresses_equal (&dmp1->src, &dmp2->src) && + addresses_equal (&dmp1->dst, &dmp2->dst)); } static void register_dmp_id (packet_info *pinfo, guint8 reason) diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index ddb90c2158..33b48233b8 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -2624,7 +2624,7 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset, } name_out = format_text(pname, strlen(pname)); - SET_ADDRESS(&suffix_addr, AT_IPv6, 16, suffix.bytes); + set_address(&suffix_addr, AT_IPv6, 16, suffix.bytes); col_append_fstr(pinfo->cinfo, COL_INFO, " %d %s %s", pre_len, address_to_str(wmem_packet_scope(), &suffix_addr), diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index 800b404f9c..4360e4c2d4 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -1650,15 +1650,15 @@ dvbci_set_addrs(guint8 event, packet_info *pinfo) return -1; if (event == DVBCI_EVT_DATA_HOST_TO_CAM) { - SET_ADDRESS(&pinfo->src, AT_STRINGZ, + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_HOST)+1, ADDR_HOST); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_CAM)+1 , ADDR_CAM); } else { - SET_ADDRESS(&pinfo->src, AT_STRINGZ, + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_CAM)+1 , ADDR_CAM); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_HOST)+1, ADDR_HOST); } @@ -1673,12 +1673,12 @@ dvbci_get_evt_from_addrs(packet_info *pinfo) static const address a_cam = { AT_STRINGZ, sizeof(ADDR_CAM), ADDR_CAM }; static const address a_host = { AT_STRINGZ, sizeof(ADDR_HOST), ADDR_HOST }; - if ( ADDRESSES_EQUAL(&(pinfo->src), &a_cam) && - ADDRESSES_EQUAL(&(pinfo->dst), &a_host) ) { + if ( addresses_equal(&(pinfo->src), &a_cam) && + addresses_equal(&(pinfo->dst), &a_host) ) { return DVBCI_EVT_DATA_CAM_TO_HOST; } - else if ( ADDRESSES_EQUAL(&(pinfo->src), &a_host) && - ADDRESSES_EQUAL(&(pinfo->dst), &a_cam) ) { + else if ( addresses_equal(&(pinfo->src), &a_host) && + addresses_equal(&(pinfo->dst), &a_cam) ) { return DVBCI_EVT_DATA_HOST_TO_CAM; } else diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 75c61e49dd..0f39a458a8 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -1119,7 +1119,7 @@ dissect_eigrp_ipv4_addr (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, proto_tree_add_item(tree, hf_eigrp_ipv4_prefixlen, tvb, offset, 1, ENC_BIG_ENDIAN); offset += 1; - SET_ADDRESS(&addr, AT_IPv4, 4, ip_addr); + set_address(&addr, AT_IPv4, 4, ip_addr); ti_dst = proto_tree_add_ipv4(tree, hf_eigrp_ipv4_destination, tvb, offset, addr_len, *ip_addr); /* add it to the top level line */ @@ -1178,7 +1178,7 @@ dissect_eigrp_ipv6_addr (proto_item *ti, proto_tree *tree, tvbuff_t *tvb, addr_len++; } - SET_ADDRESS(&addr_str, AT_IPv6, 16, addr.bytes); + set_address(&addr_str, AT_IPv6, 16, addr.bytes); ti_dst = proto_tree_add_ipv6(tree, hf_eigrp_ipv6_destination, tvb, offset, addr_len, &addr); /* add it to the top level line */ diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c index 67cbd76bb2..c7a9c76e5e 100644 --- a/epan/dissectors/packet-eth.c +++ b/epan/dissectors/packet-eth.c @@ -313,14 +313,14 @@ 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); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); - COPY_ADDRESS_SHALLOW(&ehdr->dst, &pinfo->dl_dst); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); - COPY_ADDRESS_SHALLOW(&ehdr->src, &pinfo->dl_src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&ehdr->src, &pinfo->dl_src); src_addr = (const guint8*)pinfo->src.data; src_addr_name = get_ether_name(src_addr); diff --git a/epan/dissectors/packet-exported_pdu.c b/epan/dissectors/packet-exported_pdu.c index 3bf022d215..25545588e0 100644 --- a/epan/dissectors/packet-exported_pdu.c +++ b/epan/dissectors/packet-exported_pdu.c @@ -132,22 +132,22 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) 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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); break; case EXP_PDU_TAG_PORT_TYPE: pinfo->ptype = (port_type)tvb_get_ntohl(tvb, offset); @@ -168,7 +168,7 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mtp3_addr->pc = tvb_get_ntohl(tvb, offset); mtp3_addr->type = (Standard_Type)tvb_get_ntohs(tvb, offset+4); mtp3_addr->ni = tvb_get_guint8(tvb, offset+6); - SET_ADDRESS(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr); + set_address(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr); break; case EXP_PDU_TAG_SS7_DPC: proto_tree_add_item(tag_tree, hf_exported_pdu_ss7_dpc, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -176,7 +176,7 @@ dissect_exported_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mtp3_addr->pc = tvb_get_ntohl(tvb, offset); mtp3_addr->type = (Standard_Type)tvb_get_ntohs(tvb, offset+4); mtp3_addr->ni = tvb_get_guint8(tvb, offset+6); - SET_ADDRESS(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr); + set_address(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr); break; case EXP_PDU_TAG_ORIG_FNO: proto_tree_add_item(tag_tree, hf_exported_pdu_orig_fno, tvb, offset, 4, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 40bca87989..284e8fccde 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -752,8 +752,8 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean pinfo->srcport=0; pinfo->destport=0; } - SET_ADDRESS(&fchdr->d_id, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data); - SET_ADDRESS(&fchdr->s_id, pinfo->src.type, pinfo->src.len, pinfo->src.data); + set_address(&fchdr->d_id, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data); + set_address(&fchdr->s_id, pinfo->src.type, pinfo->src.len, pinfo->src.data); fchdr->cs_ctl = tvb_get_guint8 (tvb, offset+4); fchdr->type = tvb_get_guint8 (tvb, offset+8); @@ -918,7 +918,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean PROTO_ITEM_SET_HIDDEN(hidden_item); /* XXX - use "fc_wka_vals[]" on this? */ - SET_ADDRESS(&addr, AT_FC, 3, fchdr->d_id.data); + set_address(&addr, AT_FC, 3, fchdr->d_id.data); proto_tree_add_item(fc_tree, hf_fc_did, tvb, offset+1, 3, ENC_NA); hidden_item = proto_tree_add_item (fc_tree, hf_fc_id, tvb, offset+1, 3, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); @@ -926,7 +926,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean proto_tree_add_uint (fc_tree, hf_fc_csctl, tvb, offset+4, 1, fchdr->cs_ctl); /* XXX - use "fc_wka_vals[]" on this? */ - SET_ADDRESS(&addr, AT_FC, 3, fchdr->s_id.data); + set_address(&addr, AT_FC, 3, fchdr->s_id.data); proto_tree_add_item(fc_tree, hf_fc_sid, tvb, offset+5, 3, ENC_NA); hidden_item = proto_tree_add_item (fc_tree, hf_fc_id, tvb, offset+5, 3, ENC_NA); PROTO_ITEM_SET_HIDDEN(hidden_item); diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c index ea412a573e..519c5379cc 100644 --- a/epan/dissectors/packet-fcct.c +++ b/epan/dissectors/packet-fcct.c @@ -189,7 +189,7 @@ dissect_fcct (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) proto_tree_add_item (fcct_tree, hf_fcct_revision, tvb, offset++, sizeof (guint8), ENC_BIG_ENDIAN); - SET_ADDRESS(&addr, AT_FC, 3, &in_id); + set_address(&addr, AT_FC, 3, &in_id); proto_tree_add_string (fcct_tree, hf_fcct_inid, tvb, offset, 3, address_to_str(wmem_packet_scope(), &addr)); offset += 3; /* sizeof FC address */ diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index 30e3934aee..3d1d17991f 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -1938,7 +1938,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) addrdata[0] = addrdata[1] = 0; addrdata[2] = dstfc[2]; - SET_ADDRESS (&dstaddr, AT_FC, 3, addrdata); + set_address (&dstaddr, AT_FC, 3, addrdata); conversation = find_conversation (pinfo->fd->num, &dstaddr, &pinfo->src, pinfo->ptype, fchdr->oxid, fchdr->rxid, options); diff --git a/epan/dissectors/packet-fcoib.c b/epan/dissectors/packet-fcoib.c index 27b0054f20..c71e2f8105 100644 --- a/epan/dissectors/packet-fcoib.c +++ b/epan/dissectors/packet-fcoib.c @@ -130,12 +130,12 @@ manual_addr_match(packet_info *pinfo) { if (gPREF_MAN_EN) { /* If the manual settings are enabled see if this fits - in which case we can skip the following checks entirely and go straight to dissecting */ - if ( (ADDRESSES_EQUAL(&pinfo->src, &manual_addr[0]) && - ADDRESSES_EQUAL(&pinfo->dst, &manual_addr[1]) && + if ( (addresses_equal(&pinfo->src, &manual_addr[0]) && + addresses_equal(&pinfo->dst, &manual_addr[1]) && (pinfo->srcport == 0xffffffff /* is unknown */ || pinfo->srcport == gPREF_QP[0]) && (pinfo->destport == 0xffffffff /* is unknown */ || pinfo->destport == gPREF_QP[1])) || - (ADDRESSES_EQUAL(&pinfo->src, &manual_addr[1]) && - ADDRESSES_EQUAL(&pinfo->dst, &manual_addr[0]) && + (addresses_equal(&pinfo->src, &manual_addr[1]) && + addresses_equal(&pinfo->dst, &manual_addr[0]) && (pinfo->srcport == 0xffffffff /* is unknown */ || pinfo->srcport == gPREF_QP[1]) && (pinfo->destport == 0xffffffff /* is unknown */ || pinfo->destport == gPREF_QP[0])) ) return TRUE; @@ -438,13 +438,13 @@ proto_reg_handoff_fcoib(void) if (errno || *not_parsed != '\0') { error_occured = TRUE; } else { - SET_ADDRESS(&manual_addr[i], AT_IB, sizeof(guint16), manual_addr_data[i]); + set_address(&manual_addr[i], AT_IB, sizeof(guint16), manual_addr_data[i]); } } else { /* GID */ if (!str_to_ip6( gPREF_ID[i], manual_addr_data[i])) { error_occured = TRUE; } else { - SET_ADDRESS(&manual_addr[i], AT_IB, GID_SIZE, manual_addr_data[i]); + set_address(&manual_addr[i], AT_IB, GID_SIZE, manual_addr_data[i]); } } diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index e66925a50e..abda0ff52e 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -368,9 +368,9 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb_memcpy(tvb, dst, FDDI_P_DHOST + FDDI_PADDING, 6); swap_mac_addr(dst_swapped, tvb, FDDI_P_DHOST + FDDI_PADDING); - SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); - COPY_ADDRESS_SHALLOW(&fddihdr->dst, &pinfo->dl_dst); + set_address(&pinfo->dl_dst, AT_ETHER, 6, dst); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); + copy_address_shallow(&fddihdr->dst, &pinfo->dl_dst); if (fh_tree) { proto_tree_add_ether(fh_tree, hf_fddi_dst, tvb, FDDI_P_DHOST + FDDI_PADDING, 6, dst); @@ -391,9 +391,9 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, tvb_memcpy(tvb, src, FDDI_P_SHOST + FDDI_PADDING, 6); swap_mac_addr(src_swapped, tvb, FDDI_P_SHOST + FDDI_PADDING); - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); - COPY_ADDRESS_SHALLOW(&fddihdr->src, &pinfo->dl_src); + set_address(&pinfo->dl_src, AT_ETHER, 6, src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&fddihdr->src, &pinfo->dl_src); if (fh_tree) { proto_tree_add_ether(fh_tree, hf_fddi_src, tvb, FDDI_P_SHOST + FDDI_PADDING, 6, src); diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 9c10089a69..a3807182cc 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -690,8 +690,8 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, pasv_offset + (tokenlen+1) , ftp_ip_len, ftp_ip); proto_tree_add_uint(reqresp_tree, hf_ftp_active_port, tvb, pasv_offset + 1 + (tokenlen+1) + ftp_ip_len, ftp_port_len, ftp_port); - SET_ADDRESS(&ftp_ip_address, AT_IPv4, 4, (const guint8 *)&ftp_ip); - ftp_nat = !ADDRESSES_EQUAL(&pinfo->src, &ftp_ip_address); + set_address(&ftp_ip_address, AT_IPv4, 4, (const guint8 *)&ftp_ip); + ftp_nat = !addresses_equal(&pinfo->src, &ftp_ip_address); if (ftp_nat) { proto_tree_add_boolean(reqresp_tree, hf_ftp_active_nat, tvb, 0, 0, ftp_nat); @@ -710,9 +710,9 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, pasv_offset + 4, ftp_ip_len, pasv_ip); proto_tree_add_uint(reqresp_tree, hf_ftp_pasv_port, tvb, pasv_offset + 4 + 1 + ftp_ip_len, ftp_port_len, ftp_port); - SET_ADDRESS(&ftp_ip_address, AT_IPv4, 4, + set_address(&ftp_ip_address, AT_IPv4, 4, (const guint8 *)&pasv_ip); - ftp_nat = !ADDRESSES_EQUAL(&pinfo->src, &ftp_ip_address); + ftp_nat = !addresses_equal(&pinfo->src, &ftp_ip_address); if (ftp_nat) { proto_tree_add_boolean(reqresp_tree, hf_ftp_pasv_nat, tvb, 0, 0, ftp_nat); @@ -778,13 +778,13 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (eprt_af == EPRT_AF_IPv4) { proto_tree_add_ipv4(reqresp_tree, hf_ftp_eprt_ip, tvb, eprt_offset, eprt_ip_len, eprt_ip); - SET_ADDRESS(&ftp_ip_address, AT_IPv4, 4, + set_address(&ftp_ip_address, AT_IPv4, 4, (const guint8 *)&eprt_ip); } else if (eprt_af == EPRT_AF_IPv6) { proto_tree_add_ipv6(reqresp_tree, hf_ftp_eprt_ipv6, tvb, eprt_offset, eprt_ip_len, (const struct e_in6_addr *)eprt_ipv6); - SET_ADDRESS(&ftp_ip_address, AT_IPv6, 16, eprt_ipv6); + set_address(&ftp_ip_address, AT_IPv6, 16, eprt_ipv6); } eprt_offset += eprt_ip_len + 1; /* addr, 3rd delimiter */ diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 42020e1c87..8aa25a161e 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -546,12 +546,12 @@ find_or_create_call_info_conv(packet_info * pinfo) conversation_add_proto_data(conv, proto_h223, datax); /* add the source details so we can distinguish directions * in future */ - COPY_ADDRESS(&(datax -> srcaddress), &(pinfo->src)); + copy_address(&(datax -> srcaddress), &(pinfo->src)); datax -> srcport = pinfo->srcport; } /* work out what direction we're really going in */ - if( ADDRESSES_EQUAL( &(pinfo->src), &(datax->srcaddress)) + if( addresses_equal( &(pinfo->src), &(datax->srcaddress)) && pinfo->srcport == datax->srcport ) pinfo->p2p_dir = P2P_DIR_SENT; else diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c index bddb5de63a..96c7ef587d 100644 --- a/epan/dissectors/packet-h225.c +++ b/epan/dissectors/packet-h225.c @@ -1705,9 +1705,9 @@ dissect_h225_H245TransportAddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t conversation_t *conv=NULL; if (ipv4_address!=0) { - SET_ADDRESS(&src_addr, AT_IPv4, 4, &ipv4_address); + set_address(&src_addr, AT_IPv4, 4, &ipv4_address); } else if (memcmp(ipv6_address.bytes, ipv6_address_zeros.bytes, sizeof(ipv6_address.bytes))!=0) { - SET_ADDRESS(&src_addr, AT_IPv6, 16, ipv6_address.bytes); + set_address(&src_addr, AT_IPv6, 16, ipv6_address.bytes); } else { return offset; } diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index c0faf4ace3..f3f26ecaba 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -466,7 +466,7 @@ static void update_unicast_addr(unicast_addr_t *req_addr, unicast_addr_t *ack_ad { if (ack_addr->addr.type!=AT_NONE && ack_addr->port!=0) { memcpy(req_addr->addr_buf, ack_addr->addr_buf, sizeof(req_addr->addr_buf)); - SET_ADDRESS(&req_addr->addr, ack_addr->addr.type, ack_addr->addr.len, req_addr->addr_buf); + set_address(&req_addr->addr, ack_addr->addr.type, ack_addr->addr.len, req_addr->addr_buf); req_addr->port = ack_addr->port; } } @@ -8015,7 +8015,7 @@ dissect_h245_Ipv4_network(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U if (upcoming_channel && upcoming_channel->upcoming_addr) { tvb_memcpy(value_tvb, upcoming_channel->upcoming_addr->addr_buf, 0, 4); - SET_ADDRESS(&upcoming_channel->upcoming_addr->addr, AT_IPv4, 4, upcoming_channel->upcoming_addr->addr_buf); + set_address(&upcoming_channel->upcoming_addr->addr, AT_IPv4, 4, upcoming_channel->upcoming_addr->addr_buf); } @@ -8115,7 +8115,7 @@ dissect_h245_T_ip6_network(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _ if (upcoming_channel && upcoming_channel->upcoming_addr) { tvb_memcpy(value_tvb, upcoming_channel->upcoming_addr->addr_buf, 0, 16); - SET_ADDRESS(&upcoming_channel->upcoming_addr->addr, AT_IPv6, 16, upcoming_channel->upcoming_addr->addr_buf); + set_address(&upcoming_channel->upcoming_addr->addr, AT_IPv6, 16, upcoming_channel->upcoming_addr->addr_buf); } diff --git a/epan/dissectors/packet-hdmi.c b/epan/dissectors/packet-hdmi.c index 50c2f407f8..a9da459aa3 100644 --- a/epan/dissectors/packet-hdmi.c +++ b/epan/dissectors/packet-hdmi.c @@ -168,13 +168,13 @@ dissect_hdmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ hdmi_tree = proto_item_add_subtree(pi, ett_hdmi); if (addr&0x01) { - SET_ADDRESS(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_RCV)+1, ADDR_RCV); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_TRX)+1, ADDR_TRX); + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_RCV)+1, ADDR_RCV); + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_TRX)+1, ADDR_TRX); pinfo->p2p_dir = P2P_DIR_RECV; } else { - SET_ADDRESS(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_TRX)+1, ADDR_TRX); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_RCV)+1, ADDR_RCV); + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_TRX)+1, ADDR_TRX); + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_RCV)+1, ADDR_RCV); pinfo->p2p_dir = P2P_DIR_SENT; } diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index da4761548d..0f362f986a 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -623,7 +623,7 @@ static gint iax_circuit_equal(gconstpointer v, gconstpointer w) const iax_circuit_key *v2 = (const iax_circuit_key *)w; gint result; - result = (ADDRESSES_EQUAL(&(v1->addr), &(v2->addr)) && + result = (addresses_equal(&(v1->addr), &(v2->addr)) && v1->ptype == v2->ptype && v1->port == v2->port && v1->callno== v2->callno); diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 65cc9b27b3..9b143ccda6 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -1948,7 +1948,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree memset(&prefix, 0, sizeof(prefix)); tvb_memcpy(tvb, (guint8 *)&prefix.bytes, opt_offset, 8); proto_tree_add_ipv6(icmp6opt_tree, hf_icmpv6_opt_prefix, tvb, opt_offset, 8, &prefix); - SET_ADDRESS(&prefix_addr, AT_IPv6, 16, prefix.bytes); + set_address(&prefix_addr, AT_IPv6, 16, prefix.bytes); proto_item_append_text(ti, " %s/%d", address_to_str(wmem_packet_scope(), &prefix_addr), prefix_len); opt_offset += 8; break; @@ -2247,7 +2247,7 @@ dissect_icmpv6_nd_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree case 16: tvb_memcpy(tvb, (guint8 *)&context_prefix.bytes, opt_offset, 8); proto_tree_add_ipv6(icmp6opt_tree, hf_icmpv6_opt_6co_context_prefix, tvb, opt_offset, 8, &context_prefix); - SET_ADDRESS(&context_prefix_addr, AT_IPv6, 16, context_prefix.bytes); + set_address(&context_prefix_addr, AT_IPv6, 16, context_prefix.bytes); proto_item_append_text(ti, " %s/%d", address_to_str(wmem_packet_scope(), &context_prefix_addr), context_len); opt_offset += 8; break; @@ -2423,7 +2423,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree memset(&prefix, 0, sizeof(prefix)); tvb_memcpy(tvb, (guint8 *)&prefix.bytes, opt_offset, 8); proto_tree_add_ipv6(icmp6opt_tree, hf_icmpv6_rpl_opt_route_prefix, tvb, opt_offset, 8, &prefix); - SET_ADDRESS(&prefix_addr, AT_IPv6, 16, prefix.bytes); + set_address(&prefix_addr, AT_IPv6, 16, prefix.bytes); proto_item_append_text(ti, " %s/%d", address_to_str(wmem_packet_scope(), &prefix_addr), prefix_len); opt_offset += 8; break; @@ -2510,7 +2510,7 @@ dissect_icmpv6_rpl_opt(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree memset(&target_prefix, 0, sizeof(target_prefix)); tvb_memcpy(tvb, (guint8 *)&target_prefix.bytes, opt_offset, 8); proto_tree_add_ipv6(icmp6opt_tree, hf_icmpv6_rpl_opt_target_prefix, tvb, opt_offset, 8, &target_prefix); - SET_ADDRESS(&target_prefix_addr, AT_IPv6, 16, target_prefix.bytes); + set_address(&target_prefix_addr, AT_IPv6, 16, target_prefix.bytes); proto_item_append_text(ti, " %s/%d", address_to_str(wmem_packet_scope(), &target_prefix_addr), prefix_len); opt_offset += 8; break; diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 2f281be87a..d077b42b73 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -16697,14 +16697,14 @@ 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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); TVB_SET_ADDRESS(&pinfo->dl_dst, wlan_address_type, tvb, 4, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); /* for tap */ TVB_SET_ADDRESS(&whdr->bssid, wlan_bssid_address_type, tvb, 16, 6); - COPY_ADDRESS_SHALLOW(&whdr->src, &pinfo->dl_src); - COPY_ADDRESS_SHALLOW(&whdr->dst, &pinfo->dl_dst); + copy_address_shallow(&whdr->src, &pinfo->dl_src); + copy_address_shallow(&whdr->dst, &pinfo->dl_dst); seq_control = tvb_get_letohs(tvb, 22); frag_number = SEQCTL_FRAGMENT_NUMBER(seq_control); @@ -17365,15 +17365,15 @@ dissect_ieee80211_common (tvbuff_t *tvb, packet_info *pinfo, TVB_SET_ADDRESS(&pinfo->dl_src, wlan_address_type, tvb, sa_offset, 6); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); TVB_SET_ADDRESS(&pinfo->dl_dst, wlan_address_type, tvb, da_offset, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); /* for tap */ TVB_SET_ADDRESS(&whdr->bssid, wlan_bssid_address_type, tvb, bssid_offset, 6); - COPY_ADDRESS_SHALLOW(&whdr->src, &pinfo->dl_src); - COPY_ADDRESS_SHALLOW(&whdr->dst, &pinfo->dl_dst); + copy_address_shallow(&whdr->src, &pinfo->dl_src); + copy_address_shallow(&whdr->dst, &pinfo->dl_dst); seq_control = tvb_get_letohs(tvb, 22); frag_number = SEQCTL_FRAGMENT_NUMBER(seq_control); diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index e47b0901e7..361948b8f0 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -710,12 +710,12 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g *===================================================== */ /* Clear out the addressing strings. */ - SET_ADDRESS(&pinfo->net_dst, AT_NONE, 0, NULL); - COPY_ADDRESS_SHALLOW(&pinfo->dl_dst, &pinfo->net_dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); - SET_ADDRESS(&pinfo->net_src, AT_NONE, 0, NULL); - COPY_ADDRESS_SHALLOW(&pinfo->dl_src, &pinfo->net_src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + set_address(&pinfo->net_dst, AT_NONE, 0, NULL); + copy_address_shallow(&pinfo->dl_dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); + set_address(&pinfo->net_src, AT_NONE, 0, NULL); + copy_address_shallow(&pinfo->dl_src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); /* Get and display the destination PAN, if present. */ if ( (packet->dst_addr_mode == IEEE802154_FCF_ADDR_SHORT) || @@ -747,7 +747,7 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g } TVB_SET_ADDRESS(&pinfo->dl_dst, ieee802_15_4_short_address_type, tvb, offset, 2); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); if (tree) { proto_tree_add_uint(ieee802154_tree, hf_ieee802154_dst16, tvb, offset, 2, packet->dst16); @@ -771,8 +771,8 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g * EUI64 addresses; that should probably be fixed in * epan/addr_resolv.c. */ - SET_ADDRESS(&pinfo->dl_dst, AT_EUI64, 8, p_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + set_address(&pinfo->dl_dst, AT_EUI64, 8, p_addr); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); if (tree) { proto_tree_add_item(ieee802154_tree, hf_ieee802154_dst64, tvb, offset, 8, ENC_LITTLE_ENDIAN); proto_item_append_text(proto_root, ", Dst: %s", eui64_to_display(wmem_packet_scope(), packet->dst64)); @@ -841,7 +841,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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); /* Add the addressing info to the tree. */ if (tree) { @@ -884,8 +884,8 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g * EUI64 addresses; that should probably be fixed in * epan/addr_resolv.c. */ - SET_ADDRESS(&pinfo->dl_src, AT_EUI64, 8, p_addr); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + set_address(&pinfo->dl_src, AT_EUI64, 8, p_addr); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); if (tree) { proto_tree_add_item(ieee802154_tree, hf_ieee802154_src64, tvb, offset, 8, ENC_LITTLE_ENDIAN); proto_item_append_text(proto_root, ", Src: %s", eui64_to_display(wmem_packet_scope(), packet->src64)); diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c index b185ddf0fb..d880aedd87 100644 --- a/epan/dissectors/packet-igrp.c +++ b/epan/dissectors/packet-igrp.c @@ -182,7 +182,7 @@ static void dissect_vektor_igrp (tvbuff_t *tvb, proto_tree *igrp_vektor_tree, gu addr.addr_bytes[3]=0; } - SET_ADDRESS(&ip_addr, AT_IPv4, 4, &addr); + set_address(&ip_addr, AT_IPv4, 4, &addr); igrp_vektor_tree = proto_tree_add_subtree_format(igrp_vektor_tree, tvb, 0 ,14, ett_igrp_net, NULL, "Entry for network %s", address_to_str(wmem_packet_scope(), &ip_addr)); proto_tree_add_ipv4(igrp_vektor_tree, hf_igrp_network, tvb, 0, 3, addr.addr_word); diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index a1bddf97a0..b7ab4f64e8 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -1626,7 +1626,7 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i /* Set destination in packet view. */ dst_addr = wmem_alloc(pinfo->pool, sizeof(guint16)); *((guint16*) dst_addr) = tvb_get_ntohs(tvb, offset); - SET_ADDRESS(&pinfo->dst, AT_IB, sizeof(guint16), dst_addr); + set_address(&pinfo->dst, AT_IB, sizeof(guint16), dst_addr); offset += 2; @@ -1643,7 +1643,7 @@ dissect_infiniband_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, i /* Set Source in packet view. */ src_addr = wmem_alloc(pinfo->pool, sizeof(guint16)); *((guint16*) src_addr) = tvb_get_ntohs(tvb, offset); - SET_ADDRESS(&pinfo->src, AT_IB, sizeof(guint16), src_addr); + set_address(&pinfo->src, AT_IB, sizeof(guint16), src_addr); offset += 2; packetLength -= 8; /* Shave 8 bytes for the LRH. */ @@ -1743,7 +1743,7 @@ skip_lrh: case IP_NON_IBA: /* Raw IPv6 Packet */ dst_addr = wmem_strdup(pinfo->pool, "IPv6 over IB Packet"); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, (int)strlen((char *)dst_addr)+1, dst_addr); + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen((char *)dst_addr)+1, dst_addr); parse_IPvSix(all_headers_tree, tvb, &offset, pinfo); break; @@ -3106,8 +3106,8 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * each side of the Reliable Connection. */ /* first register the conversation using the GIDs */ - SET_ADDRESS(&req_addr, AT_IB, GID_SIZE, connection->req_gid); - SET_ADDRESS(&resp_addr, AT_IB, GID_SIZE, connection->resp_gid); + set_address(&req_addr, AT_IB, GID_SIZE, connection->req_gid); + set_address(&resp_addr, AT_IB, GID_SIZE, connection->resp_gid); conv = conversation_new(pinfo->fd->num, &req_addr, &req_addr, PT_IBQP, connection->req_qp, connection->req_qp, NO_ADDR2|NO_PORT2); @@ -3117,8 +3117,8 @@ static void parse_COM_MGT(proto_tree *parentTree, packet_info *pinfo, tvbuff_t * conversation_add_proto_data(conv, proto_infiniband, proto_data); /* next, register the conversation using the LIDs */ - SET_ADDRESS(&req_addr, AT_IB, sizeof(guint16), &(connection->req_lid)); - SET_ADDRESS(&resp_addr, AT_IB, sizeof(guint16), &(connection->resp_lid)); + set_address(&req_addr, AT_IB, sizeof(guint16), &(connection->req_lid)); + set_address(&resp_addr, AT_IB, sizeof(guint16), &(connection->resp_lid)); conv = conversation_new(pinfo->fd->num, &req_addr, &req_addr, PT_IBQP, connection->req_qp, connection->req_qp, NO_ADDR2|NO_PORT2); @@ -4946,14 +4946,14 @@ static void dissect_general_info(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* Set destination in packet view. */ dst_addr = wmem_alloc(pinfo->pool, sizeof(guint16)); *((guint16*) dst_addr) = tvb_get_ntohs(tvb, offset); - SET_ADDRESS(&pinfo->dst, AT_IB, sizeof(guint16), dst_addr); + set_address(&pinfo->dst, AT_IB, sizeof(guint16), dst_addr); offset += 4; /* Set Source in packet view. */ src_addr = wmem_alloc(pinfo->pool, sizeof(guint16)); *((guint16*) src_addr) = tvb_get_ntohs(tvb, offset); - SET_ADDRESS(&pinfo->src, AT_IB, sizeof(guint16), src_addr); + set_address(&pinfo->src, AT_IB, sizeof(guint16), src_addr); offset += 2; @@ -4999,7 +4999,7 @@ skip_lrh: case IP_NON_IBA: /* Raw IPv6 Packet */ dst_addr = wmem_strdup(pinfo->pool, "IPv6 over IB Packet"); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, (int)strlen((char *)dst_addr)+1, dst_addr); + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen((char *)dst_addr)+1, dst_addr); break; case RAW: break; diff --git a/epan/dissectors/packet-infiniband_sdp.c b/epan/dissectors/packet-infiniband_sdp.c index bca16aefd4..0a289d45b2 100644 --- a/epan/dissectors/packet-infiniband_sdp.c +++ b/epan/dissectors/packet-infiniband_sdp.c @@ -176,12 +176,12 @@ dissect_ib_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ if (gPREF_MAN_EN) { /* If the manual settings are enabled see if this fits - in which case we can skip the following checks entirely and go straight to dissecting */ - if ( (ADDRESSES_EQUAL(&pinfo->src, &manual_addr[0]) && - ADDRESSES_EQUAL(&pinfo->dst, &manual_addr[1]) && + if ( (addresses_equal(&pinfo->src, &manual_addr[0]) && + addresses_equal(&pinfo->dst, &manual_addr[1]) && (pinfo->srcport == 0xffffffff /* is unknown */ || pinfo->srcport == gPREF_QP[0]) && (pinfo->destport == 0xffffffff /* is unknown */ || pinfo->destport == gPREF_QP[1])) || - (ADDRESSES_EQUAL(&pinfo->src, &manual_addr[1]) && - ADDRESSES_EQUAL(&pinfo->dst, &manual_addr[0]) && + (addresses_equal(&pinfo->src, &manual_addr[1]) && + addresses_equal(&pinfo->dst, &manual_addr[0]) && (pinfo->srcport == 0xffffffff /* is unknown */ || pinfo->srcport == gPREF_QP[1]) && (pinfo->destport == 0xffffffff /* is unknown */ || pinfo->destport == gPREF_QP[0])) ) goto manual_override; @@ -538,13 +538,13 @@ proto_reg_handoff_ib_sdp(void) if (errno || *not_parsed != '\0') { error_occured = TRUE; } else { - SET_ADDRESS(&manual_addr[i], AT_IB, sizeof(guint16), manual_addr_data[i]); + set_address(&manual_addr[i], AT_IB, sizeof(guint16), manual_addr_data[i]); } } else { /* GID */ if (!str_to_ip6(gPREF_ID[i], manual_addr_data[i])) { error_occured = TRUE; } else { - SET_ADDRESS(&manual_addr[i], AT_IB, GID_SIZE, manual_addr_data[i]); + set_address(&manual_addr[i], AT_IB, GID_SIZE, manual_addr_data[i]); } } diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index f1f0428ea8..48764e4592 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -2283,8 +2283,8 @@ 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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); - COPY_ADDRESS_SHALLOW(&iph->ip_src, &pinfo->src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); + copy_address_shallow(&iph->ip_src, &pinfo->src); if (tree) { const char *src_host; @@ -2325,8 +2325,8 @@ dissect_ip_v4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) 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); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); - COPY_ADDRESS_SHALLOW(&iph->ip_dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); + copy_address_shallow(&iph->ip_dst, &pinfo->net_dst); /* If an IP is destined for an IP address in the Local Network Control Block * (e.g. 224.0.0.0/24), the packet should never be routed and the TTL would diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index bd5fe6b7cd..b2e0a5a2b3 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -424,8 +424,8 @@ ipv6_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, con address dst; /* Addresses aren't implemented as 'address' type in struct ip6_hdr */ - SET_ADDRESS(&src, AT_IPv6, sizeof(struct e_in6_addr), &ip6h->ip6_src); - SET_ADDRESS(&dst, AT_IPv6, sizeof(struct e_in6_addr), &ip6h->ip6_dst); + set_address(&src, AT_IPv6, sizeof(struct e_in6_addr), &ip6h->ip6_src); + set_address(&dst, AT_IPv6, sizeof(struct e_in6_addr), &ip6h->ip6_dst); add_hostlist_table_data(hash, &src, 0, TRUE, 1, pinfo->fd->pkt_len, &ipv6_host_dissector_info, PT_NONE); add_hostlist_table_data(hash, &dst, 0, FALSE, 1, pinfo->fd->pkt_len, &ipv6_host_dissector_info, PT_NONE); @@ -1050,7 +1050,7 @@ dissect_routing6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data } if (dst_addr != NULL && rt.ip6r_segleft > 0) { - SET_ADDRESS(&pinfo->dst, AT_IPv6, IPv6_ADDR_SIZE, dst_addr); + set_address(&pinfo->dst, AT_IPv6, IPv6_ADDR_SIZE, dst_addr); } ipv6_info->exthdr_count++; @@ -2052,9 +2052,9 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) plen = g_ntohs(ipv6->ip6_plen); TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv6, tvb, offset + IP6H_SRC, 16); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv6, tvb, offset + IP6H_DST, 16); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); ipv6_info = wmem_new0(wmem_packet_scope(), ipv6_meta_t); p_add_proto_data(pinfo->pool, pinfo, proto_ipv6, IPV6_PROTO_META, ipv6_info); @@ -2094,7 +2094,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_HIDDEN(ti); name = address_to_display(wmem_packet_scope(), &pinfo->src); if (ipv6_summary_in_tree) { - SET_ADDRESS(&addr, AT_IPv6, 16, ipv6->ip6_src.bytes); + set_address(&addr, AT_IPv6, 16, ipv6->ip6_src.bytes); proto_item_append_text(ipv6_item, ", Src: %s", address_with_resolution_to_str(wmem_packet_scope(), &addr)); } ti = proto_tree_add_string(ipv6_tree, hf_ipv6_src_host, tvb, @@ -2182,7 +2182,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) PROTO_ITEM_SET_HIDDEN(ti); name = address_to_display(wmem_packet_scope(), &pinfo->dst); if (ipv6_summary_in_tree) { - SET_ADDRESS(&addr, AT_IPv6, 16, ipv6->ip6_dst.bytes); + set_address(&addr, AT_IPv6, 16, ipv6->ip6_dst.bytes); proto_item_append_text(ipv6_item, ", Dst: %s", address_with_resolution_to_str(wmem_packet_scope(), &addr)); } ti = proto_tree_add_string(ipv6_tree, hf_ipv6_dst_host, tvb, diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index 83f616010d..38e76c8a35 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -333,11 +333,11 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) set_actual_length(tvb, ipxh->ipx_length); TVB_SET_ADDRESS(&pinfo->net_src, AT_IPX, tvb, 18, 10); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); - COPY_ADDRESS_SHALLOW(&ipxh->ipx_src, &pinfo->net_src); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); - COPY_ADDRESS_SHALLOW(&ipxh->ipx_dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); + copy_address_shallow(&ipxh->ipx_dst, &pinfo->net_dst); col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext(ipxh->ipx_dsocket, &ipx_socket_vals_ext, "Unknown (0x%04x)")); diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 1b8f1f3adf..540f61f51c 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -2845,7 +2845,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ #ifdef HAVE_LIBGCRYPT if (isakmp_version == 1) { - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); tvb_memcpy(tvb, i_cookie, offset, COOKIE_SIZE); decr = (decrypt_data_t*) g_hash_table_lookup(isakmp_hash, i_cookie); @@ -2855,12 +2855,12 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ decr = (decrypt_data_t *)g_slice_alloc(sizeof(decrypt_data_t)); memcpy(ic_key, i_cookie, COOKIE_SIZE); memset(decr, 0, sizeof(decrypt_data_t)); - SET_ADDRESS(&decr->initiator, AT_NONE, 0, NULL); + set_address(&decr->initiator, AT_NONE, 0, NULL); g_hash_table_insert(isakmp_hash, ic_key, decr); } - if (ADDRESSES_EQUAL(&decr->initiator, &null_addr)) { + 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); @@ -3165,25 +3165,25 @@ dissect_rohc_supported(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rohc_tree, guint optlen, rohc, len = 0; proto_item *rohc_item; proto_tree *sub_rohc_tree; - + rohc = tvb_get_ntohs(tvb, offset); optlen = tvb_get_ntohs(tvb, offset+2); len = 2; - + /* is TV ? (Type/Value) ? */ if (rohc & 0x8000) { rohc = rohc & 0x7fff; len = 0; optlen = 2; } - - + + rohc_item = proto_tree_add_item(rohc_tree, hf_isakmp_notify_data_rohc_attr, tvb, offset, 2+len+optlen, ENC_NA); proto_item_append_text(rohc_item," (t=%d,l=%d) %s",rohc, optlen, val_to_str(rohc, rohc_attr_type, "Unknown Attribute Type (%02d)") ); sub_rohc_tree = proto_item_add_subtree(rohc_item, ett_isakmp_rohc_attr); proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_format, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_uint(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_type, tvb, offset, 2, rohc); - + offset += 2; if (len) { @@ -3212,7 +3212,7 @@ dissect_rohc_supported(tvbuff_t *tvb, packet_info *pinfo, proto_tree *rohc_tree, case ROHC_MRRU: proto_tree_add_item(sub_rohc_tree, hf_isakmp_notify_data_rohc_attr_mrru, tvb, offset, optlen, ENC_BIG_ENDIAN); break; - + default: /* No Default Action */ break; @@ -3243,7 +3243,7 @@ dissect_life_duration(tvbuff_t *tvb, proto_tree *tree, proto_item *ti, int hf_ui case 2: { guint16 val; val = tvb_get_ntohs(tvb, offset); - + proto_tree_add_uint_format_value(tree, hf_uint32, tvb, offset, len, val, "%u", val); proto_item_append_text(ti, " : %u", val); break; @@ -3251,7 +3251,7 @@ dissect_life_duration(tvbuff_t *tvb, proto_tree *tree, proto_item *ti, int hf_ui case 3: { guint32 val; val = tvb_get_ntoh24(tvb, offset); - + proto_tree_add_uint_format_value(tree, hf_uint32, tvb, offset, len, val, "%u", val); proto_item_append_text(ti, " : %u", val); break; @@ -3259,7 +3259,7 @@ dissect_life_duration(tvbuff_t *tvb, proto_tree *tree, proto_item *ti, int hf_ui case 4: { guint32 val; val = tvb_get_ntohl(tvb, offset); - + proto_tree_add_uint_format_value(tree, hf_uint32, tvb, offset, len, val, "%u", val); proto_item_append_text(ti, " : %u", val); break; @@ -3267,7 +3267,7 @@ dissect_life_duration(tvbuff_t *tvb, proto_tree *tree, proto_item *ti, int hf_ui case 5: { guint64 val; val = tvb_get_ntoh40(tvb, offset); - + proto_tree_add_uint64_format_value(tree, hf_uint64, tvb, offset, len, val, "%" G_GINT64_MODIFIER "u", val); proto_item_append_text(ti, " : %" G_GINT64_MODIFIER "u", val); break; @@ -3275,7 +3275,7 @@ dissect_life_duration(tvbuff_t *tvb, proto_tree *tree, proto_item *ti, int hf_ui case 6: { guint64 val; val = tvb_get_ntoh48(tvb, offset); - + proto_tree_add_uint64_format_value(tree, hf_uint64, tvb, offset, len, val, "%" G_GINT64_MODIFIER "u", val); proto_item_append_text(ti, " : %" G_GINT64_MODIFIER "u", val); break; @@ -3283,7 +3283,7 @@ dissect_life_duration(tvbuff_t *tvb, proto_tree *tree, proto_item *ti, int hf_ui case 7: { guint64 val; val = tvb_get_ntoh56(tvb, offset); - + proto_tree_add_uint64_format_value(tree, hf_uint64, tvb, offset, len, val, "%" G_GINT64_MODIFIER "u", val); proto_item_append_text(ti, " : %" G_GINT64_MODIFIER "u", val); break; @@ -3291,7 +3291,7 @@ dissect_life_duration(tvbuff_t *tvb, proto_tree *tree, proto_item *ti, int hf_ui case 8: { guint64 val; val = tvb_get_ntoh64(tvb, offset); - + proto_tree_add_uint64_format_value(tree, hf_uint64, tvb, offset, len, val, "%" G_GINT64_MODIFIER "u", val); proto_item_append_text(ti, " : %" G_GINT64_MODIFIER "u", val); break; @@ -3310,11 +3310,11 @@ dissect_transform_attribute(tvbuff_t *tvb, packet_info *pinfo, proto_tree *trans guint optlen, transform_attr_type, len = 0; proto_item *transform_attr_type_item; proto_tree *sub_transform_attr_type_tree; - + transform_attr_type = tvb_get_ntohs(tvb, offset); optlen = tvb_get_ntohs(tvb, offset+2); len = 2; - + /* is TV ? (Type/Value) ? */ if (transform_attr_type & 0x8000) { transform_attr_type = transform_attr_type & 0x7fff; @@ -3328,7 +3328,7 @@ dissect_transform_attribute(tvbuff_t *tvb, packet_info *pinfo, proto_tree *trans sub_transform_attr_type_tree = proto_item_add_subtree(transform_attr_type_item, ett_isakmp_tf_attr); proto_tree_add_item(sub_transform_attr_type_tree, hf_isakmp_tf_attr_format, tvb, offset, 2, ENC_BIG_ENDIAN); proto_tree_add_uint(sub_transform_attr_type_tree, hf_isakmp_tf_attr_type_v1, tvb, offset, 2, transform_attr_type); - + offset += 2; if (len) { @@ -3706,11 +3706,11 @@ dissect_key_exch(tvbuff_t *tvb, int offset, int length, proto_tree *tree, int is proto_tree_add_item(tree, hf_isakmp_key_exch_data, tvb, offset, length, ENC_NA); #ifdef HAVE_LIBGCRYPT - if (decr && decr->gi_len == 0 && ADDRESSES_EQUAL(&decr->initiator, &pinfo->src)) { + if (decr && decr->gi_len == 0 && addresses_equal(&decr->initiator, &pinfo->src)) { decr->gi = (gchar *)g_malloc(length); tvb_memcpy(tvb, decr->gi, offset, length); decr->gi_len = length; - } else if (decr && decr->gr_len == 0 && !ADDRESSES_EQUAL(&decr->initiator, &pinfo->src)) { + } else if (decr && decr->gr_len == 0 && !addresses_equal(&decr->initiator, &pinfo->src)) { decr->gr = (gchar *)g_malloc(length); tvb_memcpy(tvb, decr->gr, offset, length); decr->gr_len = length; @@ -4420,18 +4420,18 @@ dissect_config_attribute(tvbuff_t *tvb, packet_info *pinfo, proto_tree *cfg_attr int offset_end = 0; proto_item *cfg_attr_type_item = NULL; proto_tree *sub_cfg_attr_type_tree = NULL; - + cfg_attr_type = tvb_get_ntohs(tvb, offset); optlen = tvb_get_ntohs(tvb, offset+2); len = 2; - + /* No Length ? */ if (cfg_attr_type & 0x8000) { cfg_attr_type = cfg_attr_type & 0x7fff; len = 0; optlen = 2; } - + if (isakmp_version == 1) { cfg_attr_type_item = proto_tree_add_none_format(cfg_attr_type_tree, hf_isakmp_cfg_attr, tvb, offset, 2+len+optlen, "Attribute Type: (t=%d,l=%d) %s", cfg_attr_type, optlen, rval_to_str(cfg_attr_type,vs_v1_cfgattr,"Unknown Attribute Type (%02d)") ); sub_cfg_attr_type_tree = proto_item_add_subtree(cfg_attr_type_item, ett_isakmp_cfg_attr); @@ -4460,7 +4460,7 @@ dissect_config_attribute(tvbuff_t *tvb, packet_info *pinfo, proto_tree *cfg_attr switch (cfg_attr_type) { case INTERNAL_IP4_ADDRESS: /* 1 */ offset_end = offset + optlen; - + if (optlen%4 == 0) { while (offset_end-offset > 0) @@ -4475,7 +4475,7 @@ dissect_config_attribute(tvbuff_t *tvb, packet_info *pinfo, proto_tree *cfg_attr break; case INTERNAL_IP4_DNS: /* 3 */ offset_end = offset + optlen; - + if (optlen%4 == 0) { while (offset_end-offset > 0) diff --git a/epan/dissectors/packet-iser.c b/epan/dissectors/packet-iser.c index cb37af4d7d..3fc5b9646c 100644 --- a/epan/dissectors/packet-iser.c +++ b/epan/dissectors/packet-iser.c @@ -244,12 +244,12 @@ dissect_iser(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (gPREF_MAN_EN) { /* If the manual settings are enabled see if this fits - in which case we can skip the following checks entirely and go straight to dissecting */ - if ( (ADDRESSES_EQUAL(&pinfo->src, &manual_addr[0]) && - ADDRESSES_EQUAL(&pinfo->dst, &manual_addr[1]) && + if ( (addresses_equal(&pinfo->src, &manual_addr[0]) && + addresses_equal(&pinfo->dst, &manual_addr[1]) && (pinfo->srcport == 0xffffffff /* is unknown */ || pinfo->srcport == gPREF_QP[0]) && (pinfo->destport == 0xffffffff /* is unknown */ || pinfo->destport == gPREF_QP[1])) || - (ADDRESSES_EQUAL(&pinfo->src, &manual_addr[1]) && - ADDRESSES_EQUAL(&pinfo->dst, &manual_addr[0]) && + (addresses_equal(&pinfo->src, &manual_addr[1]) && + addresses_equal(&pinfo->dst, &manual_addr[0]) && (pinfo->srcport == 0xffffffff /* is unknown */ || pinfo->srcport == gPREF_QP[1]) && (pinfo->destport == 0xffffffff /* is unknown */ || pinfo->destport == gPREF_QP[0])) ) return dissect_packet(tvb, pinfo, tree); @@ -424,13 +424,13 @@ proto_reg_handoff_iser(void) if (errno || *not_parsed != '\0') { error_occured = TRUE; } else { - SET_ADDRESS(&manual_addr[i], AT_IB, sizeof(guint16), manual_addr_data[i]); + set_address(&manual_addr[i], AT_IB, sizeof(guint16), manual_addr_data[i]); } } else { /* GID */ if (!str_to_ip6(gPREF_ID[i], manual_addr_data[i]) ) { error_occured = TRUE; } else { - SET_ADDRESS(&manual_addr[i], AT_IB, GID_SIZE, manual_addr_data[i]); + set_address(&manual_addr[i], AT_IB, GID_SIZE, manual_addr_data[i]); } } diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index b3ab3e47e4..e960f3c6a2 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -827,7 +827,7 @@ dissect_lsp_ext_ip_reachability_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tre subtree = proto_tree_add_subtree(tree, tvb, offset, 5+byte_length+subclvs_len, ett_isis_lsp_part_of_clv_ext_ip_reachability, NULL, "Ext. IP Reachability"); - SET_ADDRESS(&prefix_addr, AT_IPv4, 4, prefix); + set_address(&prefix_addr, AT_IPv4, 4, prefix); proto_tree_add_ipv4_format_value(subtree, hf_isis_lsp_ext_ip_reachability_ipv4_prefix, tvb, offset+5, byte_length, tvb_get_ntohl(tvb, offset+5), "%s/%u", address_to_str(wmem_packet_scope(), &prefix_addr), bit_length); proto_tree_add_item(subtree, hf_isis_lsp_ext_ip_reachability_metric, tvb, offset, 4, ENC_BIG_ENDIAN); @@ -1456,7 +1456,7 @@ dissect_lsp_ipv6_reachability_clv(tvbuff_t *tvb, packet_info* pinfo, proto_tree subtree = proto_tree_add_subtree(tree, tvb, offset, 6+byte_length+subclvs_len, ett_isis_lsp_part_of_clv_ipv6_reachability, NULL, "IPv6 Reachability"); - SET_ADDRESS(&prefix_addr, AT_IPv6, 16, prefix.bytes); + set_address(&prefix_addr, AT_IPv6, 16, prefix.bytes); proto_tree_add_ipv6_format_value(subtree, hf_isis_lsp_ipv6_reachability_ipv6_prefix, tvb, offset+6, byte_length, &prefix, "IPv6 prefix: %s/%u", address_to_str(wmem_packet_scope(), &prefix_addr), bit_length); diff --git a/epan/dissectors/packet-iso7816.c b/epan/dissectors/packet-iso7816.c index b101b22e23..2b35a425fe 100644 --- a/epan/dissectors/packet-iso7816.c +++ b/epan/dissectors/packet-iso7816.c @@ -719,17 +719,17 @@ dissect_iso7816(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data /* per our definition, sent/received is from the perspective of the interface i.e sent is from interface to card, received is from card to interface */ if (pinfo->p2p_dir==P2P_DIR_SENT) { - SET_ADDRESS(&pinfo->src, AT_STRINGZ, + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_INTF)+1, ADDR_INTF); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_CARD)+1, ADDR_CARD); proto_item_append_text(tree_ti, " Command APDU"); offset = dissect_iso7816_cmd_apdu(tvb, pinfo, iso7816_tree); } else if (pinfo->p2p_dir==P2P_DIR_RECV) { - SET_ADDRESS(&pinfo->src, AT_STRINGZ, + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_CARD)+1, ADDR_CARD); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_INTF)+1, ADDR_INTF); if (iso7816_atr_handle) { diff --git a/epan/dissectors/packet-j1939.c b/epan/dissectors/packet-j1939.c index 70b144a970..4e47ee03b2 100644 --- a/epan/dissectors/packet-j1939.c +++ b/epan/dissectors/packet-j1939.c @@ -219,7 +219,7 @@ static int dissect_j1939(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo /* Set source address */ src_addr = (guint8*)wmem_alloc(pinfo->pool, 1); *src_addr = (guint8)(can_id.id & 0xFF); - SET_ADDRESS(&pinfo->src, j1939_address_type, 1, (const void*)src_addr); + set_address(&pinfo->src, j1939_address_type, 1, (const void*)src_addr); pgn = (can_id.id & 0x3FFFF00) >> 8; @@ -240,7 +240,7 @@ static int dissect_j1939(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, vo /* Fill in "destination" address even if its "broadcast" */ dest_addr = (guint8*)wmem_alloc(pinfo->pool, 1); *dest_addr = (guint8)((can_id.id & 0xFF00) >> 8); - SET_ADDRESS(&pinfo->dst, j1939_address_type, 1, (const void*)dest_addr); + set_address(&pinfo->dst, j1939_address_type, 1, (const void*)dest_addr); col_add_fstr(pinfo->cinfo, COL_INFO, "PGN: %d", pgn); diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index c5f0e794e5..3a69017bb7 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -687,7 +687,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * address_to_str(wmem_packet_scope(), &tpt_conv_data->initiator_tpt_address), tpt_conv_data->initiator_tpt_port, address_to_str(wmem_packet_scope(), &tpt_conv_data->receiver_tpt_address), tpt_conv_data->receiver_tpt_port); */ - if (ADDRESSES_EQUAL(&pinfo->src, &tpt_conv_data->initiator_tpt_address) + if (addresses_equal(&pinfo->src, &tpt_conv_data->initiator_tpt_address) && tpt_conv_data->initiator_tpt_port == pinfo->srcport) { /* g_message("%d From initiator : %s -> %s ", pinfo->fd->num, address_to_str(wmem_packet_scope(), &tpt_conv_data->initiator_address), @@ -697,7 +697,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * pinfo->dst = tpt_conv_data->receiver_address; pinfo->destport = 0; pinfo->ptype = PT_NONE; - } else if (ADDRESSES_EQUAL(&pinfo->src, &tpt_conv_data->receiver_tpt_address) && + } else if (addresses_equal(&pinfo->src, &tpt_conv_data->receiver_tpt_address) && tpt_conv_data->receiver_tpt_port == pinfo->srcport) { /* g_message("%d From receiver : %s -> %s ", pinfo->fd->num, address_to_str(wmem_packet_scope(), &tpt_conv_data->receiver_address), diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index b6b0833ced..2e742dee17 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -840,7 +840,7 @@ static void md5_hmac_digest(l2tpv3_tunnel_t *tunnel, if (msg_type != MESSAGE_TYPE_SCCRQ) { if (tunnel->lcce1_nonce != NULL && tunnel->lcce2_nonce != NULL) { - if (ADDRESSES_EQUAL(&tunnel->lcce1, &pinfo->src)) { + if (addresses_equal(&tunnel->lcce1, &pinfo->src)) { md5_hmac_append(&ms, tunnel->lcce1_nonce, tunnel->lcce1_nonce_len); md5_hmac_append(&ms, tunnel->lcce2_nonce, tunnel->lcce2_nonce_len); } else { @@ -880,7 +880,7 @@ static void sha1_hmac_digest(l2tpv3_tunnel_t *tunnel, if (msg_type != MESSAGE_TYPE_SCCRQ) { if (tunnel->lcce1_nonce != NULL && tunnel->lcce2_nonce != NULL) { - if (ADDRESSES_EQUAL(&tunnel->lcce1, &pinfo->src)) { + if (addresses_equal(&tunnel->lcce1, &pinfo->src)) { sha1_hmac_update(&ms, tunnel->lcce1_nonce, tunnel->lcce1_nonce_len); sha1_hmac_update(&ms, tunnel->lcce2_nonce, tunnel->lcce2_nonce_len); } else { @@ -2021,7 +2021,7 @@ process_l2tpv3_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, idx += 4; if (tunnel) { - if (ADDRESSES_EQUAL(&tunnel->lcce1, &pinfo->dst)) { + if (addresses_equal(&tunnel->lcce1, &pinfo->dst)) { session = find_session(tunnel, sid, 0); if (session) lcce = &session->lcce1; diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index 2a5efc5c6d..23ec1f7e70 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -254,15 +254,15 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else if (conversation) { convo_data = (lapd_convo_data_t*)conversation_get_proto_data(conversation, proto_lapd); if (NULL != convo_data) { - if (ADDRESSES_EQUAL(&convo_data->addr_a, &pinfo->src) - && ADDRESSES_EQUAL(&convo_data->addr_b, &pinfo->dst) + if (addresses_equal(&convo_data->addr_a, &pinfo->src) + && addresses_equal(&convo_data->addr_b, &pinfo->dst) && convo_data-> port_a == pinfo->srcport && convo_data-> port_b == pinfo->destport) { /* "forward" direction */ forward_stream = TRUE; prev_byte_state = convo_data->byte_state_a; - } else if (ADDRESSES_EQUAL(&convo_data-> addr_b, &pinfo->src) - && ADDRESSES_EQUAL(&convo_data->addr_a, &pinfo->dst) + } else if (addresses_equal(&convo_data-> addr_b, &pinfo->src) + && addresses_equal(&convo_data->addr_a, &pinfo->dst) && convo_data-> port_b == pinfo->srcport && convo_data-> port_a == pinfo->destport) { /* "backward" direction */ @@ -391,8 +391,8 @@ dissect_lapd_bitstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) lapd_byte_state = wmem_new(wmem_file_scope(), lapd_byte_state_t); fill_lapd_byte_state(lapd_byte_state, state, full_byte, bit_offset, ones, data, data_len); convo_data = wmem_new(wmem_file_scope(), lapd_convo_data_t); - COPY_ADDRESS(&convo_data->addr_a, &pinfo->src); - COPY_ADDRESS(&convo_data->addr_b, &pinfo->dst); + copy_address(&convo_data->addr_a, &pinfo->src); + copy_address(&convo_data->addr_b, &pinfo->dst); convo_data->port_a = pinfo->srcport; convo_data->port_b = pinfo->destport; convo_data->byte_state_a = lapd_byte_state; diff --git a/epan/dissectors/packet-lbmc.c b/epan/dissectors/packet-lbmc.c index bdcc004e28..8f7126eb13 100644 --- a/epan/dissectors/packet-lbmc.c +++ b/epan/dissectors/packet-lbmc.c @@ -257,9 +257,9 @@ static lbm_istream_substream_entry_t * lbm_stream_istream_substream_find(lbm_ist wmem_tree_key_t tkey[2]; memset((void *)&key, 0, sizeof(lbm_istream_substream_entry_t)); - COPY_ADDRESS_SHALLOW(&(key.src_addr), src_addr); + copy_address_shallow(&(key.src_addr), src_addr); key.src_port = src_port; - COPY_ADDRESS_SHALLOW(&(key.dst_addr), dst_addr); + copy_address_shallow(&(key.dst_addr), dst_addr); key.dst_port = dst_port; key.lbm_stream_id = stream_id; lbm_istream_substream_build_key(keyval, tkey, &key); @@ -357,7 +357,7 @@ static void lbm_stream_order_dstream_key(lbm_dstream_entry_t * stream) { int compare; - compare = CMP_ADDRESS(&(stream->addr_1), &(stream->addr_2)); + compare = cmp_address(&(stream->addr_1), &(stream->addr_2)); if (compare > 0) { swap_items = TRUE; @@ -373,15 +373,15 @@ static void lbm_stream_order_dstream_key(lbm_dstream_entry_t * stream) if (swap_items) { domain = stream->domain_1; - COPY_ADDRESS_SHALLOW(&addr, &(stream->addr_1)); + copy_address_shallow(&addr, &(stream->addr_1)); port = stream->port_1; stream->domain_1 = stream->domain_2; - COPY_ADDRESS_SHALLOW(&(stream->addr_1), &(stream->addr_2)); + copy_address_shallow(&(stream->addr_1), &(stream->addr_2)); stream->port_1 = stream->port_2; stream->domain_2 = domain; - COPY_ADDRESS_SHALLOW(&(stream->addr_2), &addr); + copy_address_shallow(&(stream->addr_2), &addr); stream->port_2 = port; } } @@ -394,10 +394,10 @@ static lbm_dstream_entry_t * lbm_stream_dstream_find(const lbm_uim_stream_destin wmem_tree_key_t tkey[2]; key.domain_1 = endpoint_a->domain; - COPY_ADDRESS_SHALLOW(&(key.addr_1), &(endpoint_a->addr)); + copy_address_shallow(&(key.addr_1), &(endpoint_a->addr)); key.port_1 = endpoint_a->port; key.domain_2 = endpoint_b->domain; - COPY_ADDRESS_SHALLOW(&(key.addr_2), &(endpoint_b->addr)); + copy_address_shallow(&(key.addr_2), &(endpoint_b->addr)); key.port_2 = endpoint_b->port; lbm_stream_order_dstream_key(&key); lbm_dstream_stream_build_key(keyval, tkey, &key); @@ -466,9 +466,9 @@ static lbm_dstream_substream_entry_t * lbm_stream_dstream_substream_find(lbm_dst wmem_tree_key_t tkey[2]; memset((void *)&key, 0, sizeof(lbm_dstream_substream_entry_t)); - COPY_ADDRESS_SHALLOW(&(key.src_addr), src_addr); + copy_address_shallow(&(key.src_addr), src_addr); key.src_port = src_port; - COPY_ADDRESS_SHALLOW(&(key.dst_addr), dst_addr); + copy_address_shallow(&(key.dst_addr), dst_addr); key.dst_port = dst_port; key.lbm_stream_id = stream_id; lbm_dstream_substream_build_key(keyval, tkey, &key); @@ -6135,7 +6135,7 @@ static lbmc_message_entry_t * lbmc_message_find(guint64 channel, const address * memset((void *)&key, 0, sizeof(lbmc_message_entry_t)); key.channel = channel; - COPY_ADDRESS_SHALLOW(&(key.addr), dest_address); + copy_address_shallow(&(key.addr), dest_address); key.port = port; key.first_sqn = info->first_sqn; lbmc_message_build_key(keyval, tkey, &key); @@ -11052,12 +11052,12 @@ int lbmc_dissect_lbmc_packet(tvbuff_t * tvb, int offset, packet_info * pinfo, pr tcp_address_valid = TRUE; if (lbm_channel_is_unknown_transport_source_lbttcp(channel)) { - COPY_ADDRESS_SHALLOW(&tcp_addr, &(pinfo->src)); + copy_address_shallow(&tcp_addr, &(pinfo->src)); tcp_port = (guint16)pinfo->srcport; } else if (lbm_channel_is_unknown_transport_client_lbttcp(channel)) { - COPY_ADDRESS_SHALLOW(&tcp_addr, &(pinfo->dst)); + copy_address_shallow(&tcp_addr, &(pinfo->dst)); tcp_port = (guint16)pinfo->destport; } else diff --git a/epan/dissectors/packet-lbmpdmtcp.c b/epan/dissectors/packet-lbmpdmtcp.c index 33cb2b3dd6..3f09b0ef13 100644 --- a/epan/dissectors/packet-lbmpdmtcp.c +++ b/epan/dissectors/packet-lbmpdmtcp.c @@ -58,7 +58,7 @@ static void lbmtcp_order_key(lbmtcp_transport_t * transport) int compare; /* Order the key so that addr1:port1 <= addr2:port2 */ - compare = CMP_ADDRESS(&(transport->addr1), &(transport->addr2)); + compare = cmp_address(&(transport->addr1), &(transport->addr2)); if (compare > 0) { swap = TRUE; @@ -75,9 +75,9 @@ static void lbmtcp_order_key(lbmtcp_transport_t * transport) address addr; guint16 port; - COPY_ADDRESS_SHALLOW(&addr, &(transport->addr1)); - COPY_ADDRESS_SHALLOW(&(transport->addr2), &(transport->addr1)); - COPY_ADDRESS_SHALLOW(&(transport->addr1), &addr); + copy_address_shallow(&addr, &(transport->addr1)); + copy_address_shallow(&(transport->addr2), &(transport->addr1)); + copy_address_shallow(&(transport->addr1), &addr); port = transport->port2; transport->port2 = transport->port1; transport->port1 = port; diff --git a/epan/dissectors/packet-lbmr.c b/epan/dissectors/packet-lbmr.c index 2b99ec64d2..956721ac0a 100644 --- a/epan/dissectors/packet-lbmr.c +++ b/epan/dissectors/packet-lbmr.c @@ -244,7 +244,7 @@ static lbtrdma_transport_t * lbtrdma_transport_find(const address * source_addre wmem_tree_key_t tkey[2]; memset((void *)&key, 0, sizeof(lbtrdma_transport_t)); - COPY_ADDRESS_SHALLOW(&(key.source_address), source_address); + copy_address_shallow(&(key.source_address), source_address); key.session_id = session_id; key.port = port; lbtrdma_transport_build_key(keyval, tkey, &key); diff --git a/epan/dissectors/packet-lbtru.c b/epan/dissectors/packet-lbtru.c index b5b40ce75b..86107c7709 100644 --- a/epan/dissectors/packet-lbtru.c +++ b/epan/dissectors/packet-lbtru.c @@ -1406,16 +1406,16 @@ static int dissect_lbtru(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, /* Find (or create) the transport and client entries */ if (from_source) { - COPY_ADDRESS_SHALLOW(&source_address, &(pinfo->src)); + copy_address_shallow(&source_address, &(pinfo->src)); source_port = pinfo->srcport; - COPY_ADDRESS_SHALLOW(&receiver_address, &(pinfo->dst)); + copy_address_shallow(&receiver_address, &(pinfo->dst)); receiver_port = pinfo->destport; } else { - COPY_ADDRESS_SHALLOW(&source_address, &(pinfo->dst)); + copy_address_shallow(&source_address, &(pinfo->dst)); source_port = pinfo->destport; - COPY_ADDRESS_SHALLOW(&receiver_address, &(pinfo->src)); + copy_address_shallow(&receiver_address, &(pinfo->src)); receiver_port = pinfo->srcport; } if (pinfo->fd->flags.visited == 0) diff --git a/epan/dissectors/packet-lbttcp.c b/epan/dissectors/packet-lbttcp.c index 537978d3a9..60c9b3aff3 100644 --- a/epan/dissectors/packet-lbttcp.c +++ b/epan/dissectors/packet-lbttcp.c @@ -533,16 +533,16 @@ static int dissect_lbttcp_pdu(tvbuff_t * tvb, packet_info * pinfo, proto_tree * if (from_source) { - COPY_ADDRESS_SHALLOW(&source_address, &(pinfo->src)); + copy_address_shallow(&source_address, &(pinfo->src)); srcport = pinfo->srcport; - COPY_ADDRESS_SHALLOW(&client_address, &(pinfo->dst)); + copy_address_shallow(&client_address, &(pinfo->dst)); clntport = pinfo->destport; } else { - COPY_ADDRESS_SHALLOW(&source_address, &(pinfo->dst)); + copy_address_shallow(&source_address, &(pinfo->dst)); srcport = pinfo->destport; - COPY_ADDRESS_SHALLOW(&client_address, &(pinfo->src)); + copy_address_shallow(&client_address, &(pinfo->src)); clntport = pinfo->srcport; } /* See if we have a matching transport with no session ID. */ diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index 46ac08a862..036ac57d05 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -1042,7 +1042,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre if ( prefix_len % 8 ) addr[ax-1] = addr[ax-1]&(0xFF<<(8-prefix_len%8)); - SET_ADDRESS(&addr_str, addr_type, addr_size, addr); + set_address(&addr_str, addr_type, addr_size, addr); str = address_to_str(wmem_packet_scope(), &addr_str); proto_tree_add_string_format(fec_tree, hf_ldp_tlv_fec_pfval, tvb, offset, prefix_len_octets, str, "Prefix: %s", str); @@ -1115,7 +1115,7 @@ dissect_tlv_fec(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_tree *tre for(ax=0; ax+1 <= host_len; ax++) addr[ax]=tvb_get_guint8(tvb, offset+ax); - SET_ADDRESS(&addr_str, addr_type, addr_size, addr); + set_address(&addr_str, addr_type, addr_size, addr); str = address_to_str(wmem_packet_scope(), &addr_str); proto_tree_add_string_format(fec_tree, hf_ldp_tlv_fec_hoval, tvb, offset, host_len, str, "Address: %s", str); @@ -1403,7 +1403,7 @@ dissect_tlv_address_list(tvbuff_t *tvb, packet_info *pinfo, guint offset, proto_ == NULL) break; - SET_ADDRESS(&addr_str, addr_type, addr_size, addr); + set_address(&addr_str, addr_type, addr_size, addr); str = address_to_str(wmem_packet_scope(), &addr_str); proto_tree_add_string_format(val_tree, hf_ldp_tlv_addrl_addr, tvb, offset, addr_size, str, diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index 1d04153ddc..55e61595c6 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -422,7 +422,7 @@ dissect_ldss_broadcast(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) data->file->digest_type = digest_type; data->broadcaster = wmem_new0(wmem_file_scope(), ldss_broadcaster_t); - COPY_ADDRESS(&data->broadcaster->addr, &pinfo->src); + copy_address(&data->broadcaster->addr, &pinfo->src); data->broadcaster->port = port; /* Dissect any future pushes/pulls */ @@ -786,8 +786,8 @@ is_broadcast(address* addr) 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; - SET_ADDRESS(&broadcast_addr, AT_ETHER, 6, broadcast_addr_bytes); - return ADDRESSES_EQUAL(addr, &broadcast_addr); + set_address(&broadcast_addr, AT_ETHER, 6, broadcast_addr_bytes); + return addresses_equal(addr, &broadcast_addr); } static int diff --git a/epan/dissectors/packet-logcat-text.c b/epan/dissectors/packet-logcat-text.c index b0139ef3f1..31a473b552 100644 --- a/epan/dissectors/packet-logcat-text.c +++ b/epan/dissectors/packet-logcat-text.c @@ -123,8 +123,8 @@ static int get_tag(const gchar *frame, const gchar *token, tvbuff_t *tvb, proto_tree_add_string(maintree, hf_logcat_text_tag, tvb, offset, tok_len, token); - SET_ADDRESS(&pinfo->src, AT_STRINGZ, tok_len + 1, src_addr); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, sizeof(dissector_name), dissector_name); + set_address(&pinfo->src, AT_STRINGZ, tok_len + 1, src_addr); + set_address(&pinfo->dst, AT_STRINGZ, sizeof(dissector_name), dissector_name); return offset + tok_len; } @@ -256,8 +256,8 @@ static int dissect_logcat_text_process(tvbuff_t *tvb, packet_info *pinfo, proto_ dissect_info_t dinfo = { &process_regex, getters, array_length(getters) }; add_exported_pdu(tvb,pinfo,"logcat_text_process"); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, 0, ""); - SET_ADDRESS(&pinfo->src, AT_STRINGZ, 0, ""); + set_address(&pinfo->dst, AT_STRINGZ, 0, ""); + set_address(&pinfo->src, AT_STRINGZ, 0, ""); return dissect_logcat_text(tvb, tree, pinfo, &dinfo); } @@ -277,8 +277,8 @@ static int dissect_logcat_text_thread(tvbuff_t *tvb, packet_info *pinfo, proto_t dissect_info_t dinfo = { &thread_regex, getters, array_length(getters) }; add_exported_pdu(tvb,pinfo,"logcat_text_brief"); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, 0, ""); - SET_ADDRESS(&pinfo->src, AT_STRINGZ, 0, ""); + set_address(&pinfo->dst, AT_STRINGZ, 0, ""); + set_address(&pinfo->src, AT_STRINGZ, 0, ""); return dissect_logcat_text(tvb, tree, pinfo, &dinfo); } diff --git a/epan/dissectors/packet-logcat.c b/epan/dissectors/packet-logcat.c index 5b69329be1..11f269e279 100644 --- a/epan/dissectors/packet-logcat.c +++ b/epan/dissectors/packet-logcat.c @@ -159,7 +159,7 @@ dissect_logcat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ 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(&pinfo->dst, AT_STRINGZ, 7, "Logcat"); + set_address(&pinfo->dst, AT_STRINGZ, 7, "Logcat"); offset += string_length; check_length += string_length; diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index 60852e9c2a..d095997736 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -1193,13 +1193,13 @@ dissect_protocol_data_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, pro mtp3_tap->addr_dpc.type = (Standard_Type)mtp3_standard; mtp3_tap->addr_dpc.pc = dpc; mtp3_tap->addr_dpc.ni = tvb_get_guint8(parameter_tvb, DATA_NI_OFFSET); - SET_ADDRESS(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) &mtp3_tap->addr_dpc); + set_address(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) &mtp3_tap->addr_dpc); mtp3_tap->addr_opc.type = (Standard_Type)mtp3_standard; mtp3_tap->addr_opc.pc = opc; mtp3_tap->addr_opc.ni = tvb_get_guint8(parameter_tvb, DATA_NI_OFFSET); - SET_ADDRESS(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) &mtp3_tap->addr_opc); + set_address(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) &mtp3_tap->addr_opc); mtp3_tap->mtp3_si_code = tvb_get_guint8(parameter_tvb, DATA_SI_OFFSET); mtp3_tap->size = 0; diff --git a/epan/dissectors/packet-mim.c b/epan/dissectors/packet-mim.c index 7c68cdd1e3..7bc01d1516 100644 --- a/epan/dissectors/packet-mim.c +++ b/epan/dissectors/packet-mim.c @@ -226,7 +226,7 @@ dissect_fp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ if (dest_ig) { address ether_addr; - SET_ADDRESS(ðer_addr, AT_ETHER, 6, dst_addr); + set_address(ðer_addr, AT_ETHER, 6, dst_addr); ti = proto_tree_add_protocol_format(tree, proto_fp, tvb, 0, FP_HEADER_SIZE, "Cisco FabricPath, Src: %03x.%02x.%04x, Dst: %s", diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c index 96d1eb1959..233b5fc2e3 100644 --- a/epan/dissectors/packet-mp2t.c +++ b/epan/dissectors/packet-mp2t.c @@ -529,14 +529,14 @@ mp2t_fragment_handle(tvbuff_t *tvb, guint offset, packet_info *pinfo, save_fragmented = pinfo->fragmented; pinfo->fragmented = TRUE; - COPY_ADDRESS_SHALLOW(&save_src, &pinfo->src); - COPY_ADDRESS_SHALLOW(&save_dst, &pinfo->dst); + copy_address_shallow(&save_src, &pinfo->src); + copy_address_shallow(&save_dst, &pinfo->dst); /* It's possible that a fragment in the same packet set an address already * This will change the hash value, we need to make sure it's NULL */ - SET_ADDRESS(&pinfo->src, mp2t_no_address_type, 0, NULL); - SET_ADDRESS(&pinfo->dst, mp2t_no_address_type, 0, NULL); + set_address(&pinfo->src, mp2t_no_address_type, 0, NULL); + set_address(&pinfo->dst, mp2t_no_address_type, 0, NULL); /* check length; send frame for reassembly */ frag_msg = fragment_add_check(&mp2t_reassembly_table, @@ -550,8 +550,8 @@ mp2t_fragment_handle(tvbuff_t *tvb, guint offset, packet_info *pinfo, frag_msg, &mp2t_msg_frag_items, NULL, tree); - COPY_ADDRESS_SHALLOW(&pinfo->src, &save_src); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &save_dst); + copy_address_shallow(&pinfo->src, &save_src); + copy_address_shallow(&pinfo->dst, &save_dst); if (new_tvb) { /* ti = */ proto_tree_add_item(tree, hf_msg_ts_packet_reassembled, tvb, 0, 0, ENC_NA); diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index 30b1b0890d..12b6a23426 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -483,10 +483,10 @@ dissect_mpeg_audio_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Audio Layer %d", mpa_layer(&mpa) + 1); if (MPA_BITRATE_VALID(&mpa) && MPA_FREQUENCY_VALID(&mpa)) { data_size = (int)(MPA_DATA_BYTES(&mpa) - sizeof mpa); - SET_ADDRESS(&pinfo->src, AT_NONE, 0, NULL); + set_address(&pinfo->src, AT_NONE, 0, NULL); col_add_fstr(pinfo->cinfo, COL_DEF_SRC, "%d kb/s", mpa_bitrate(&mpa) / 1000); - SET_ADDRESS(&pinfo->dst, AT_NONE, 0, NULL); + set_address(&pinfo->dst, AT_NONE, 0, NULL); col_add_fstr(pinfo->cinfo, COL_DEF_DST, "%g kHz", mpa_frequency(&mpa) / (float)1000); } diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index dffa42bc89..04841d75f2 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -1127,7 +1127,7 @@ static void msmms_data_add_address(packet_info *pinfo, address *addr, port_type return; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); /* Check if the ip address and port combination is not * already registered as a conversation. */ diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 91fdcfde0a..0464c8037f 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -165,7 +165,7 @@ msrp_add_address( packet_info *pinfo, return; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); /* * Check if the ip address and port combination is not diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c index d0d63c4949..3067a965ca 100644 --- a/epan/dissectors/packet-mstp.c +++ b/epan/dissectors/packet-mstp.c @@ -355,9 +355,9 @@ dissect_mstp_wtap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* set the MS/TP MAC address in the source/destination */ TVB_SET_ADDRESS(&pinfo->dl_dst, mstp_address_type, tvb, offset+3, 1); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); TVB_SET_ADDRESS(&pinfo->dl_src, mstp_address_type, tvb, offset+4, 1); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); #ifdef BACNET_MSTP_SUMMARY_IN_TREE mstp_frame_type = tvb_get_guint8(tvb, offset+2); diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c index 781a8aef89..c1014e92f8 100644 --- a/epan/dissectors/packet-mtp3.c +++ b/epan/dissectors/packet-mtp3.c @@ -610,11 +610,11 @@ dissect_mtp3_routing_label(tvbuff_t *tvb, packet_info *pinfo, proto_tree *mtp3_t mtp3_addr_opc->type = (Standard_Type)mtp3_standard; mtp3_addr_opc->pc = opc; - SET_ADDRESS(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_opc); + set_address(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_opc); mtp3_addr_dpc->type = (Standard_Type)mtp3_standard; mtp3_addr_dpc->pc = dpc; - SET_ADDRESS(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_dpc); + set_address(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_dpc); } static void diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 24925d5bf7..31434b1f8d 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -10295,7 +10295,7 @@ int i; } /*Find the conversations assoicated with the HS-DSCH flows in this packet and set proper H-RNTI*/ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); for (i = 0; i < maxNrOfMACdFlows; i++) { if (nbap_hsdsch_channel_info[i].crnc_port != 0){ conversation = find_conversation(actx->pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr, @@ -12093,10 +12093,10 @@ dissect_nbap_CommonMACFlow_Specific_InfoItem(tvbuff_t *tvb _U_, int offset _U_, return offset; } - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); /* Set address for collection of common entries */ - COPY_ADDRESS(&(nbap_common_channel_info[common_macdflow_id].crnc_address),&dst_addr); + copy_address(&(nbap_common_channel_info[common_macdflow_id].crnc_address),&dst_addr); nbap_common_channel_info[common_macdflow_id].crnc_port = BindingID_port; @@ -18226,7 +18226,7 @@ guint32 no_ddi_entries, i; } /* Check if we have conversation info */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); p_conv = find_conversation(actx->pinfo->fd->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr, PT_UDP, nbap_edch_channel_info[e_dch_macdflow_id].crnc_port, 0, NO_ADDR_B); @@ -18251,7 +18251,7 @@ guint32 no_ddi_entries, i; );*/ } -/* COPY_ADDRESS(&(nbap_edch_port_info->crnc_address[e_dch_macdflow_id]),&dst_addr);*/ +/* copy_address(&(nbap_edch_port_info->crnc_address[e_dch_macdflow_id]),&dst_addr);*/ p_conv_data->dch_crc_present = g_nbap_msg_info_for_fp.dch_crc_present; /* Figure out which type of E-DCH frame, based on DDI value (DDI = 0 => type 2)*/ @@ -18521,7 +18521,7 @@ num_items = 1; /*Do the configurations*/ /* Check if we have conversation info */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); p_conv = find_conversation(actx->pinfo->fd->num, &nbap_edch_channel_info[e_dch_macdflow_id].crnc_address, &null_addr, PT_UDP, nbap_edch_channel_info[e_dch_macdflow_id].crnc_port, 0, NO_ADDR_B); @@ -18546,7 +18546,7 @@ num_items = 1; );*/ } -/* COPY_ADDRESS(&(nbap_edch_port_info->crnc_address[e_dch_macdflow_id]),&dst_addr);*/ +/* copy_address(&(nbap_edch_port_info->crnc_address[e_dch_macdflow_id]),&dst_addr);*/ p_conv_data->dch_crc_present = g_nbap_msg_info_for_fp.dch_crc_present; /* Figure out which type of E-DCH frame, based on DDI value (DDI = 0 => type 2)*/ @@ -18632,9 +18632,9 @@ BindingID_port = 0; * Basically the idea here is that we create a new converation (Which is ok? maybe?) * And then hijack the old conversation and let lower tree items configure that hijacked data. * */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); old_conversation = find_conversation(actx->pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, BindingID_port, @@ -18689,7 +18689,7 @@ BindingID_port = 0; } /* Set address for collection of DDI entries */ - COPY_ADDRESS(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr); + copy_address(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr); nbap_edch_channel_info[e_dch_macdflow_id].crnc_port = BindingID_port; @@ -23337,7 +23337,7 @@ int i; return offset; } /* Set port to zero use that as an indication of whether we have data or not */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); for (i = 0; i < maxNrOfCommonMACFlows; i++) { if (nbap_common_channel_info[i].crnc_port != 0){ @@ -23481,10 +23481,10 @@ dissect_nbap_HSDSCH_MACdFlow_Specific_InfoItem(tvbuff_t *tvb _U_, int offset _U_ return offset; } - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); /* Set address for collection of HSDSCH entries */ - COPY_ADDRESS(&(nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_address),&dst_addr); + copy_address(&(nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_address),&dst_addr); nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_port = BindingID_port; @@ -23782,7 +23782,7 @@ dissect_nbap_HSDSCH_FDD_Information(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_ } /* Set port to zero use that as an indication of whether we have data or not */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); for (i = 0; i < maxNrOfMACdFlows; i++) { if (nbap_hsdsch_channel_info[i].crnc_port != 0){ nbap_debug("Frame %u HSDSCH-MACdFlows-Information:hsdsch_macdflow_id %u Look for conv on IP %s Port %u", @@ -23906,10 +23906,10 @@ dissect_nbap_HSDSCH_MACdFlow_Specific_InfoItem_to_Modify(tvbuff_t *tvb _U_, int return offset; } - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); /* Set address for collection of HSDSCH entries */ - COPY_ADDRESS(&(nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_address),&dst_addr); + copy_address(&(nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_address),&dst_addr); nbap_hsdsch_channel_info[hsdsch_macdflow_id].crnc_port = BindingID_port; @@ -24116,7 +24116,7 @@ dissect_nbap_HSDSCH_Information_to_Modify(tvbuff_t *tvb _U_, int offset _U_, asn } /* Set port to zero use that as an indication of whether we have data or not */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); nbap_debug("Frame %u HSDSCH-MACdFlows-Information Start", actx->pinfo->fd->num); @@ -28657,9 +28657,9 @@ dch_id = 0xFFFFFFFF; return offset; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); conversation = find_conversation(actx->pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, BindingID_port, @@ -28795,9 +28795,9 @@ BindingID_port = 0; { return offset; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); conversation = find_conversation(actx->pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, BindingID_port, @@ -28881,7 +28881,7 @@ BindingID_port = 0; } /* Set address for collection of DDI entries */ - COPY_ADDRESS(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr); + copy_address(&(nbap_edch_channel_info[e_dch_macdflow_id].crnc_address),&dst_addr); nbap_edch_channel_info[e_dch_macdflow_id].crnc_port = BindingID_port; set_umts_fp_conv_data(conversation, umts_fp_conversation_info); @@ -32364,9 +32364,9 @@ transportFormatSet_type = NBAP_CPCH; { return offset; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); conversation = find_conversation(actx->pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, BindingID_port, @@ -32529,9 +32529,9 @@ num_items = 1; { return offset; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); conversation = find_conversation(actx->pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, BindingID_port, @@ -32672,9 +32672,9 @@ transportFormatSet_type = NBAP_CPCH; { return offset; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); + set_address(&dst_addr, AT_IPv4, 4, &transportLayerAddress_ipv4); conversation = find_conversation(actx->pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, BindingID_port, @@ -55202,7 +55202,7 @@ static void add_hsdsch_bind(packet_info *pinfo){ } /* Set port to zero use that as an indication of whether we have data or not */ - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); for (i = 0; i < maxNrOfMACdFlows; i++) { if (nbap_hsdsch_channel_info[i].crnc_port != 0){ conversation = find_conversation(pinfo->fd->num, &(nbap_hsdsch_channel_info[i].crnc_address), &null_addr, diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 1efd88afc9..7be486c7b5 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3046,7 +3046,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* /* * Determine the direction of the flow, so we can use the correct fragment tree */ - direction=CMP_ADDRESS(&pinfo->src, &pinfo->dst); + direction=cmp_address(&pinfo->src, &pinfo->dst); if(direction==0) { direction= (pinfo->srcport > pinfo->destport) ? 1 : -1; } diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 6bc644cb0f..1c9a5774f1 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -7301,9 +7301,9 @@ dissect_v9_v10_data_template(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pdut /* Note: address at *(pinfo->net_???.data) is *not* copied */ static v9_v10_tmplt_t *v9_v10_tmplt_build_key(v9_v10_tmplt_t *tmplt_p, packet_info *pinfo, guint32 src_id, guint16 tmplt_id) { - SET_ADDRESS(&tmplt_p->src_addr, pinfo->net_src.type, pinfo->net_src.len, pinfo->net_src.data); /* lookup only! */ + set_address(&tmplt_p->src_addr, pinfo->net_src.type, pinfo->net_src.len, pinfo->net_src.data); /* lookup only! */ tmplt_p->src_port = pinfo->srcport; - SET_ADDRESS(&tmplt_p->dst_addr, pinfo->net_dst.type, pinfo->net_dst.len, pinfo->net_dst.data); /* lookup only! */ + set_address(&tmplt_p->dst_addr, pinfo->net_dst.type, pinfo->net_dst.len, pinfo->net_dst.data); /* lookup only! */ tmplt_p->dst_port = pinfo->destport; tmplt_p->src_id = src_id; tmplt_p->tmplt_id = tmplt_id; @@ -7317,9 +7317,9 @@ v9_v10_tmplt_table_equal(gconstpointer k1, gconstpointer k2) const v9_v10_tmplt_t *tb = (const v9_v10_tmplt_t *)k2; return ( - (CMP_ADDRESS(&ta->src_addr, &tb->src_addr) == 0) && + (cmp_address(&ta->src_addr, &tb->src_addr) == 0) && (ta->src_port == tb->src_port) && - (CMP_ADDRESS(&ta->dst_addr, &tb->dst_addr) == 0) && + (cmp_address(&ta->dst_addr, &tb->dst_addr) == 0) && (ta->dst_port == tb->dst_port) && (ta->src_id == tb->src_id) && (ta->tmplt_id == tb->tmplt_id) @@ -7441,7 +7441,7 @@ getprefix(const guint32 *addr, int prefix) gprefix = *addr & g_htonl((0xffffffff << (32 - prefix))); - SET_ADDRESS(&prefix_addr, AT_IPv4, 4, &gprefix); + set_address(&prefix_addr, AT_IPv4, 4, &gprefix); return address_to_str(wmem_packet_scope(), &prefix_addr); } diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c index 433408bc2a..4db140e786 100644 --- a/epan/dissectors/packet-nfs.c +++ b/epan/dissectors/packet-nfs.c @@ -7371,7 +7371,7 @@ dissect_nfs4_clientaddr(tvbuff_t *tvb, int offset, proto_tree *tree) /* IPv4: h1.h2.h3.h4.p1.p2 */ port = (b5<<8) | b6; ipv4 = g_htonl((b1<<24) | (b2<<16) | (b3<<8) | b4); - SET_ADDRESS(&addr, AT_IPv4, 4, &ipv4); + set_address(&addr, AT_IPv4, 4, &ipv4); ti = proto_tree_add_ipv4_format(tree, hf_nfs4_universal_address_ipv4, tvb, addr_offset, offset-addr_offset, ipv4, "IPv4 address %s, protocol=%s, port=%u", address_to_str(wmem_packet_scope(), &addr), protocol, port); PROTO_ITEM_SET_GENERATED(ti); @@ -7388,7 +7388,7 @@ dissect_nfs4_clientaddr(tvbuff_t *tvb, int offset, proto_tree *tree) memset(&ipv6, 0, sizeof(ipv6)); ipv6.bytes[0] = b1; ipv6.bytes[1] = b2; ipv6.bytes[2] = b3; ipv6.bytes[3] = b4; ipv6.bytes[4] = b5; ipv6.bytes[5] = b6; ipv6.bytes[6] = b7; ipv6.bytes[7] = b8; - SET_ADDRESS(&addr, AT_IPv6, 16, &ipv6); + set_address(&addr, AT_IPv6, 16, &ipv6); ti = proto_tree_add_ipv6_format(tree, hf_nfs4_universal_address_ipv6, tvb, addr_offset, offset-addr_offset, &ipv6, "IPv6 address %s, protocol=%s, port=%u", address_to_str(wmem_packet_scope(), &addr), protocol, port); PROTO_ITEM_SET_GENERATED(ti); diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c index 2872d81d05..cccf3895e0 100644 --- a/epan/dissectors/packet-p_mul.c +++ b/epan/dissectors/packet-p_mul.c @@ -320,7 +320,7 @@ static gint p_mul_id_hash_equal (gconstpointer k1, gconstpointer k2) if (p_mul1->seq != p_mul2->seq) return 0; - return (ADDRESSES_EQUAL (&p_mul1->addr, &p_mul2->addr)); + return (addresses_equal (&p_mul1->addr, &p_mul2->addr)); } static p_mul_seq_val *lookup_seq_val (guint32 message_id, guint16 seq_no, diff --git a/epan/dissectors/packet-ppcap.c b/epan/dissectors/packet-ppcap.c index 9b62ef12a6..b2cc03c5d8 100644 --- a/epan/dissectors/packet-ppcap.c +++ b/epan/dissectors/packet-ppcap.c @@ -280,8 +280,8 @@ dissect_ppcap_source_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ppc mtp3_addr_opc->pc = (guint32 )tvb_get_ntoh24(tvb, offset); mtp3_addr_opc->type = ITU_STANDARD; mtp3_addr_opc->ni = 0; - /*SET_ADDRESS(&pinfo->net_src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_opc);*/ - SET_ADDRESS(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_opc); + /*set_address(&pinfo->net_src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_opc);*/ + set_address(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_opc); if (msg_len%4) msg_len = msg_len + (4 - (msg_len%4)); @@ -297,7 +297,7 @@ dissect_ppcap_source_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ppc mtp3_addr_opc->pc = tvb_get_ntohl(tvb, offset); mtp3_addr_opc->type = ITU_STANDARD; mtp3_addr_opc->ni = 0; - SET_ADDRESS(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_opc); + set_address(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_opc); } else if (key1 == 3) { @@ -306,7 +306,7 @@ dissect_ppcap_source_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ppc proto_tree_add_ipv4(ppcap_tree1, hf_ppcap_source_ip_address1, tvb, offset, msg_len, tvb_get_ipv4(tvb, offset)); TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv4, tvb, offset, 4); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); } else { @@ -314,7 +314,7 @@ dissect_ppcap_source_address(tvbuff_t *tvb, packet_info *pinfo, proto_tree * ppc tvb_get_ipv6(tvb, offset, &value); proto_tree_add_ipv6(ppcap_tree1, hf_ppcap_source_ip_address2, tvb, offset, msg_len, &value); TVB_SET_ADDRESS(&pinfo->net_src, AT_IPv6, tvb, offset, 6); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); } } @@ -323,7 +323,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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); } if (msg_len%4) msg_len = msg_len + (4 - (msg_len%4)); @@ -372,7 +372,7 @@ dissect_ppcap_destination_address(tvbuff_t *tvb, packet_info * pinfo, proto_tree mtp3_addr_dpc->pc = (guint32)tvb_get_ntoh24(tvb, offset); mtp3_addr_dpc->type = ITU_STANDARD; mtp3_addr_dpc->ni = 0; - SET_ADDRESS(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_dpc); + set_address(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_dpc); if (msg_len%4) msg_len = msg_len + (4 - (msg_len%4)); @@ -390,7 +390,7 @@ dissect_ppcap_destination_address(tvbuff_t *tvb, packet_info * pinfo, proto_tree mtp3_addr_dpc->pc = tvb_get_ntohl(tvb, offset); mtp3_addr_dpc->type = ITU_STANDARD; mtp3_addr_dpc->ni = 0; - SET_ADDRESS(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_dpc); + set_address(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) mtp3_addr_dpc); } else if (key2 == 3) { @@ -398,7 +398,7 @@ dissect_ppcap_destination_address(tvbuff_t *tvb, packet_info * pinfo, proto_tree { proto_tree_add_ipv4(ppcap_tree1, hf_ppcap_destination_ip_address1, tvb, offset, msg_len, tvb_get_ipv4(tvb, offset)); TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv4, tvb, offset, 4); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); } else { @@ -407,7 +407,7 @@ dissect_ppcap_destination_address(tvbuff_t *tvb, packet_info * pinfo, proto_tree tvb_get_ipv6(tvb, offset,&value); proto_tree_add_ipv6(ppcap_tree1, hf_ppcap_destination_ip_address2, tvb, offset, msg_len, &value); TVB_SET_ADDRESS(&pinfo->net_dst, AT_IPv6, tvb, offset, 6); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); } } @@ -417,7 +417,7 @@ dissect_ppcap_destination_address(tvbuff_t *tvb, packet_info * pinfo, proto_tree 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); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); } if (msg_len%4) diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index ef29818ffb..0189bf5c62 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -3597,7 +3597,7 @@ dissect_vsncp_pdnaddress_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, address addr; tvb_memcpy(tvb, &ad->bytes[8], offset + 3, 8); - SET_ADDRESS(&addr, AT_IPv6, 16, ad->bytes); + set_address(&addr, AT_IPv6, 16, ad->bytes); proto_tree_add_ipv6_format(field_tree, hf_vsncp_pdn_ipv6, tvb, offset + 3, length - 3, ad, "%s: %s", val_to_str_const(pdnaddtype, vsncp_pdntype_vals, "Unknown"), address_to_str(wmem_packet_scope(), &addr)); @@ -3610,7 +3610,7 @@ dissect_vsncp_pdnaddress_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset, address addr; tvb_memcpy(tvb, &ad->bytes[8], offset + 3, 8); - SET_ADDRESS(&addr, AT_IPv6, 16, ad->bytes); + set_address(&addr, AT_IPv6, 16, ad->bytes); proto_tree_add_ipv6_format(field_tree, hf_vsncp_pdn_ipv6, tvb, offset + 3, length - 3, ad, "%s: %s", val_to_str_const(pdnaddtype, vsncp_pdntype_vals, "Unknown"), address_to_str(wmem_packet_scope(), &addr)); diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index 22657d2a21..d01628fbb2 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -244,7 +244,7 @@ void rdt_add_address(packet_info *pinfo, return; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); /* Check if the ip address and port combination is not already registered as a conversation. */ diff --git a/epan/dissectors/packet-rpcrdma.c b/epan/dissectors/packet-rpcrdma.c index 1704b43125..213d7e8118 100644 --- a/epan/dissectors/packet-rpcrdma.c +++ b/epan/dissectors/packet-rpcrdma.c @@ -399,12 +399,12 @@ dissect_rpcordma_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if (gPREF_MAN_EN) { /* If the manual settings are enabled see if this fits - in which case we can skip the following checks entirely and go straight to dissecting */ - if ( (ADDRESSES_EQUAL(&pinfo->src, &manual_addr[0]) && - ADDRESSES_EQUAL(&pinfo->dst, &manual_addr[1]) && + if ( (addresses_equal(&pinfo->src, &manual_addr[0]) && + addresses_equal(&pinfo->dst, &manual_addr[1]) && (pinfo->srcport == 0xffffffff /* is unknown */ || pinfo->srcport == gPREF_QP[0]) && (pinfo->destport == 0xffffffff /* is unknown */ || pinfo->destport == gPREF_QP[1])) || - (ADDRESSES_EQUAL(&pinfo->src, &manual_addr[1]) && - ADDRESSES_EQUAL(&pinfo->dst, &manual_addr[0]) && + (addresses_equal(&pinfo->src, &manual_addr[1]) && + addresses_equal(&pinfo->dst, &manual_addr[0]) && (pinfo->srcport == 0xffffffff /* is unknown */ || pinfo->srcport == gPREF_QP[1]) && (pinfo->destport == 0xffffffff /* is unknown */ || pinfo->destport == gPREF_QP[0])) ) return (dissect_packet(tvb, pinfo, tree) != 0); @@ -619,13 +619,13 @@ proto_reg_handoff_rpcordma(void) if (errno || *not_parsed != '\0') { error_occured = TRUE; } else { - SET_ADDRESS(&manual_addr[i], AT_IB, sizeof(guint16), manual_addr_data[i]); + set_address(&manual_addr[i], AT_IB, sizeof(guint16), manual_addr_data[i]); } } else { /* GID */ if (!str_to_ip6(gPREF_ID[i], manual_addr_data[i]) ) { error_occured = TRUE; } else { - SET_ADDRESS(&manual_addr[i], AT_IB, GID_SIZE, manual_addr_data[i]); + set_address(&manual_addr[i], AT_IB, GID_SIZE, manual_addr_data[i]); } } diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c index 39a02702a4..3f57411b8b 100644 --- a/epan/dissectors/packet-rsvp.c +++ b/epan/dissectors/packet-rsvp.c @@ -1869,7 +1869,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) switch (key1->session_type) { case RSVP_SESSION_TYPE_IPV4: - if (ADDRESSES_EQUAL(&key1->u.session_ipv4.destination, + if (addresses_equal(&key1->u.session_ipv4.destination, &key2->u.session_ipv4.destination) == FALSE) return 0; @@ -1886,7 +1886,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) break; case RSVP_SESSION_TYPE_IPV4_LSP: - if (ADDRESSES_EQUAL(&key1->u.session_ipv4_lsp.destination, + if (addresses_equal(&key1->u.session_ipv4_lsp.destination, &key2->u.session_ipv4_lsp.destination) == FALSE) return 0; @@ -1902,7 +1902,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) break; case RSVP_SESSION_TYPE_AGGREGATE_IPV4: - if (ADDRESSES_EQUAL(&key1->u.session_agg_ipv4.destination, + if (addresses_equal(&key1->u.session_agg_ipv4.destination, &key2->u.session_agg_ipv4.destination) == FALSE) return 0; @@ -1916,7 +1916,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) break; case RSVP_SESSION_TYPE_IPV4_UNI: - if (ADDRESSES_EQUAL(&key1->u.session_ipv4_uni.destination, + if (addresses_equal(&key1->u.session_ipv4_uni.destination, &key2->u.session_ipv4_uni.destination) == FALSE) return 0; @@ -1932,7 +1932,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) break; case RSVP_SESSION_TYPE_IPV4_E_NNI: - if (ADDRESSES_EQUAL(&key1->u.session_ipv4_enni.destination, + if (addresses_equal(&key1->u.session_ipv4_enni.destination, &key2->u.session_ipv4_enni.destination) == FALSE) return 0; @@ -1952,7 +1952,7 @@ rsvp_equal(gconstpointer k1, gconstpointer k2) break; } - if (ADDRESSES_EQUAL(&key1->source_info.source, + if (addresses_equal(&key1->source_info.source, &key2->source_info.source) == FALSE) return 0; @@ -7441,8 +7441,8 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea rsvph = wmem_new0(wmem_packet_scope(), rsvp_conversation_info); /* Copy over the source and destination addresses from the pinfo strucutre */ - SET_ADDRESS(&rsvph->source, pinfo->src.type, pinfo->src.len, pinfo->src.data); - SET_ADDRESS(&rsvph->destination, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data); + set_address(&rsvph->source, pinfo->src.type, pinfo->src.len, pinfo->src.data); + set_address(&rsvph->destination, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data); col_add_str(pinfo->cinfo, COL_INFO, val_to_str_ext(message_type, &message_type_vals_ext, "Unknown (%u). ")); @@ -7479,7 +7479,7 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea switch (request_key.session_type) { case RSVP_SESSION_TYPE_IPV4: - SET_ADDRESS(&request_key.u.session_ipv4.destination, + set_address(&request_key.u.session_ipv4.destination, rsvph->destination.type, rsvph->destination.len, rsvph->destination.data); request_key.u.session_ipv4.protocol = rsvph->protocol; @@ -7491,7 +7491,7 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea break; case RSVP_SESSION_TYPE_IPV4_LSP: - SET_ADDRESS(&request_key.u.session_ipv4_lsp.destination, + set_address(&request_key.u.session_ipv4_lsp.destination, rsvph->destination.type, rsvph->destination.len, rsvph->destination.data); request_key.u.session_ipv4_lsp.udp_dest_port = rsvph->udp_dest_port; @@ -7499,14 +7499,14 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea break; case RSVP_SESSION_TYPE_AGGREGATE_IPV4: - SET_ADDRESS(&request_key.u.session_agg_ipv4.destination, + set_address(&request_key.u.session_agg_ipv4.destination, rsvph->destination.type, rsvph->destination.len, rsvph->destination.data); request_key.u.session_agg_ipv4.dscp = rsvph->dscp; break; case RSVP_SESSION_TYPE_IPV4_UNI: - SET_ADDRESS(&request_key.u.session_ipv4_uni.destination, + set_address(&request_key.u.session_ipv4_uni.destination, rsvph->destination.type, rsvph->destination.len, rsvph->destination.data); request_key.u.session_ipv4_uni.udp_dest_port = rsvph->udp_dest_port; @@ -7514,7 +7514,7 @@ dissect_rsvp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea break; case RSVP_SESSION_TYPE_IPV4_E_NNI: - SET_ADDRESS(&request_key.u.session_ipv4_enni.destination, + set_address(&request_key.u.session_ipv4_enni.destination, rsvph->destination.type, rsvph->destination.len, rsvph->destination.data); request_key.u.session_ipv4_enni.udp_dest_port = rsvph->udp_dest_port; diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 93c1a0034f..369e46264b 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -743,7 +743,7 @@ void srtcp_add_address( packet_info *pinfo, return; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); /* * Check if the ip address and port combination is not diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index e17b539919..124f5fb403 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -2305,8 +2305,8 @@ dissect_rtmpt_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat rconv = rtmpt_init_rconv(conv); } - cdir = (ADDRESSES_EQUAL(&conv->key_ptr->addr1, &pinfo->src) && - ADDRESSES_EQUAL(&conv->key_ptr->addr2, &pinfo->dst) && + cdir = (addresses_equal(&conv->key_ptr->addr1, &pinfo->src) && + addresses_equal(&conv->key_ptr->addr2, &pinfo->dst) && conv->key_ptr->port1 == pinfo->srcport && conv->key_ptr->port2 == pinfo->destport) ? 0 : 1; diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index ca05a7cf5e..2998ec13ff 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1153,7 +1153,7 @@ bluetooth_add_address(packet_info *pinfo, address *addr, guint32 stream_number, return; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); /* * Check if the ip address and port combination is not @@ -1242,7 +1242,7 @@ srtp_add_address(packet_info *pinfo, address *addr, int port, int other_port, other_port, setup_method, setup_frame_number)); DINDENT(); - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); /* * Check if the ip address and port combination is not diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index f78b0bdab1..7c6f710f47 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -1647,9 +1647,9 @@ dissect_sccp_gt_address_information(tvbuff_t *tvb, packet_info *pinfo, if (set_addresses) { if (called) { - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, 1+(int)strlen(gt_digits), gt_digits); + set_address(&pinfo->dst, AT_STRINGZ, 1+(int)strlen(gt_digits), gt_digits); } else { - SET_ADDRESS(&pinfo->src, AT_STRINGZ, 1+(int)strlen(gt_digits), gt_digits); + set_address(&pinfo->src, AT_STRINGZ, 1+(int)strlen(gt_digits), gt_digits); } } diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 8f2a7f1601..76ab3273d2 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -4721,8 +4721,8 @@ dissect_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sctp_info.sport = pinfo->srcport; sctp_info.dport = pinfo->destport; - SET_ADDRESS(&sctp_info.ip_src, pinfo->src.type, pinfo->src.len, pinfo->src.data); - SET_ADDRESS(&sctp_info.ip_dst, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data); + set_address(&sctp_info.ip_src, pinfo->src.type, pinfo->src.len, pinfo->src.data); + set_address(&sctp_info.ip_dst, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data); dissect_sctp_packet(tvb, pinfo, tree, FALSE); if (!pinfo->flags.in_error_pkt && sctp_info.number_of_tvbs > 0) diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 9b6b1da605..da2e335ba0 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -1003,9 +1003,9 @@ static gint sip_equal(gconstpointer v, gconstpointer v2) } /* Addresses must match */ - return (ADDRESSES_EQUAL(&(val1->source_address), &(val2->source_address))) && + return (addresses_equal(&(val1->source_address), &(val2->source_address))) && (val1->source_port == val2->source_port) && - (ADDRESSES_EQUAL(&(val1->dest_address), &(val2->dest_address))) && + (addresses_equal(&(val1->dest_address), &(val2->dest_address))) && (val1->dest_port == val2->dest_port); } @@ -4349,9 +4349,9 @@ guint sip_is_packet_resend(packet_info *pinfo, /* We're only using these addresses locally (for the hash lookup) so * there is no need to make a (g_malloc'd) copy of them. */ - SET_ADDRESS(&key.dest_address, pinfo->net_dst.type, pinfo->net_dst.len, + set_address(&key.dest_address, pinfo->net_dst.type, pinfo->net_dst.len, pinfo->net_dst.data); - SET_ADDRESS(&key.source_address, pinfo->net_src.type, + set_address(&key.source_address, pinfo->net_src.type, pinfo->net_src.len, pinfo->net_src.data); key.dest_port = pinfo->destport; if (sip_retrans_the_same_sport) { @@ -4545,9 +4545,9 @@ guint sip_find_request(packet_info *pinfo, g_strlcpy(key.call_id, call_id, MAX_CALL_ID_SIZE); /* Looking for matching request, so reverse addresses for this lookup */ - SET_ADDRESS(&key.dest_address, pinfo->net_src.type, pinfo->net_src.len, + set_address(&key.dest_address, pinfo->net_src.type, pinfo->net_src.len, pinfo->net_src.data); - SET_ADDRESS(&key.source_address, pinfo->net_dst.type, pinfo->net_dst.len, + set_address(&key.source_address, pinfo->net_dst.type, pinfo->net_dst.len, pinfo->net_dst.data); key.dest_port = pinfo->srcport; key.source_port = pinfo->destport; @@ -4659,9 +4659,9 @@ guint sip_find_invite(packet_info *pinfo, g_strlcpy(key.call_id, call_id, MAX_CALL_ID_SIZE); /* Looking for matching INVITE */ - SET_ADDRESS(&key.dest_address, pinfo->net_dst.type, pinfo->net_dst.len, + set_address(&key.dest_address, pinfo->net_dst.type, pinfo->net_dst.len, pinfo->net_dst.data); - SET_ADDRESS(&key.source_address, pinfo->net_src.type, pinfo->net_src.len, + set_address(&key.source_address, pinfo->net_src.type, pinfo->net_src.len, pinfo->net_src.data); key.dest_port = pinfo->destport; key.source_port = pinfo->srcport; diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index 9dd923683e..a4891dd732 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -283,7 +283,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ */ if ((pinfo->destport == UDP_PORT_SLIMP3_V2) && (pinfo->srcport == UDP_PORT_SLIMP3_V2)) { TVB_SET_ADDRESS(&tmp_addr, AT_ETHER, tvb, offset+12, 6); - to_server = ADDRESSES_EQUAL(&tmp_addr, &pinfo->dl_src); + to_server = addresses_equal(&tmp_addr, &pinfo->dl_src); } else if (pinfo->destport == UDP_PORT_SLIMP3_V2) { to_server = TRUE; diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index 8809a8ed39..85f1a5649d 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -245,12 +245,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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); proto_tree_add_item(fh_tree, &hfi_sll_src_eth, tvb, 6, 6, ENC_NA); break; case 0: diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index 31b61a3e54..6789868152 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -1978,17 +1978,17 @@ submit_sm(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, { DebugLog(("UDHI present - set addresses\n")); /* Save original addresses */ - COPY_ADDRESS_SHALLOW(&save_src, &pinfo->src); - COPY_ADDRESS_SHALLOW(&save_dst, &pinfo->dst); + copy_address_shallow(&save_src, &pinfo->src); + copy_address_shallow(&save_dst, &pinfo->dst); /* Set SMPP source and destination address */ - SET_ADDRESS(&(pinfo->src), AT_STRINGZ, 1+(int)strlen(src_str), src_str); - SET_ADDRESS(&(pinfo->dst), AT_STRINGZ, 1+(int)strlen(dst_str), dst_str); + set_address(&(pinfo->src), AT_STRINGZ, 1+(int)strlen(src_str), src_str); + set_address(&(pinfo->dst), AT_STRINGZ, 1+(int)strlen(dst_str), dst_str); tvb_msg = tvb_new_subset (tvb, offset, MIN(length, tvb_reported_length(tvb) - offset), length); call_dissector (gsm_sms_handle, tvb_msg, pinfo, top_tree); /* Restore original addresses */ - COPY_ADDRESS_SHALLOW(&pinfo->src, &save_src); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &save_dst); + copy_address_shallow(&pinfo->src, &save_src); + copy_address_shallow(&pinfo->dst, &save_dst); } offset += length; } diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 41fadf98c0..02f9ba0586 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -1729,13 +1729,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); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); proto_tree_add_item(tree, hf_sna_th_snf, tvb, 6, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_sna_th_dcf, tvb, 8, 2, ENC_BIG_ENDIAN); @@ -1781,14 +1781,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); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + 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); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); id = tvb_get_ntohs(tvb, 4); proto_tree_add_item(tree, hf_sna_th_snf, tvb, 4, 2, ENC_BIG_ENDIAN); @@ -1978,8 +1978,8 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dst = wmem_new0(pinfo->pool, struct sna_fid_type_4_addr); dst->saf = dsaf; dst->ef = def; - SET_ADDRESS(&pinfo->net_dst, sna_address_type, SNA_FID_TYPE_4_ADDR_LEN, dst); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + set_address(&pinfo->net_dst, sna_address_type, SNA_FID_TYPE_4_ADDR_LEN, dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); oef = tvb_get_ntohs(tvb, 20); proto_tree_add_uint(tree, hf_sna_th_oef, tvb, offset+2, 2, oef); @@ -1988,8 +1988,8 @@ dissect_fid4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) src = wmem_new0(pinfo->pool, struct sna_fid_type_4_addr); src->saf = osaf; src->ef = oef; - SET_ADDRESS(&pinfo->net_src, sna_address_type, SNA_FID_TYPE_4_ADDR_LEN, src); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + set_address(&pinfo->net_src, sna_address_type, SNA_FID_TYPE_4_ADDR_LEN, src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); proto_tree_add_item(tree, hf_sna_th_snf, tvb, offset+4, 2, ENC_BIG_ENDIAN); proto_tree_add_item(tree, hf_sna_th_dcf, tvb, offset+6, 2, ENC_BIG_ENDIAN); diff --git a/epan/dissectors/packet-sprt.c b/epan/dissectors/packet-sprt.c index 62e0caf43c..bb3c9616d1 100644 --- a/epan/dissectors/packet-sprt.c +++ b/epan/dissectors/packet-sprt.c @@ -782,7 +782,7 @@ void sprt_add_address(packet_info *pinfo, return; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); /* * Check if the ip address and port combination is not diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 67943216d5..14fd94b2ec 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -4026,7 +4026,7 @@ ssl_get_session(conversation_t *conversation, dissector_handle_t ssl_handle) /* Initialize parameters which are not necessary specific to decryption. */ ssl_session->session.version = SSL_VER_UNKNOWN; - SET_ADDRESS(&ssl_session->session.srv_addr, AT_NONE, 0, NULL); + set_address(&ssl_session->session.srv_addr, AT_NONE, 0, NULL); ssl_session->session.srv_ptype = PT_NONE; ssl_session->session.srv_port = 0; @@ -4228,7 +4228,7 @@ ssl_packet_from_server(SslSession *session, GTree *associations, packet_info *pi if (session->srv_ptype != PT_NONE) { ret = (session->srv_ptype == pinfo->ptype) && (session->srv_port == pinfo->srcport) && - ADDRESSES_EQUAL(&session->srv_addr, &pinfo->src); + addresses_equal(&session->srv_addr, &pinfo->src); } else { ret = ssl_association_find(associations, pinfo->srcport, pinfo->ptype != PT_UDP) != 0; } diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index f92334a549..232b5bd226 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -1064,7 +1064,7 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboole guint32 ip; guint16 port; ip = tvb_get_ipv4(tvb, offset+4) ^ g_htonl(magic_cookie_first_word); - SET_ADDRESS(&addr, AT_IPv4, 4, &ip); + set_address(&addr, AT_IPv4, 4, &ip); ipstr = address_to_str(wmem_packet_scope(), &addr); port = tvb_get_ntohs(tvb, offset+2) ^ (magic_cookie_first_word >> 16); proto_item_append_text(att_tree, ": %s:%d", ipstr, port); diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 09ea109c4f..44f891c114 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -2241,14 +2241,14 @@ dissect_sua_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *sua_t if (set_addresses) { if (sua_opc->type) - SET_ADDRESS(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) sua_opc); + set_address(&pinfo->src, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) sua_opc); if (sua_dpc->type) - SET_ADDRESS(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) sua_dpc); + set_address(&pinfo->dst, AT_SS7PC, sizeof(mtp3_addr_pc_t), (guint8 *) sua_dpc); if (sua_source_gt) - SET_ADDRESS(&pinfo->src, AT_STRINGZ, 1+(int)strlen(sua_source_gt), wmem_strdup(pinfo->pool, sua_source_gt)); + set_address(&pinfo->src, AT_STRINGZ, 1+(int)strlen(sua_source_gt), wmem_strdup(pinfo->pool, sua_source_gt)); if (sua_destination_gt) - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, 1+(int)strlen(sua_destination_gt), wmem_strdup(pinfo->pool, sua_destination_gt)); + set_address(&pinfo->dst, AT_STRINGZ, 1+(int)strlen(sua_destination_gt), wmem_strdup(pinfo->pool, sua_destination_gt)); } /* If there was SUA data it could be dissected */ diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 015a7655d1..ab472ff97f 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -277,7 +277,7 @@ void t38_add_address(packet_info *pinfo, return; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); /* * Check if the ip address and port combination is not @@ -1077,7 +1077,7 @@ init_t38_info_conv(packet_info *pinfo) p_add_proto_data(wmem_file_scope(), pinfo, proto_t38, 0, p_t38_packet_conv); } - if (ADDRESSES_EQUAL(&p_conv->key_ptr->addr1, &pinfo->net_src)) { + if (addresses_equal(&p_conv->key_ptr->addr1, &pinfo->net_src)) { p_t38_conv_info = &(p_t38_conv->src_t38_info); p_t38_packet_conv_info = &(p_t38_packet_conv->src_t38_info); } else { diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index cdd191b35e..5cac0f86f8 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -772,9 +772,9 @@ cmp_conv_address( gconstpointer p1, gconstpointer p2 ) printf("p2=>"); tacplus_print_key_entry( p2, NULL ); */ - ret=CMP_ADDRESS( a1->s, a2->s ); + ret=cmp_address( a1->s, a2->s ); if( !ret ) { - ret=CMP_ADDRESS( a1->c, a2->c ); + ret=cmp_address( a1->c, a2->c ); /* if(ret) printf("No Client found!"); */ @@ -812,9 +812,9 @@ mkipv4_address( address **addr, const char *str_addr ) addr_data=(char *)g_malloc( 4 ); ret = str_to_ip(str_addr, addr_data); if (ret) - SET_ADDRESS(*addr, AT_IPv4, 4, addr_data); + set_address(*addr, AT_IPv4, 4, addr_data); else - SET_ADDRESS(*addr, AT_STRINGZ, (int)strlen(ADDR_INVLD)+1, ADDR_INVLD); + set_address(*addr, AT_STRINGZ, (int)strlen(ADDR_INVLD)+1, ADDR_INVLD); } static void parse_tuple( char *key_from_option ) diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 2443f83e88..4caed8c5f2 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -918,7 +918,7 @@ get_tcp_conversation_data(conversation_t *conv, packet_info *pinfo) } /* check direction and get ua lists */ - direction=CMP_ADDRESS(&pinfo->src, &pinfo->dst); + direction=cmp_address(&pinfo->src, &pinfo->dst); /* if the addresses are equal, match the ports instead */ if(direction==0) { direction= (pinfo->srcport > pinfo->destport) ? 1 : -1; @@ -955,9 +955,9 @@ add_tcp_process_info(guint32 frame_num, address *local_addr, address *remote_add return; } - if (CMP_ADDRESS(local_addr, &conv->key_ptr->addr1) == 0 && local_port == conv->key_ptr->port1) { + if (cmp_address(local_addr, &conv->key_ptr->addr1) == 0 && local_port == conv->key_ptr->port1) { flow = &tcpd->flow1; - } else if (CMP_ADDRESS(remote_addr, &conv->key_ptr->addr1) == 0 && remote_port == conv->key_ptr->port1) { + } else if (cmp_address(remote_addr, &conv->key_ptr->addr1) == 0 && remote_port == conv->key_ptr->port1) { flow = &tcpd->flow2; } if (!flow || flow->command) { @@ -3553,11 +3553,11 @@ dissect_tcpopt_mptcp(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, */ if(tcpd->fwd->mptcp_subflow->meta->ip_src.len == 0) { - COPY_ADDRESS(&tcpd->fwd->mptcp_subflow->meta->ip_src, &tcph->ip_src); - COPY_ADDRESS(&tcpd->fwd->mptcp_subflow->meta->ip_dst, &tcph->ip_dst); + copy_address(&tcpd->fwd->mptcp_subflow->meta->ip_src, &tcph->ip_src); + copy_address(&tcpd->fwd->mptcp_subflow->meta->ip_dst, &tcph->ip_dst); - COPY_ADDRESS_SHALLOW(&tcpd->rev->mptcp_subflow->meta->ip_src, &tcpd->fwd->mptcp_subflow->meta->ip_dst); - COPY_ADDRESS_SHALLOW(&tcpd->rev->mptcp_subflow->meta->ip_dst, &tcpd->fwd->mptcp_subflow->meta->ip_src); + copy_address_shallow(&tcpd->rev->mptcp_subflow->meta->ip_src, &tcpd->fwd->mptcp_subflow->meta->ip_dst); + copy_address_shallow(&tcpd->rev->mptcp_subflow->meta->ip_dst, &tcpd->fwd->mptcp_subflow->meta->ip_src); tcpd->fwd->mptcp_subflow->meta->sport = tcph->th_sport; tcpd->fwd->mptcp_subflow->meta->dport = tcph->th_dport; @@ -3629,7 +3629,7 @@ dissect_tcpopt_scps(const ip_tcp_opt *optp _U_, tvbuff_t *tvb, tcpd = get_tcp_conversation_data(NULL,pinfo); /* check direction and get ua lists */ - direction=CMP_ADDRESS(&pinfo->src, &pinfo->dst); + direction=cmp_address(&pinfo->src, &pinfo->dst); /* if the addresses are equal, match the ports instead */ if(direction==0) { @@ -4840,8 +4840,8 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tcph = wmem_new0(wmem_packet_scope(), struct tcpheader); tcph->th_sport = tvb_get_ntohs(tvb, offset); tcph->th_dport = tvb_get_ntohs(tvb, offset + 2); - COPY_ADDRESS_SHALLOW(&tcph->ip_src, &pinfo->src); - COPY_ADDRESS_SHALLOW(&tcph->ip_dst, &pinfo->dst); + copy_address_shallow(&tcph->ip_src, &pinfo->src); + copy_address_shallow(&tcph->ip_dst, &pinfo->dst); col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCP"); col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c index 4f5fd9e46e..e7c879c9a5 100644 --- a/epan/dissectors/packet-tn3270.c +++ b/epan/dissectors/packet-tn3270.c @@ -5308,10 +5308,10 @@ add_tn3270_conversation(packet_info *pinfo, int tn3270e, gint model) */ tn3270_info = wmem_new(wmem_file_scope(), tn3270_conv_info_t); - COPY_ADDRESS(&(tn3270_info->outbound_addr), &(pinfo->dst)); + copy_address(&(tn3270_info->outbound_addr), &(pinfo->dst)); tn3270_info->outbound_port = pinfo->destport; - COPY_ADDRESS(&(tn3270_info->inbound_addr), &(pinfo->src)); + copy_address(&(tn3270_info->inbound_addr), &(pinfo->src)); tn3270_info->inbound_port = pinfo->srcport; conversation_add_proto_data(conversation, proto_tn3270, tn3270_info); diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index 857718ff8c..e49ca58b6b 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -540,10 +540,10 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ENDTRY; } - SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, trn_shost_nonsr); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->dl_src); - SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, trh->dst.data); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->dl_dst); + set_address(&pinfo->dl_src, AT_ETHER, 6, trn_shost_nonsr); + copy_address_shallow(&pinfo->src, &pinfo->dl_src); + set_address(&pinfo->dl_dst, AT_ETHER, 6, trh->dst.data); + copy_address_shallow(&pinfo->dst, &pinfo->dl_dst); /* protocol analysis tree */ if (tree) { diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c index d14f05e7f5..8579452875 100644 --- a/epan/dissectors/packet-udp.c +++ b/epan/dissectors/packet-udp.c @@ -259,7 +259,7 @@ get_udp_conversation_data(conversation_t *conv, packet_info *pinfo) } /* check direction and get ua lists */ - direction=CMP_ADDRESS(&pinfo->src, &pinfo->dst); + direction=cmp_address(&pinfo->src, &pinfo->dst); /* if the addresses are equal, match the ports instead */ if (direction == 0) { direction= (pinfo->srcport > pinfo->destport) ? 1 : -1; @@ -421,9 +421,9 @@ add_udp_process_info(guint32 frame_num, address *local_addr, address *remote_add return; } - if ((CMP_ADDRESS(local_addr, &conv->key_ptr->addr1) == 0) && (local_port == conv->key_ptr->port1)) { + if ((cmp_address(local_addr, &conv->key_ptr->addr1) == 0) && (local_port == conv->key_ptr->port1)) { flow = &udpd->flow1; - } else if ((CMP_ADDRESS(remote_addr, &conv->key_ptr->addr1) == 0) && (remote_port == conv->key_ptr->port1)) { + } else if ((cmp_address(remote_addr, &conv->key_ptr->addr1) == 0) && (remote_port == conv->key_ptr->port1)) { flow = &udpd->flow2; } if (!flow || flow->command) { @@ -693,8 +693,8 @@ dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 ip_proto) udph = wmem_new0(wmem_packet_scope(), e_udphdr); udph->uh_sport = tvb_get_ntohs(tvb, offset); udph->uh_dport = tvb_get_ntohs(tvb, offset + 2); - COPY_ADDRESS_SHALLOW(&udph->ip_src, &pinfo->src); - COPY_ADDRESS_SHALLOW(&udph->ip_dst, &pinfo->dst); + copy_address_shallow(&udph->ip_src, &pinfo->src); + copy_address_shallow(&udph->ip_dst, &pinfo->dst); col_set_str(pinfo->cinfo, COL_PROTOCOL, (ip_proto == IP_PROTO_UDP) ? "UDP" : "UDP-Lite"); col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index f482ad7ebb..ae926f50b1 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -1479,9 +1479,9 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) { break; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &GPRS_user_data_ipv4_address); + set_address(&dst_addr, AT_IPv4, 4, &GPRS_user_data_ipv4_address); conversation = find_conversation(pinfo->fd->num,&dst_addr, &null_addr, PT_UDP, GPRS_user_data_transport_UDP_port, @@ -1511,9 +1511,9 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) { break; } - SET_ADDRESS(&null_addr, AT_NONE, 0, NULL); + set_address(&null_addr, AT_NONE, 0, NULL); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &unc_ipv4_address); + set_address(&dst_addr, AT_IPv4, 4, &unc_ipv4_address); conversation = find_conversation(pinfo->fd->num,&dst_addr, &null_addr, PT_TCP, UNC_tcp_port, @@ -1538,7 +1538,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) rtp_ipv4_address,RTP_UDP_port); */ if(unc_ipv4_address!=0){ - SET_ADDRESS(&src_addr, AT_IPv4, 4, &unc_ipv4_address); + set_address(&src_addr, AT_IPv4, 4, &unc_ipv4_address); }else{ /* Set Source IP = own IP */ src_addr = pinfo->src; @@ -1557,7 +1557,7 @@ dissect_uma_IE(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) proto_tree_add_item(urr_ie_tree, hf_uma_urr_RTCP_port, tvb, ie_offset, 2, ENC_BIG_ENDIAN); /* TODO find out exactly which element contains IP addr */ if((!pinfo->fd->flags.visited) && rtcp_ipv4_address!=0 && RTCP_UDP_port!=0 && rtcp_handle){ - SET_ADDRESS(&src_addr, AT_IPv4, 4, &rtcp_ipv4_address); + set_address(&src_addr, AT_IPv4, 4, &rtcp_ipv4_address); rtcp_add_address(pinfo, &src_addr, RTCP_UDP_port, 0, "UMA", pinfo->fd->num); } diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index d1af4e72e1..68f136a767 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -4222,7 +4222,7 @@ dissect_fp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (p_conv_data) { /*Figure out the direction of the link*/ - if (ADDRESSES_EQUAL(&(pinfo->net_dst), (&p_conv_data->crnc_address))) { + if (addresses_equal(&(pinfo->net_dst), (&p_conv_data->crnc_address))) { proto_item *item= proto_tree_add_uint(fp_tree, hf_fp_ul_setup_frame, tvb, 0, 0, p_conv_data->ul_frame_number); @@ -4503,8 +4503,8 @@ umts_fp_init_protocol(void) if ((uat_umts_fp_ep_and_ch_records[i].dstIP) && (!str_to_ip(uat_umts_fp_ep_and_ch_records[i].dstIP, &hostb_addr))) { continue; /* parsing failed, skip this entry */ } - SET_ADDRESS(&src_addr, AT_IPv4, 4, &hosta_addr); - SET_ADDRESS(&dst_addr, AT_IPv4, 4, &hostb_addr); + set_address(&src_addr, AT_IPv4, 4, &hosta_addr); + set_address(&dst_addr, AT_IPv4, 4, &hostb_addr); } else { continue; /* Not implemented yet */ } diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index bd00165f65..55decc792b 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1845,7 +1845,7 @@ dissect_usb_endpoint_descriptor(packet_info *pinfo, proto_tree *parent_tree, usb_addr->bus_id = ((const usb_address_t *)(pinfo->src.data))->bus_id; usb_addr->device = ((const usb_address_t *)(pinfo->src.data))->device; usb_addr->endpoint = GUINT32_TO_LE(endpoint); - SET_ADDRESS(&tmp_addr, AT_USB, USB_ADDR_LEN, (char *)usb_addr); + set_address(&tmp_addr, AT_USB, USB_ADDR_LEN, (char *)usb_addr); conversation = get_usb_conversation(pinfo, &tmp_addr, &pinfo->dst, usb_addr->endpoint, pinfo->destport); } @@ -2824,7 +2824,7 @@ try_dissect_next_protocol(proto_tree *tree, tvbuff_t *next_tvb, packet_info *pin dst_addr->bus_id = usb_conv_info->bus_id; dst_addr->device = usb_conv_info->device_address; dst_addr->endpoint = dst_endpoint = GUINT32_TO_LE(endpoint); - SET_ADDRESS(&endpoint_addr, AT_USB, USB_ADDR_LEN, (char *)dst_addr); + set_address(&endpoint_addr, AT_USB, USB_ADDR_LEN, (char *)dst_addr); conversation = get_usb_conversation(pinfo, &pinfo->src, &endpoint_addr, pinfo->srcport, dst_endpoint); } @@ -2833,7 +2833,7 @@ try_dissect_next_protocol(proto_tree *tree, tvbuff_t *next_tvb, packet_info *pin src_addr->bus_id = usb_conv_info->bus_id; src_addr->device = usb_conv_info->device_address; src_addr->endpoint = src_endpoint = GUINT32_TO_LE(endpoint); - SET_ADDRESS(&endpoint_addr, AT_USB, USB_ADDR_LEN, (char *)src_addr); + set_address(&endpoint_addr, AT_USB, USB_ADDR_LEN, (char *)src_addr); conversation = get_usb_conversation(pinfo, &endpoint_addr, &pinfo->dst, src_endpoint, pinfo->destport); } @@ -3234,10 +3234,10 @@ usb_set_addr(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo, guint16 bus_id src_addr->bus_id = GUINT16_TO_LE(bus_id); dst_addr->bus_id = GUINT16_TO_LE(bus_id); - SET_ADDRESS(&pinfo->net_src, AT_USB, USB_ADDR_LEN, (char *)src_addr); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); - SET_ADDRESS(&pinfo->net_dst, AT_USB, USB_ADDR_LEN, (char *)dst_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + set_address(&pinfo->net_src, AT_USB, USB_ADDR_LEN, (char *)src_addr); + copy_address_shallow(&pinfo->src, &pinfo->net_src); + set_address(&pinfo->net_dst, AT_USB, USB_ADDR_LEN, (char *)dst_addr); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); pinfo->ptype = PT_USB; pinfo->srcport = src_addr->endpoint; diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index 6996a1f3dc..c9a93ae87c 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -553,9 +553,9 @@ dissect_vines_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vip_tctl); TVB_SET_ADDRESS(&pinfo->net_src, AT_VINES, tvb, offset+12, VINES_ADDR_LEN); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + copy_address_shallow(&pinfo->src, &pinfo->net_src); TVB_SET_ADDRESS(&pinfo->net_dst, AT_VINES, tvb, offset+6, VINES_ADDR_LEN); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); /* helpers to transport control */ if (tvb_memeql(tvb, offset+6, bcast_addr, VINES_ADDR_LEN) == 0) diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index ddae5af02c..e3e33849c5 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -355,7 +355,7 @@ dissect_winsrepl_wins_address_list(tvbuff_t *winsrepl_tvb, packet_info *pinfo, winsrepl_offset = dissect_winsrepl_wins_ip(winsrepl_tvb, pinfo, winsrepl_offset, addr_list_tree, &ip, addr_list_tree, i); - SET_ADDRESS(&addr, AT_IPv4, 4, &ip); + set_address(&addr, AT_IPv4, 4, &ip); addr_str = address_to_str(wmem_packet_scope(), &addr); if (i == 0) { proto_item_append_text(parent_item, ": %s", addr_str); diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c index 0e3bf71f81..ef31f3b989 100644 --- a/epan/dissectors/packet-wol.c +++ b/epan/dissectors/packet-wol.c @@ -166,7 +166,7 @@ dissect_wol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data col_clear(pinfo->cinfo, COL_INFO); */ - SET_ADDRESS(&mac_addr, AT_ETHER, 6, mac); + set_address(&mac_addr, AT_ETHER, 6, mac); col_add_fstr(pinfo->cinfo, COL_INFO, "MagicPacket for %s", address_with_resolution_to_str(wmem_packet_scope(), &mac_addr)); diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index fae4e85f28..a1bbc4dc3d 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -2022,7 +2022,7 @@ dissect_x25(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * sides of the conversation, based on the addresses and * ports. */ - direction = CMP_ADDRESS(&pinfo->src, &pinfo->dst); + direction = cmp_address(&pinfo->src, &pinfo->dst); if (direction == 0) direction = (pinfo->srcport > pinfo->destport)*2 - 1; dissect_x25_common(tvb, pinfo, tree, X25_UNKNOWN, direction > 0); diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 3c55b8d024..3a8a952e8b 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -463,8 +463,8 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void dst_addr = wmem_strdup_printf(pinfo->pool, "0x%04x", packet.dst); } - SET_ADDRESS(&pinfo->net_dst, AT_STRINGZ, (int)strlen(dst_addr)+1, dst_addr); - COPY_ADDRESS_SHALLOW(&pinfo->dst, &pinfo->net_dst); + set_address(&pinfo->net_dst, AT_STRINGZ, (int)strlen(dst_addr)+1, dst_addr); + copy_address_shallow(&pinfo->dst, &pinfo->net_dst); proto_item_append_text(proto_root, ", Dst: %s", dst_addr); col_append_fstr(pinfo->cinfo, COL_INFO, ", Dst: %s", dst_addr); @@ -490,8 +490,8 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void unicast_src = TRUE; } - SET_ADDRESS(&pinfo->net_src, AT_STRINGZ, (int)strlen(src_addr)+1, src_addr); - COPY_ADDRESS_SHALLOW(&pinfo->src, &pinfo->net_src); + set_address(&pinfo->net_src, AT_STRINGZ, (int)strlen(src_addr)+1, src_addr); + copy_address_shallow(&pinfo->src, &pinfo->net_src); proto_item_append_text(proto_root, ", Src: %s", src_addr); col_append_fstr(pinfo->cinfo, COL_INFO, ", Src: %s", src_addr); diff --git a/epan/dissectors/packet-zvt.c b/epan/dissectors/packet-zvt.c index fd4081a05c..1827a0df19 100644 --- a/epan/dissectors/packet-zvt.c +++ b/epan/dissectors/packet-zvt.c @@ -504,15 +504,15 @@ zvt_set_addresses(packet_info *pinfo, zvt_transaction_t *zvt_trans) } if (dir == DIRECTION_ECR_TO_PT) { - SET_ADDRESS(&pinfo->src, AT_STRINGZ, + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_ECR)+1, ADDR_ECR); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_PT)+1, ADDR_PT); } else if (dir == DIRECTION_PT_TO_ECR) { - SET_ADDRESS(&pinfo->src, AT_STRINGZ, + set_address(&pinfo->src, AT_STRINGZ, (int)strlen(ADDR_PT)+1, ADDR_PT); - SET_ADDRESS(&pinfo->dst, AT_STRINGZ, + set_address(&pinfo->dst, AT_STRINGZ, (int)strlen(ADDR_ECR)+1, ADDR_ECR); } } diff --git a/epan/follow.c b/epan/follow.c index 73fe541b17..75ddc020f1 100644 --- a/epan/follow.c +++ b/epan/follow.c @@ -242,8 +242,8 @@ follow_addr(stream_type stream, const address *addr0, guint port0, if (stream == TCP_STREAM) { find_index[TCP_STREAM] = TRUE; - SET_ADDRESS(&tcp_addr[0], addr0->type, addr0->len, ip_address[0]); - SET_ADDRESS(&tcp_addr[1], addr1->type, addr1->len, ip_address[1]); + set_address(&tcp_addr[0], addr0->type, addr0->len, ip_address[0]); + set_address(&tcp_addr[1], addr1->type, addr1->len, ip_address[1]); } return TRUE; @@ -295,12 +295,12 @@ reassemble_tcp( guint32 tcp_stream, guint32 sequence, guint32 acknowledgement, /* First, check if this packet should be processed. */ if (find_index[TCP_STREAM]) { if ((port[0] == srcport && port[1] == dstport && - ADDRESSES_EQUAL(&tcp_addr[0], net_src) && - ADDRESSES_EQUAL(&tcp_addr[1], net_dst)) + addresses_equal(&tcp_addr[0], net_src) && + addresses_equal(&tcp_addr[1], net_dst)) || (port[1] == srcport && port[0] == dstport && - ADDRESSES_EQUAL(&tcp_addr[1], net_src) && - ADDRESSES_EQUAL(&tcp_addr[0], net_dst))) { + addresses_equal(&tcp_addr[1], net_src) && + addresses_equal(&tcp_addr[0], net_dst))) { find_index[TCP_STREAM] = FALSE; stream_to_follow[TCP_STREAM] = tcp_stream; } diff --git a/epan/gcp.c b/epan/gcp.c index 2b697d01ce..f10b33d11d 100644 --- a/epan/gcp.c +++ b/epan/gcp.c @@ -121,7 +121,7 @@ gcp_msg_t* gcp_msg(packet_info* pinfo, int o, gboolean keep_persistent_data) { m->committed = FALSE; } - if (CMP_ADDRESS(src, dst) < 0) { + if (cmp_address(src, dst) < 0) { lo_addr = src; hi_addr = dst; } else { diff --git a/epan/proto.c b/epan/proto.c index c4b0042c28..0cf1079747 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -4723,26 +4723,26 @@ proto_custom_set(proto_tree* tree, GSList *field_ids, gint occurrence, case FT_IPv4: ipv4 = (ipv4_addr *)fvalue_get(&finfo->value); n_addr = ipv4_get_net_order_addr(ipv4); - SET_ADDRESS (&addr, AT_IPv4, 4, &n_addr); + set_address (&addr, AT_IPv4, 4, &n_addr); address_to_str_buf(&addr, result+offset_r, size-offset_r); offset_r = (int)strlen(result); break; case FT_IPv6: ipv6 = (struct e_in6_addr *)fvalue_get(&finfo->value); - SET_ADDRESS (&addr, AT_IPv6, sizeof(struct e_in6_addr), ipv6); + set_address (&addr, AT_IPv6, sizeof(struct e_in6_addr), ipv6); address_to_str_buf(&addr, result+offset_r, size-offset_r); offset_r = (int)strlen(result); break; case FT_FCWWN: - SET_ADDRESS (&addr, AT_FCWWN, FCWWN_ADDR_LEN, fvalue_get(&finfo->value)); + set_address (&addr, AT_FCWWN, FCWWN_ADDR_LEN, fvalue_get(&finfo->value)); address_to_str_buf(&addr, result+offset_r, size-offset_r); offset_r = (int)strlen(result); break; case FT_ETHER: - SET_ADDRESS (&addr, AT_ETHER, FT_ETHER_LEN, fvalue_get(&finfo->value)); + set_address (&addr, AT_ETHER, FT_ETHER_LEN, fvalue_get(&finfo->value)); address_to_str_buf(&addr, result+offset_r, size-offset_r); offset_r = (int)strlen(result); break; diff --git a/epan/reassemble.c b/epan/reassemble.c index 16abe70918..76a6500ff3 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -77,8 +77,8 @@ fragment_addresses_equal(gconstpointer k1, gconstpointer k2) * the comparison of addresses. */ return (key1->id == key2->id) && - (ADDRESSES_EQUAL(&key1->src, &key2->src)) && - (ADDRESSES_EQUAL(&key1->dst, &key2->dst)); + (addresses_equal(&key1->src, &key2->src)) && + (addresses_equal(&key1->dst, &key2->dst)); } /* @@ -115,8 +115,8 @@ fragment_addresses_persistent_key(const packet_info *pinfo, const guint32 id, /* * Do a deep copy of the addresses. */ - COPY_ADDRESS(&key->src, &pinfo->src); - COPY_ADDRESS(&key->dst, &pinfo->dst); + copy_address(&key->src, &pinfo->src); + copy_address(&key->dst, &pinfo->dst); key->id = id; return (gpointer)key; @@ -209,8 +209,8 @@ fragment_addresses_ports_equal(gconstpointer k1, gconstpointer k2) * the comparison of addresses and ports. */ return (key1->id == key2->id) && - (ADDRESSES_EQUAL(&key1->src_addr, &key2->src_addr)) && - (ADDRESSES_EQUAL(&key1->dst_addr, &key2->dst_addr)) && + (addresses_equal(&key1->src_addr, &key2->src_addr)) && + (addresses_equal(&key1->dst_addr, &key2->dst_addr)) && (key1->src_port == key2->src_port) && (key1->dst_port == key2->dst_port); } @@ -251,8 +251,8 @@ fragment_addresses_ports_persistent_key(const packet_info *pinfo, /* * Do a deep copy of the addresses. */ - COPY_ADDRESS(&key->src_addr, &pinfo->src); - COPY_ADDRESS(&key->dst_addr, &pinfo->dst); + copy_address(&key->src_addr, &pinfo->src); + copy_address(&key->dst_addr, &pinfo->dst); key->src_port = pinfo->srcport; key->dst_port = pinfo->destport; key->id = id; diff --git a/epan/reassemble_test.c b/epan/reassemble_test.c index 56f2b9f690..7034cd93e8 100644 --- a/epan/reassemble_test.c +++ b/epan/reassemble_test.c @@ -1558,8 +1558,8 @@ main(int argc _U_, char **argv _U_) /* other test stuff */ pinfo.fd = &fd; fd.flags.visited = 0; - SET_ADDRESS(&pinfo.src,AT_IPv4,4,src); - SET_ADDRESS(&pinfo.dst,AT_IPv4,4,dst); + set_address(&pinfo.src,AT_IPv4,4,src); + set_address(&pinfo.dst,AT_IPv4,4,dst); /*************************************************************************/ for(i=0; i < sizeof(tests)/sizeof(tests[0]); i++ ) { diff --git a/epan/wslua/make-taps.pl b/epan/wslua/make-taps.pl index 43f1c7d498..cebb226e86 100755 --- a/epan/wslua/make-taps.pl +++ b/epan/wslua/make-taps.pl @@ -39,8 +39,8 @@ my %types = %{{ 'gint16' => 'lua_pushnumber(L,(lua_Number)v->%s);', 'gint32' => 'lua_pushnumber(L,(lua_Number)v->%s);', 'gboolean' => 'lua_pushboolean(L,(int)v->%s);', - 'address' => '{ Address a = (Address)g_malloc(sizeof(address)); COPY_ADDRESS(a, &(v->%s)); pushAddress(L,a); }', - 'address*' => '{ Address a = (Address)g_malloc(sizeof(address)); COPY_ADDRESS(a, v->%s); pushAddress(L,a); }', + 'address' => '{ Address a = (Address)g_malloc(sizeof(address)); copy_address(a, &(v->%s)); pushAddress(L,a); }', + 'address*' => '{ Address a = (Address)g_malloc(sizeof(address)); copy_address(a, v->%s); pushAddress(L,a); }', 'int' => 'lua_pushnumber(L,(lua_Number)v->%s);', 'nstime_t' => '{lua_Number t = (lua_Number) v->%s.secs; t += v->%s.nsecs * 1e-9; lua_pushnumber(L,t); }', 'nstime_t*' => '{lua_Number t = (lua_Number) v->%s->secs; t += v->%s->nsecs * 1e-9; lua_pushnumber(L,t); }', diff --git a/epan/wslua/wslua_address.c b/epan/wslua/wslua_address.c index eff8ddb488..30e4565be2 100644 --- a/epan/wslua/wslua_address.c +++ b/epan/wslua/wslua_address.c @@ -50,7 +50,7 @@ WSLUA_CONSTRUCTOR Address_ip(lua_State* L) { *ip_addr = 0; } - SET_ADDRESS(addr, AT_IPv4, 4, ip_addr); + set_address(addr, AT_IPv4, 4, ip_addr); pushAddress(L,addr); WSLUA_RETURN(1); /* The Address object. */ } @@ -60,7 +60,7 @@ WSLUA_CONSTRUCTOR Address_ip(lua_State* L) { static int Address_ipv6(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -68,7 +68,7 @@ static int Address_ipv6(lua_State* L) { static int Address_ss7(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -76,7 +76,7 @@ static int Address_ss7(lua_State* L) { static int Address_eth(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -84,7 +84,7 @@ static int Address_eth(lua_State* L) { static int Address_sna(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -92,7 +92,7 @@ static int Address_sna(lua_State* L) { static int Address_atalk(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -100,7 +100,7 @@ static int Address_atalk(lua_State* L) { static int Address_vines(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -108,7 +108,7 @@ static int Address_vines(lua_State* L) { static int Address_osi(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -116,7 +116,7 @@ static int Address_osi(lua_State* L) { static int Address_arcnet(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -124,7 +124,7 @@ static int Address_arcnet(lua_State* L) { static int Address_fc(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -132,7 +132,7 @@ static int Address_fc(lua_State* L) { static int Address_string(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -140,7 +140,7 @@ static int Address_string(lua_State* L) { static int Address_eui64(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -148,7 +148,7 @@ static int Address_eui64(lua_State* L) { static int Address_uri(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -156,7 +156,7 @@ static int Address_uri(lua_State* L) { static int Address_tipc(lua_State* L) { Address addr = g_malloc(sizeof(address)); - SET_ADDRESS(addr, AT_NONE, 4, g_malloc(4)); + set_address(addr, AT_NONE, 4, g_malloc(4)); pushAddress(L,addr); return 1; @@ -212,7 +212,7 @@ WSLUA_METAMETHOD Address__eq(lua_State* L) { /* Compares two Addresses. */ Address addr2 = checkAddress(L,2); gboolean result = FALSE; - if (ADDRESSES_EQUAL(addr1, addr2)) + if (addresses_equal(addr1, addr2)) result = TRUE; lua_pushboolean(L,result); @@ -225,7 +225,7 @@ WSLUA_METAMETHOD Address__le(lua_State* L) { /* Compares two Addresses. */ Address addr2 = checkAddress(L,2); gboolean result = FALSE; - if (CMP_ADDRESS(addr1, addr2) <= 0) + if (cmp_address(addr1, addr2) <= 0) result = TRUE; lua_pushboolean(L,result); @@ -238,7 +238,7 @@ WSLUA_METAMETHOD Address__lt(lua_State* L) { /* Compares two Addresses. */ Address addr2 = checkAddress(L,2); gboolean result = FALSE; - if (CMP_ADDRESS(addr1, addr2) < 0) + if (cmp_address(addr1, addr2) < 0) result = TRUE; lua_pushboolean(L,result); diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index cf8d5b3922..7484637e40 100644 --- a/epan/wslua/wslua_pinfo.c +++ b/epan/wslua/wslua_pinfo.c @@ -173,14 +173,14 @@ static int Pinfo__tostring(lua_State *L) { lua_pushstring(L,"a Pinfo"); return 1 #define PINFO_ADDRESS_GETTER(name) \ WSLUA_ATTRIBUTE_GET(Pinfo,name, { \ Address addr = g_new(address,1); \ - COPY_ADDRESS(addr, &(obj->ws_pinfo->name)); \ + copy_address(addr, &(obj->ws_pinfo->name)); \ pushAddress(L,addr); \ }) #define PINFO_ADDRESS_SETTER(name) \ WSLUA_ATTRIBUTE_SET(Pinfo,name, { \ const address* from = checkAddress(L,-1); \ - COPY_ADDRESS(&(obj->ws_pinfo->name),from); \ + copy_address(&(obj->ws_pinfo->name),from); \ }) #define PINFO_NAMED_BOOLEAN_GETTER(name,member) \ @@ -374,10 +374,10 @@ static int Pinfo_get_hi(lua_State *L) { Address addr; addr = (Address)g_malloc(sizeof(address)); - if (CMP_ADDRESS(&(pinfo->ws_pinfo->src), &(pinfo->ws_pinfo->dst) ) >= 0) { - COPY_ADDRESS(addr, &(pinfo->ws_pinfo->src)); + if (cmp_address(&(pinfo->ws_pinfo->src), &(pinfo->ws_pinfo->dst) ) >= 0) { + copy_address(addr, &(pinfo->ws_pinfo->src)); } else { - COPY_ADDRESS(addr, &(pinfo->ws_pinfo->dst)); + copy_address(addr, &(pinfo->ws_pinfo->dst)); } pushAddress(L,addr); @@ -390,10 +390,10 @@ static int Pinfo_get_lo(lua_State *L) { Address addr; addr = (Address)g_malloc(sizeof(address)); - if (CMP_ADDRESS(&(pinfo->ws_pinfo->src), &(pinfo->ws_pinfo->dst) ) < 0) { - COPY_ADDRESS(addr, &(pinfo->ws_pinfo->src)); + if (cmp_address(&(pinfo->ws_pinfo->src), &(pinfo->ws_pinfo->dst) ) < 0) { + copy_address(addr, &(pinfo->ws_pinfo->src)); } else { - COPY_ADDRESS(addr, &(pinfo->ws_pinfo->dst)); + copy_address(addr, &(pinfo->ws_pinfo->dst)); } pushAddress(L,addr); diff --git a/epan/wslua/wslua_tvb.c b/epan/wslua/wslua_tvb.c index a896452f9e..116d33b391 100644 --- a/epan/wslua/wslua_tvb.c +++ b/epan/wslua/wslua_tvb.c @@ -770,7 +770,7 @@ WSLUA_METHOD TvbRange_ipv4(lua_State* L) { ip_addr = (guint32 *)g_malloc(sizeof(guint32)); *ip_addr = tvb_get_ipv4(tvbr->tvb->ws_tvb,tvbr->offset); - SET_ADDRESS(addr, AT_IPv4, 4, ip_addr); + set_address(addr, AT_IPv4, 4, ip_addr); pushAddress(L,addr); WSLUA_RETURN(1); /* The IPv4 `Address` object. */ @@ -799,7 +799,7 @@ WSLUA_METHOD TvbRange_le_ipv4(lua_State* L) { *ip_addr = tvb_get_ipv4(tvbr->tvb->ws_tvb,tvbr->offset); *((guint32 *)ip_addr) = GUINT32_SWAP_LE_BE(*((guint32 *)ip_addr)); - SET_ADDRESS(addr, AT_IPv4, 4, ip_addr); + set_address(addr, AT_IPv4, 4, ip_addr); pushAddress(L,addr); WSLUA_RETURN(1); /* The IPv4 `Address` object. */ @@ -826,7 +826,7 @@ WSLUA_METHOD TvbRange_ether(lua_State* L) { buff = (guint8 *)tvb_memdup(NULL,tvbr->tvb->ws_tvb,tvbr->offset,tvbr->len); - SET_ADDRESS(addr, AT_ETHER, 6, buff); + set_address(addr, AT_ETHER, 6, buff); pushAddress(L,addr); WSLUA_RETURN(1); /* The Ethernet `Address` object. */ |