diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/address_to_str.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-bacapp.c | 16 | ||||
| -rw-r--r-- | epan/dissectors/packet-sua.c | 4 | ||||
| -rw-r--r-- | epan/proto.c | 2 | ||||
| -rw-r--r-- | epan/to_str.h | 2 |
5 files changed, 12 insertions, 14 deletions
diff --git a/epan/address_to_str.c b/epan/address_to_str.c index 1c444568e6..5fefbcd80c 100644 --- a/epan/address_to_str.c +++ b/epan/address_to_str.c @@ -489,7 +489,7 @@ get_ax25_name(const guint8 *ad) addr.len = 7; addr.data = ad; - return address_to_str( &addr ); + return ep_address_to_str( &addr ); } /*XXX FIXME the code below may be called very very frequently in the future. diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c index 662d4158a4..6d3db6ebe4 100644 --- a/epan/dissectors/packet-bacapp.c +++ b/epan/dissectors/packet-bacapp.c @@ -4854,8 +4854,8 @@ bacapp_stats_tree_packet(stats_tree* st, packet_info* pinfo, epan_dissect_t* edt gchar *srcstr; const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p; - srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", address_to_str(&pinfo->src), NULL); - dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", address_to_str(&pinfo->dst), NULL); + srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", ep_address_to_str(&pinfo->src), NULL); + dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", ep_address_to_str(&pinfo->dst), NULL); tick_stat_node(st, st_str_packets_by_ip, 0, TRUE); packets_for_this_dst = tick_stat_node(st, st_str_packets_by_ip_dst, st_node_packets_by_ip, TRUE); @@ -4900,8 +4900,8 @@ bacapp_stats_tree_service(stats_tree* st, packet_info* pinfo, epan_dissect_t* ed const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p; - srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", address_to_str(&pinfo->src), NULL); - dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", address_to_str(&pinfo->dst), NULL); + srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", ep_address_to_str(&pinfo->src), NULL); + dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", ep_address_to_str(&pinfo->dst), NULL); tick_stat_node(st, st_str_packets_by_service, 0, TRUE); if (binfo->service_type) { @@ -4938,8 +4938,8 @@ bacapp_stats_tree_objectid(stats_tree* st, packet_info* pinfo, epan_dissect_t* e gchar *srcstr; const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p; - srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", address_to_str(&pinfo->src), NULL); - dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", address_to_str(&pinfo->dst), NULL); + srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", ep_address_to_str(&pinfo->src), NULL); + dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", ep_address_to_str(&pinfo->dst), NULL); tick_stat_node(st, st_str_packets_by_objectid, 0, TRUE); if (binfo->object_ident) { @@ -4976,8 +4976,8 @@ bacapp_stats_tree_instanceid(stats_tree* st, packet_info* pinfo, epan_dissect_t* gchar *srcstr; const bacapp_info_value_t *binfo = (const bacapp_info_value_t *)p; - srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", address_to_str(&pinfo->src), NULL); - dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", address_to_str(&pinfo->dst), NULL); + srcstr = wmem_strconcat(wmem_packet_scope(), "Src: ", ep_address_to_str(&pinfo->src), NULL); + dststr = wmem_strconcat(wmem_packet_scope(), "Dst: ", ep_address_to_str(&pinfo->dst), NULL); tick_stat_node(st, st_str_packets_by_instanceid, 0, TRUE); if (binfo->object_ident) { diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 0ca45a16da..9645d542d8 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -433,8 +433,8 @@ sua_assoc(packet_info* pinfo, address* opc, address* dpc, guint src_rn, guint ds return &no_sua_assoc; } - opck = opc->type == AT_SS7PC ? mtp3_pc_hash((mtp3_addr_pc_t *)opc->data) : g_str_hash(address_to_str(opc)); - dpck = dpc->type == AT_SS7PC ? mtp3_pc_hash((mtp3_addr_pc_t *)dpc->data) : g_str_hash(address_to_str(dpc)); + opck = opc->type == AT_SS7PC ? mtp3_pc_hash((mtp3_addr_pc_t *)opc->data) : g_str_hash(ep_address_to_str(opc)); + dpck = dpc->type == AT_SS7PC ? mtp3_pc_hash((mtp3_addr_pc_t *)dpc->data) : g_str_hash(ep_address_to_str(dpc)); switch (message_type) { case MESSAGE_TYPE_CORE: diff --git a/epan/proto.c b/epan/proto.c index dfec1e5cb2..f5c1f4205e 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -5355,7 +5355,7 @@ proto_item_fill_label(field_info *fi, gchar *label_str) g_snprintf(label_str, ITEM_LABEL_LENGTH, "%s: %s", hfinfo->name, - address_to_str( &addr )); + ep_address_to_str( &addr )); break; case FT_ETHER: diff --git a/epan/to_str.h b/epan/to_str.h index 6790502c97..7e41394337 100644 --- a/epan/to_str.h +++ b/epan/to_str.h @@ -50,8 +50,6 @@ extern "C" { struct e_in6_addr; -/* !!Deprecated!! - use ep_address_to_str() */ -#define address_to_str ep_address_to_str WS_DLL_PUBLIC gchar* ep_address_to_str(const address *); extern gchar* se_address_to_str(const address *); WS_DLL_PUBLIC void address_to_str_buf(const address *addr, gchar *buf, int buf_len); |