diff options
| author | Anthony Coddington <anthony.coddington@endace.com> | 2017-06-09 17:16:27 +1200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-06-13 21:08:16 +0000 |
| commit | b0af8a5631e5cad1e8977be604472699814ec055 (patch) | |
| tree | 8c7d5cf29da284f46e8db42937fe8049241fac16 | |
| parent | 5be6088d6b9fa0596ca5953d41d78f22f3f3f13b (diff) | |
| download | wireshark-b0af8a5631e5cad1e8977be604472699814ec055.tar.gz | |
Fix automatic name resolution not saved to NRB
Clear DUMMY_ADDRESS_ENTRY when add_ipv4_name/add_ipv6_name. This flag is checked in ipv4_hash_table_resolved_to_list().
TODO: clean up these flags as they are confusing and DUMMY appears somewhat redundant.
Change-Id: I81d40cc778cbe5c36314631d3fa0997cee409368
Bug: 13798
Reviewed-on: https://code.wireshark.org/review/22109
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit f3267f17a3fc3c8ab138940653f2e968c5d27378)
Reviewed-on: https://code.wireshark.org/review/22114
| -rw-r--r-- | epan/addr_resolv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index d55e857520..7cf134c6c2 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -2711,6 +2711,8 @@ add_ipv4_name(const guint addr, const gchar *name) new_resolved_objects = TRUE; } tp->flags |= TRIED_RESOLVE_ADDRESS|NAME_RESOLVED; + /* Clear DUMMY_ADDRESS_ENTRY */ + tp->flags &= ~DUMMY_ADDRESS_ENTRY; } /* add_ipv4_name */ /* -------------------------- */ @@ -2741,6 +2743,8 @@ add_ipv6_name(const struct e_in6_addr *addrp, const gchar *name) new_resolved_objects = TRUE; } tp->flags |= TRIED_RESOLVE_ADDRESS|NAME_RESOLVED; + /* Clear DUMMY_ADDRESS_ENTRY */ + tp->flags &= ~DUMMY_ADDRESS_ENTRY; } /* add_ipv6_name */ static void |