diff options
| -rw-r--r-- | epan/addr_resolv.c | 26 | ||||
| -rw-r--r-- | epan/addr_resolv.h | 10 |
2 files changed, 18 insertions, 18 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 450caaeeed..648d6274dc 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -770,10 +770,10 @@ fill_dummy_ip4(const guint addr, hashipv4_t* volatile tp) { subnet_entry_t subnet_entry; - if ((tp->flags & DUMMY_ADDRESS_ENTRY) == DUMMY_ADDRESS_ENTRY) + if (tp->flags & DUMMY_ADDRESS_ENTRY) return; /* already done */ - tp->flags = tp->flags | DUMMY_ADDRESS_ENTRY; /* Overwrite if we get async DNS reply */ + tp->flags |= DUMMY_ADDRESS_ENTRY; /* Overwrite if we get async DNS reply */ /* Do we have a subnet for this address? */ subnet_entry = subnet_lookup(addr); @@ -877,7 +877,7 @@ host_lookup(const guint addr, gboolean *found) if ((tp->flags & DUMMY_AND_RESOLVE_FLGS) == DUMMY_ADDRESS_ENTRY) { goto try_resolv; } - if ((tp->flags & DUMMY_ADDRESS_ENTRY) == DUMMY_ADDRESS_ENTRY) { + if (tp->flags & DUMMY_ADDRESS_ENTRY) { *found = FALSE; } return tp; @@ -885,7 +885,7 @@ host_lookup(const guint addr, gboolean *found) try_resolv: if (gbl_resolv_flags.network_name && gbl_resolv_flags.use_external_net_name_resolver) { - tp->flags = tp->flags|TRIED_RESOLVE_ADDRESS; + tp->flags |= TRIED_RESOLVE_ADDRESS; #ifdef ASYNC_DNS if (gbl_resolv_flags.concurrent_dns && @@ -984,7 +984,7 @@ host_lookup6(const struct e_in6_addr *addr, gboolean *found) if ((tp->flags & DUMMY_AND_RESOLVE_FLGS) == DUMMY_ADDRESS_ENTRY) { goto try_resolv; } - if ((tp->flags & DUMMY_ADDRESS_ENTRY) == DUMMY_ADDRESS_ENTRY) { + if (tp->flags & DUMMY_ADDRESS_ENTRY) { *found = FALSE; } return tp; @@ -993,7 +993,7 @@ host_lookup6(const struct e_in6_addr *addr, gboolean *found) try_resolv: if (gbl_resolv_flags.network_name && gbl_resolv_flags.use_external_net_name_resolver) { - tp->flags = tp->flags|TRIED_RESOLVE_ADDRESS; + tp->flags |= TRIED_RESOLVE_ADDRESS; #ifdef INET6 #ifdef HAVE_C_ARES if ((gbl_resolv_flags.concurrent_dns) && @@ -1010,7 +1010,7 @@ try_resolv: if ((tp->flags & DUMMY_ADDRESS_ENTRY) == 0) { g_strlcpy(tp->name, tp->ip6, MAXNAMELEN); ip6_to_str_buf(addr, tp->name); - tp->flags = tp->flags | DUMMY_ADDRESS_ENTRY; + tp->flags |= DUMMY_ADDRESS_ENTRY; } return tp; } @@ -1037,7 +1037,7 @@ try_resolv: /* unknown host or DNS timeout */ if ((tp->flags & DUMMY_ADDRESS_ENTRY) == 0) { - tp->flags = tp->flags | DUMMY_ADDRESS_ENTRY; + tp->flags |= DUMMY_ADDRESS_ENTRY; g_strlcpy(tp->name, tp->ip6, MAXNAMELEN); } *found = FALSE; @@ -2352,7 +2352,7 @@ subnet_entry_set(guint32 subnet_addr, const guint32 mask_length, const gchar* na tp->next = NULL; tp->addr = subnet_addr; /* Clear DUMMY_ADDRESS_ENTRY */ - tp->flags = tp->flags & 0xfe; /*Never used again...*/ + tp->flags &= ~DUMMY_ADDRESS_ENTRY; /*Never used again...*/ g_strlcpy(tp->name, name, MAXNAMELEN); /* This is longer than subnet names can actually be */ have_subnet_entry = TRUE; } @@ -2651,7 +2651,7 @@ get_hostname(const guint addr) if (!gbl_resolv_flags.network_name) return tp->ip; - tp->flags = tp->flags | RESOLVED_ADDRESS_USED; + tp->flags |= RESOLVED_ADDRESS_USED; return tp->name; } @@ -2671,7 +2671,7 @@ get_hostname6(const struct e_in6_addr *addr) if (!gbl_resolv_flags.network_name) return tp->ip6; - tp->flags = tp->flags | RESOLVED_ADDRESS_USED; + tp->flags |= RESOLVED_ADDRESS_USED; return tp->name; } @@ -2700,7 +2700,7 @@ add_ipv4_name(const guint addr, const gchar *name) g_strlcpy(tp->name, name, MAXNAMELEN); new_resolved_objects = TRUE; } - tp->flags = tp->flags | TRIED_RESOLVE_ADDRESS; + tp->flags |= TRIED_RESOLVE_ADDRESS; } /* add_ipv4_name */ @@ -2731,7 +2731,7 @@ add_ipv6_name(const struct e_in6_addr *addrp, const gchar *name) g_strlcpy(tp->name, name, MAXNAMELEN); new_resolved_objects = TRUE; } - tp->flags = tp->flags | TRIED_RESOLVE_ADDRESS; + tp->flags |= TRIED_RESOLVE_ADDRESS; } /* add_ipv6_name */ diff --git a/epan/addr_resolv.h b/epan/addr_resolv.h index 10f5cd6a94..b3d1f70297 100644 --- a/epan/addr_resolv.h +++ b/epan/addr_resolv.h @@ -82,12 +82,12 @@ typedef struct serv_port { /* * */ -#define DUMMY_ADDRESS_ENTRY 1<<0 -#define TRIED_RESOLVE_ADDRESS 1<<1 -#define RESOLVED_ADDRESS_USED 1<<2 +#define DUMMY_ADDRESS_ENTRY (1U<<0) +#define TRIED_RESOLVE_ADDRESS (1U<<1) +#define RESOLVED_ADDRESS_USED (1U<<2) -#define DUMMY_AND_RESOLVE_FLGS 3 -#define USED_AND_RESOLVED_MASK (1+4) +#define DUMMY_AND_RESOLVE_FLGS (DUMMY_ADDRESS_ENTRY | TRIED_RESOLVE_ADDRESS) +#define USED_AND_RESOLVED_MASK (DUMMY_ADDRESS_ENTRY | RESOLVED_ADDRESS_USED) typedef struct hashipv4 { guint addr; guint8 flags; /* B0 dummy_entry, B1 resolve, B2 If the address is used in the trace */ |