aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2006-02-09 09:18:15 +0000
committerJörg Mayer <jmayer@loplof.de>2006-02-09 09:18:15 +0000
commit118e05db0bb080813a919dadcf2b1de9aa711fb8 (patch)
tree80a79cb7f0093b90639d6c0f269f333fd9fb8f94
parent7b5cf640160b6b9770cb5c70c6375d32be9124dc (diff)
Ricardo Muggli:
The attached patch will fix ethereal so it will only do network address resolution when network address resolution is enabled. Even when the RESOLV_NETWORK flag was set ethereal would try to resolve addresses in the add_ether_byip function. svn path=/trunk/; revision=17227
-rw-r--r--epan/addr_resolv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index aa144cca8e..8ccb415aa6 100644
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -2056,7 +2056,7 @@ extern void add_ether_byip(guint ip, const guint8 *eth)
/* first check that IP address can be resolved */
- if ((host = host_name_lookup(ip, &found)) == NULL)
+ if (!(g_resolv_flags & RESOLV_NETWORK) || ((host = host_name_lookup(ip, &found)) == NULL))
return;
/* ok, we can add this entry in the ethers hashtable */