{
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);
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;
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 &&
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;
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) &&
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;
}
/* 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;
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;
}
if (!gbl_resolv_flags.network_name)
return tp->ip;
- tp->flags = tp->flags | RESOLVED_ADDRESS_USED;
+ tp->flags |= RESOLVED_ADDRESS_USED;
return tp->name;
}
if (!gbl_resolv_flags.network_name)
return tp->ip6;
- tp->flags = tp->flags | RESOLVED_ADDRESS_USED;
+ tp->flags |= RESOLVED_ADDRESS_USED;
return tp->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 */
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 */
/*
*
*/
-#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 */