From 26ebfef4bb0e39ea8f0114ec20803bc9554465f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sat, 12 Sep 2015 06:35:22 +0100 Subject: Don't display duplicate addresses without name resolution enabled Change-Id: Ieb88e2632401cbf50c4ae51768a64df64d54a45d Reviewed-on: https://code.wireshark.org/review/10497 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/address_types.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'epan/address_types.c') diff --git a/epan/address_types.c b/epan/address_types.c index 5601ae65ed..5e668128c3 100644 --- a/epan/address_types.c +++ b/epan/address_types.c @@ -1048,8 +1048,11 @@ gchar* address_with_resolution_to_str(wmem_allocator_t *scope, const address *ad return wmem_strdup(scope, ""); /* No name resolution support, just return address string */ - if (at->addr_name_res_str == NULL) + if ((at->addr_name_res_str == NULL) || + (ADDR_RESOLV_MACADDR(addr) && !gbl_resolv_flags.mac_name) || + (ADDR_RESOLV_NETADDR(addr) && !gbl_resolv_flags.network_name)) { return address_to_str(scope, addr); + } len = at->addr_name_res_len() + at->addr_str_len(addr) + 4; /* For format of %s (%s) */ -- cgit v1.2.3