colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
https://mail.gnome.org/archives/networkmanager-list/2016-November/msg00095.html
This commit is contained in:
Beniamino Galvani
2016-11-30 10:32:15 +01:00
parent 48402cd526 6546b70c98
commit 12e6314a19
1 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/dns/nm-dns-dnsmasq.c
View File

@@ -367,25 +367,6 @@ add_ip_config_data (NMDnsDnsmasq *self, GVariantBuilder *servers, const NMDnsIPC
g_return_val_if_reached (FALSE); g_return_val_if_reached (FALSE);
} }
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 static void
dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data) dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
{ {
@@ -403,16 +384,8 @@ dnsmasq_update_done (GDBusProxy *proxy, GAsyncResult *res, gpointer user_data)
if (!response) if (!response)
_LOGW ("dnsmasq update failed: %s", error->message); _LOGW ("dnsmasq update failed: %s", error->message);
else { else
g_dbus_proxy_call (priv->dnsmasq, _LOGD ("dnsmasq update successful");
"ClearCache",
NULL,
G_DBUS_CALL_FLAGS_NONE,
-1,
priv->update_cancellable,
(GAsyncReadyCallback) dnsmasq_clear_cache_done,
self);
}
} }
static void static void
@@ -537,6 +510,7 @@ start_dnsmasq (NMDnsDnsmasq *self)
argv[idx++] = "--pid-file=" PIDFILE; argv[idx++] = "--pid-file=" PIDFILE;
argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */ argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
argv[idx++] = "--cache-size=400"; 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++] = "--conf-file=/dev/null"; /* avoid loading /etc/dnsmasq.conf */
argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */ argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
argv[idx++] = "--enable-dbus=" DNSMASQ_DBUS_SERVICE; argv[idx++] = "--enable-dbus=" DNSMASQ_DBUS_SERVICE;