dns: merge branch 'bg/dnsmasq-clear-cache-option'

https://mail.gnome.org/archives/networkmanager-list/2016-November/msg00095.html

1 files changed, 3 insertions, 29 deletions

diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c
index 9ef7972fee..5223638e68 100644
--- a/src/dns/nm-dns-dnsmasq.c
+++ b/src/dns/nm-dns-dnsmasq.c
@@ -368,25 +368,6 @@ add_ip_config_data (NMDnsDnsmasq *self, GVariantBuilder *servers, const NMDnsIPC
 }
 
 static void
-dnsmasq_clear_cache_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
-{
-	NMDnsDnsmasq *self;
-	gs_free_error GError *error = NULL;
-	gs_unref_variant GVariant *response = NULL;
-
-	response = g_dbus_proxy_call_finish (proxy, res, &error);
-	if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-		return;
-
-	self = NM_DNS_DNSMASQ (user_data);
-
-	if (!response)
-		_LOGW ("dnsmasq cache clear failed: %s", error->message);
-	else
-		_LOGD ("dnsmasq update successful, cache cleared");
-}
-
-static void
 dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
 {
 	NMDnsDnsmasq *self;
@@ -403,16 +384,8 @@ dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
 
 	if (!response)
 		_LOGW ("dnsmasq update failed: %s", error->message);
-	else {
-		g_dbus_proxy_call (priv->dnsmasq,
-		                   "ClearCache",
-		                   NULL,
-		                   G_DBUS_CALL_FLAGS_NONE,
-		                   -1,
-		                   priv->update_cancellable,
-		                   (GAsyncReadyCallback) dnsmasq_clear_cache_done,
-		                   self);
-	}
+	else
+		_LOGD ("dnsmasq update successful");
 }
 
 static void
@@ -537,6 +510,7 @@ start_dnsmasq (NMDnsDnsmasq *self)
 	argv[idx++] = "--pid-file=" PIDFILE;
 	argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
 	argv[idx++] = "--cache-size=400";
+	argv[idx++] = "--clear-on-reload"; /* clear cache when dns server changes */
 	argv[idx++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */
 	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
 	argv[idx++] = "--enable-dbus=" DNSMASQ_DBUS_SERVICE;