aboutsummaryrefslogtreecommitdiffstats
path: root/epan/addr_resolv.h
diff options
context:
space:
mode:
authorAnthony Coddington <anthony.coddington@endace.com>2017-06-09 20:03:38 +1200
committerMichael Mann <mmann78@netscape.net>2017-06-19 14:33:09 +0000
commit193cef0bcbcab25b95b4f124920d004ceaa7ae8a (patch)
tree6bcaa542e1a1bb57a6a9306775541718949a9f1a /epan/addr_resolv.h
parent6ecd6b816406597783ec662f00233f3a018553f7 (diff)
Attempt to clean up addr_resolv flags by removing DUMMY_ADDRESS_ENTRY
Replace with easier to understand and already present NAME_RESOLVED given dummy address is always filled. Change-Id: If8464f89e88722aac70689749fe0d4a31c119db2 Bug: 13798 Reviewed-on: https://code.wireshark.org/review/22110 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/addr_resolv.h')
-rw-r--r--epan/addr_resolv.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h
index 88955ebc72..20445379b4 100644
--- a/epan/addr_resolv.h
+++ b/epan/addr_resolv.h
@@ -88,13 +88,12 @@ typedef struct serv_port {
/*
* Flags for various IPv4/IPv6 hash table entries.
*/
-#define DUMMY_ADDRESS_ENTRY (1U<<0) /* XXX - what does this bit *really* mean? */
-#define TRIED_RESOLVE_ADDRESS (1U<<1) /* XXX - what does this bit *really* mean? */
+#define TRIED_RESOLVE_ADDRESS (1U<<0) /* XXX - what does this bit *really* mean? */
+#define NAME_RESOLVED (1U<<1) /* the name field contains a host name, not a printable address */
#define RESOLVED_ADDRESS_USED (1U<<2) /* a get_hostname* call returned the host name */
-#define NAME_RESOLVED (1U<<3) /* the name field contains a host name, not a printable address */
-#define DUMMY_AND_RESOLVE_FLGS (DUMMY_ADDRESS_ENTRY | TRIED_RESOLVE_ADDRESS)
-#define USED_AND_RESOLVED_MASK (DUMMY_ADDRESS_ENTRY | RESOLVED_ADDRESS_USED)
+#define TRIED_OR_RESOLVED_MASK (TRIED_RESOLVE_ADDRESS | NAME_RESOLVED)
+#define USED_AND_RESOLVED_MASK (NAME_RESOLVED | RESOLVED_ADDRESS_USED)
/*
* Flag controlling what names to resolve.