resolver: Fixed cleanup of Resolver timer

When connman is restarted, DNS servers are removed and added again
with function __connman_resolver_redo_servers(). While removing a
DNS entry, one should also remove the resolver timer registered for it.
Not doing so, causes the timeout handler resolver_expire_cb to fire
without being explicitly set.

diff --git a/src/resolver.c b/src/resolver.c
index 58af2f7..421b12f 100644 (file)
--- a/src/resolver.c
+++ b/src/resolver.c
@@ -493,6 +493,13 @@ int __connman_resolver_redo_servers(const char *interface)
                 */
                __connman_dnsproxy_remove(entry->interface, entry->domain,
                                        entry->server);
+               /*
+                * Remove also the resolver timer for the old server entry.
+                * A new timer will be set for the new server entry
+                * when the next Router Advertisement message arrives
+                * with RDNSS/DNSSL settings.
+                */
+               g_source_remove(entry->timeout);
 
                __connman_dnsproxy_append(entry->interface, entry->domain,
                                        entry->server);