From a2cdf632045d60b26f7aff470dedb56c1f9b938d Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Sun, 24 Feb 2013 13:51:56 +0100 Subject: [PATCH] core: use GResolver for reverse resolution Remove the HostnameThread stuff from nm-policy-hostname and just use GResolver instead. Move the one remaining nm-policy-hostname function into nm-policy. --- src/Makefile.am | 2 - src/nm-policy-hostname.c | 264 --------------------------------------- src/nm-policy-hostname.h | 51 -------- src/nm-policy.c | 169 +++++++++++++++---------- 4 files changed, 101 insertions(+), 385 deletions(-) delete mode 100644 src/nm-policy-hostname.c delete mode 100644 src/nm-policy-hostname.h diff --git a/src/Makefile.am b/src/Makefile.am index 0639e2937..937e0f98e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -168,8 +168,6 @@ NetworkManager_SOURCES = \ nm-policy.h \ nm-policy-hosts.c \ nm-policy-hosts.h \ - nm-policy-hostname.c \ - nm-policy-hostname.h \ NetworkManagerUtils.c \ NetworkManagerUtils.h \ nm-system.c \ diff --git a/src/nm-policy-hostname.c b/src/nm-policy-hostname.c deleted file mode 100644 index 0ea161585..000000000 --- a/src/nm-policy-hostname.c +++ /dev/null @@ -1,264 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Copyright (C) 2004 - 2012 Red Hat, Inc. - * Copyright (C) 2007 - 2008 Novell, Inc. - */ - -#include -#include -#include -#include -#include - -#include - -#include "nm-logging.h" -#include "nm-policy-hostname.h" - -/************************************************************************/ - -struct HostnameThread { - GThread *thread; - -#if GLIB_CHECK_VERSION (2,31,0) - GMutex lock; -#else - GMutex *lock; -#endif - gboolean dead; - int ret; - - struct sockaddr_in addr4; - struct sockaddr_in6 addr6; - struct sockaddr *addr; - size_t addr_size; - char hostname[NI_MAXHOST + 1]; - - HostnameThreadCallback callback; - gpointer user_data; -}; - -/* - * GMutex API has changed: - * http://developer.gnome.org/glib/2.31/glib-Threads.html#GMutex - * http://developer.gnome.org/glib/2.31/glib-Deprecated-Thread-APIs.html -*/ -#if GLIB_CHECK_VERSION (2,31,0) -#define X_MUTEX_LOCK(mutex) g_mutex_lock (&(mutex)) -#define X_MUTEX_UNLOCK(mutex) g_mutex_unlock (&(mutex)) -#define X_MUTEX_INIT(mutex) g_mutex_init (&(mutex)) -#define X_MUTEX_CLEAR(mutex) g_mutex_clear (&(mutex)) -#define X_THREAD_CREATE(func,data) g_thread_try_new ("hostname-thread", func, data, NULL); -#else -#define X_MUTEX_LOCK(mutex) g_mutex_lock (mutex) -#define X_MUTEX_UNLOCK(mutex) g_mutex_unlock (mutex) -#define X_MUTEX_INIT(mutex) mutex = g_mutex_new () -#define X_MUTEX_CLEAR(mutex) g_mutex_free (mutex) -#define X_THREAD_CREATE(func,data) g_thread_create (func, data, FALSE, NULL); -#endif - -static gboolean -hostname_thread_run_cb (gpointer user_data) -{ - HostnameThread *ht = (HostnameThread *) user_data; - const char *hostname = NULL; - - if (strlen (ht->hostname) && strcmp (ht->hostname, ".")) - hostname = ht->hostname; - - nm_log_dbg (LOGD_DNS, "(%p) calling address reverse-lookup result handler", ht); - (*ht->callback) (ht, ht->ret, hostname, ht->user_data); - return FALSE; -} - -static gpointer -hostname_thread_worker (gpointer data) -{ - HostnameThread *ht = (HostnameThread *) data; - int i; - - nm_log_dbg (LOGD_DNS, "(%p) starting address reverse-lookup", ht); - - X_MUTEX_LOCK (ht->lock); - if (ht->dead) { - X_MUTEX_UNLOCK (ht->lock); - return (gpointer) NULL; - } - X_MUTEX_UNLOCK (ht->lock); - - ht->ret = getnameinfo (ht->addr, ht->addr_size, ht->hostname, NI_MAXHOST, NULL, 0, NI_NAMEREQD); - if (ht->ret == 0) { - nm_log_dbg (LOGD_DNS, "(%p) address reverse-lookup returned hostname '%s'", - ht, ht->hostname); - for (i = 0; i < strlen (ht->hostname); i++) - ht->hostname[i] = g_ascii_tolower (ht->hostname[i]); - } else { - nm_log_dbg (LOGD_DNS, "(%p) address reverse-lookup failed: (%d) %s", - ht, ht->ret, gai_strerror (ht->ret)); - } - - /* Don't track the idle handler ID because by the time the g_idle_add() - * returns the ID, the handler may already have run and freed the - * HostnameThread. - */ - nm_log_dbg (LOGD_DNS, "(%p) scheduling address reverse-lookup result handler", ht); - g_idle_add (hostname_thread_run_cb, ht); - return (gpointer) TRUE; -} - -void -hostname_thread_free (HostnameThread *ht) -{ - g_return_if_fail (ht != NULL); - - nm_log_dbg (LOGD_DNS, "(%p) freeing reverse-lookup thread", ht); - - X_MUTEX_CLEAR (ht->lock); - memset (ht, 0, sizeof (HostnameThread)); - g_free (ht); -} - -HostnameThread * -hostname4_thread_new (guint32 ip4_addr, - HostnameThreadCallback callback, - gpointer user_data) -{ - HostnameThread *ht; - char buf[INET_ADDRSTRLEN + 1]; - - ht = g_malloc0 (sizeof (HostnameThread)); - g_assert (ht); - - X_MUTEX_INIT (ht->lock); - ht->callback = callback; - ht->user_data = user_data; - - ht->addr4.sin_family = AF_INET; - ht->addr4.sin_addr.s_addr = ip4_addr; - ht->addr = (struct sockaddr *) &ht->addr4; - ht->addr_size = sizeof (ht->addr4); - - ht->thread = X_THREAD_CREATE (hostname_thread_worker, ht); - if (!ht->thread) { - hostname_thread_free (ht); - return NULL; - } - - if (!inet_ntop (AF_INET, &ht->addr4.sin_addr, buf, sizeof (buf))) - strcpy (buf, "(unknown)"); - - nm_log_dbg (LOGD_DNS, "(%p) started IPv4 reverse-lookup thread for address '%s'", - ht, buf); - - return ht; -} - -HostnameThread * -hostname6_thread_new (const struct in6_addr *ip6_addr, - HostnameThreadCallback callback, - gpointer user_data) -{ - HostnameThread *ht; - char buf[INET6_ADDRSTRLEN + 1]; - - ht = g_malloc0 (sizeof (HostnameThread)); - g_assert (ht); - - X_MUTEX_INIT (ht->lock); - ht->callback = callback; - ht->user_data = user_data; - - ht->addr6.sin6_family = AF_INET6; - ht->addr6.sin6_addr = *ip6_addr; - ht->addr = (struct sockaddr *) &ht->addr6; - ht->addr_size = sizeof (ht->addr6); - - ht->thread = X_THREAD_CREATE (hostname_thread_worker, ht); - if (!ht->thread) { - hostname_thread_free (ht); - return NULL; - } - - if (!inet_ntop (AF_INET, ip6_addr, buf, sizeof (buf))) - strcpy (buf, "(unknown)"); - - nm_log_dbg (LOGD_DNS, "(%p) started IPv6 reverse-lookup thread for address '%s'", - ht, buf); - - return ht; -} - -void -hostname_thread_kill (HostnameThread *ht) -{ - g_return_if_fail (ht != NULL); - - nm_log_dbg (LOGD_DNS, "(%p) stopping reverse-lookup thread", ht); - - X_MUTEX_LOCK (ht->lock); - ht->dead = TRUE; - X_MUTEX_UNLOCK (ht->lock); -} - -gboolean -hostname_thread_is_dead (HostnameThread *ht) -{ - g_return_val_if_fail (ht != NULL, TRUE); - - return ht->dead; -} - -/************************************************************************/ - -#define FALLBACK_HOSTNAME4 "localhost.localdomain" - -gboolean -nm_policy_set_system_hostname (const char *new_hostname, const char *msg) -{ - char old_hostname[HOST_NAME_MAX + 1]; - const char *name; - int ret; - - if (new_hostname) - g_warn_if_fail (strlen (new_hostname)); - - old_hostname[HOST_NAME_MAX] = '\0'; - errno = 0; - ret = gethostname (old_hostname, HOST_NAME_MAX); - if (ret != 0) { - nm_log_warn (LOGD_DNS, "couldn't get the system hostname: (%d) %s", - errno, strerror (errno)); - } else { - /* Don't set the hostname if it isn't actually changing */ - if ( (new_hostname && !strcmp (old_hostname, new_hostname)) - || (!new_hostname && !strcmp (old_hostname, FALLBACK_HOSTNAME4))) - return FALSE; - } - - name = (new_hostname && strlen (new_hostname)) ? new_hostname : FALLBACK_HOSTNAME4; - - nm_log_info (LOGD_DNS, "Setting system hostname to '%s' (%s)", name, msg); - ret = sethostname (name, strlen (name)); - if (ret != 0) { - nm_log_warn (LOGD_DNS, "couldn't set the system hostname to '%s': (%d) %s", - name, errno, strerror (errno)); - } - - return (ret == 0); -} - diff --git a/src/nm-policy-hostname.h b/src/nm-policy-hostname.h deleted file mode 100644 index e76713f16..000000000 --- a/src/nm-policy-hostname.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Copyright (C) 2004 - 2010 Red Hat, Inc. - * Copyright (C) 2007 - 2008 Novell, Inc. - */ - -#ifndef NM_POLICY_HOSTNAME_H -#define NM_POLICY_HOSTNAME_H - -#include - -gboolean nm_policy_set_system_hostname (const char *new_hostname, const char *msg); - - -typedef struct HostnameThread HostnameThread; - -typedef void (*HostnameThreadCallback) (HostnameThread *ht, - int error, - const char *hostname, - gpointer user_data); - -HostnameThread * hostname4_thread_new (guint32 ip4_addr, - HostnameThreadCallback callback, - gpointer user_data); - -HostnameThread * hostname6_thread_new (const struct in6_addr *ip6_addr, - HostnameThreadCallback callback, - gpointer user_data); - -void hostname_thread_free (HostnameThread *ht); - -gboolean hostname_thread_is_dead (HostnameThread *ht); - -void hostname_thread_kill (HostnameThread *ht); - -#endif /* NM_POLICY_HOSTNAME_H */ diff --git a/src/nm-policy.c b/src/nm-policy.c index 38a036134..b14b35b4f 100644 --- a/src/nm-policy.c +++ b/src/nm-policy.c @@ -25,6 +25,8 @@ #include #include +#include + #include "nm-policy.h" #include "NetworkManagerUtils.h" #include "nm-wifi-ap.h" @@ -37,7 +39,6 @@ #include "nm-system.h" #include "nm-dns-manager.h" #include "nm-vpn-manager.h" -#include "nm-policy-hostname.h" #include "nm-manager-auth.h" #include "nm-firewall-manager.h" #include "nm-dispatcher.h" @@ -61,9 +62,9 @@ struct NMPolicy { NMDevice *default_device4; NMDevice *default_device6; - HostnameThread *lookup; - guint32 lookup_ipv4_addr; /* IPv4 for reverse lookup */ - struct in6_addr *lookup_ipv6_addr; /* IPv6 for reverse lookup */ + GResolver *resolver; + GInetAddress *lookup_addr; + GCancellable *lookup_cancellable; NMDnsManager *dns_manager; gulong config_changed_id; @@ -228,6 +229,43 @@ get_best_ip6_device (NMManager *manager) return best; } +#define FALLBACK_HOSTNAME4 "localhost.localdomain" + +static gboolean +set_system_hostname (const char *new_hostname, const char *msg) +{ + char old_hostname[HOST_NAME_MAX + 1]; + const char *name; + int ret; + + if (new_hostname) + g_warn_if_fail (strlen (new_hostname)); + + old_hostname[HOST_NAME_MAX] = '\0'; + errno = 0; + ret = gethostname (old_hostname, HOST_NAME_MAX); + if (ret != 0) { + nm_log_warn (LOGD_DNS, "couldn't get the system hostname: (%d) %s", + errno, strerror (errno)); + } else { + /* Don't set the hostname if it isn't actually changing */ + if ( (new_hostname && !strcmp (old_hostname, new_hostname)) + || (!new_hostname && !strcmp (old_hostname, FALLBACK_HOSTNAME4))) + return FALSE; + } + + name = (new_hostname && strlen (new_hostname)) ? new_hostname : FALLBACK_HOSTNAME4; + + nm_log_info (LOGD_DNS, "Setting system hostname to '%s' (%s)", name, msg); + ret = sethostname (name, strlen (name)); + if (ret != 0) { + nm_log_warn (LOGD_DNS, "couldn't set the system hostname to '%s': (%d) %s", + name, errno, strerror (errno)); + } + + return (ret == 0); +} + static void _set_hostname (NMPolicy *policy, const char *new_hostname, @@ -239,14 +277,11 @@ _set_hostname (NMPolicy *policy, * there was no valid hostname to start with. */ - /* Clear lookup adresses if we have a hostname, so that we didn't - * restart reverse lookup thread later. + /* Clear lookup adresses if we have a hostname, so that we don't + * restart the reverse lookup thread later. */ - if (new_hostname) { - policy->lookup_ipv4_addr = 0; - g_free (policy->lookup_ipv6_addr); - policy->lookup_ipv6_addr = NULL; - } + if (new_hostname) + g_clear_object (&policy->lookup_addr); /* Don't change the hostname or update DNS this is the first time we're * trying to change the hostname, and it's not actually changing. @@ -268,31 +303,34 @@ _set_hostname (NMPolicy *policy, nm_dns_manager_set_hostname (policy->dns_manager, policy->cur_hostname); - if (nm_policy_set_system_hostname (policy->cur_hostname, msg)) + if (set_system_hostname (policy->cur_hostname, msg)) nm_dispatcher_call (DISPATCHER_ACTION_HOSTNAME, NULL, NULL, NULL, NULL); } static void -lookup_callback (HostnameThread *thread, - int result, - const char *hostname, +lookup_callback (GObject *source, + GAsyncResult *result, gpointer user_data) { NMPolicy *policy = (NMPolicy *) user_data; - char *msg; + const char *hostname; + GError *error = NULL; - /* Update the hostname if the calling lookup thread is the in-progress one */ - if (!hostname_thread_is_dead (thread) && (thread == policy->lookup)) { - policy->lookup = NULL; - if (!hostname) { - /* Fall back to localhost.localdomain */ - msg = g_strdup_printf ("address lookup failed: %d", result); - _set_hostname (policy, NULL, msg); - g_free (msg); - } else - _set_hostname (policy, hostname, "from address lookup"); + hostname = g_resolver_lookup_by_address_finish (G_RESOLVER (source), result, &error); + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + /* Don't touch policy; it may have been freed already */ + g_error_free (error); + return; } - hostname_thread_free (thread); + + if (hostname) + _set_hostname (policy, hostname, "from address lookup"); + else { + _set_hostname (policy, NULL, error->message); + g_error_free (error); + } + + g_clear_object (&policy->lookup_cancellable); } static void @@ -303,9 +341,9 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) g_return_if_fail (policy != NULL); - if (policy->lookup) { - hostname_thread_kill (policy->lookup); - policy->lookup = NULL; + if (policy->lookup_cancellable) { + g_cancellable_cancel (policy->lookup_cancellable); + g_clear_object (&policy->lookup_cancellable); } /* Hostname precedence order: @@ -393,6 +431,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) if (best4) { NMIP4Config *ip4_config; NMIP4Address *addr4; + guint32 addrbytes; ip4_config = nm_device_get_ip4_config (best4); if ( !ip4_config @@ -406,12 +445,13 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) addr4 = nm_ip4_config_get_address (ip4_config, 0); g_assert (addr4); /* checked for > 1 address above */ - /* Start the hostname lookup thread */ - policy->lookup_ipv4_addr = nm_ip4_address_get_address (addr4); - policy->lookup = hostname4_thread_new (policy->lookup_ipv4_addr, lookup_callback, policy); - } else if (best6) { + addrbytes = nm_ip4_address_get_address (addr4); + policy->lookup_addr = g_inet_address_new_from_bytes ((guint8 *)&addrbytes, + G_SOCKET_FAMILY_IPV4); + } else { NMIP6Config *ip6_config; NMIP6Address *addr6; + const struct in6_addr *addrbytes; ip6_config = nm_device_get_ip6_config (best6); if ( !ip6_config @@ -425,16 +465,16 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) addr6 = nm_ip6_config_get_address (ip6_config, 0); g_assert (addr6); /* checked for > 1 address above */ - /* Start the hostname lookup thread */ - policy->lookup_ipv6_addr = g_malloc0 (sizeof (struct in6_addr)); - memcpy (policy->lookup_ipv6_addr, nm_ip6_address_get_address (addr6), sizeof (struct in6_addr)); - policy->lookup = hostname6_thread_new (policy->lookup_ipv6_addr, lookup_callback, policy); + addrbytes = nm_ip6_address_get_address (addr6); + policy->lookup_addr = g_inet_address_new_from_bytes ((guint8 *)&addrbytes, + G_SOCKET_FAMILY_IPV6); } - if (!policy->lookup) { - /* Fall back to 'localhost.localdomain' */ - _set_hostname (policy, NULL, "error starting hostname thread"); - } + policy->lookup_cancellable = g_cancellable_new (); + g_resolver_lookup_by_address_async (policy->resolver, + policy->lookup_addr, + policy->lookup_cancellable, + lookup_callback, policy); } static void @@ -1805,29 +1845,21 @@ dns_config_changed (NMDnsManager *dns_manager, gpointer user_data) */ /* Stop a lookup thread if any. */ - if (policy->lookup) { - hostname_thread_kill (policy->lookup); - policy->lookup = NULL; + if (policy->lookup_cancellable) { + g_cancellable_cancel (policy->lookup_cancellable); + g_clear_object (&policy->lookup_cancellable); } /* Re-start the hostname lookup thread if we don't have hostname yet. */ - if (policy->lookup_ipv4_addr) { - char buf[INET_ADDRSTRLEN]; - struct in_addr addr = { .s_addr = policy->lookup_ipv4_addr }; - - if (!inet_ntop (AF_INET, &addr, buf, sizeof (buf))) - strcpy (buf, "(unknown)"); - nm_log_dbg (LOGD_DNS, "restarting IPv4 reverse-lookup thread for address %s'", buf); + if (policy->lookup_addr) { + nm_log_dbg (LOGD_DNS, "restarting reverse-lookup thread for address %s'", + g_inet_address_to_string (policy->lookup_addr)); - policy->lookup = hostname4_thread_new (policy->lookup_ipv4_addr, lookup_callback, policy); - } else if (policy->lookup_ipv6_addr) { - char buf[INET6_ADDRSTRLEN]; - - if (!inet_ntop (AF_INET6, policy->lookup_ipv6_addr, buf, sizeof (buf))) - strcpy (buf, "(unknown)"); - nm_log_dbg (LOGD_DNS, "restarting IPv6 reverse-lookup thread for address %s'", buf); - - policy->lookup = hostname6_thread_new (policy->lookup_ipv6_addr, lookup_callback, policy); + policy->lookup_cancellable = g_cancellable_new (); + g_resolver_lookup_by_address_async (policy->resolver, + policy->lookup_addr, + policy->lookup_cancellable, + lookup_callback, policy); } } @@ -1961,6 +1993,8 @@ nm_policy_new (NMManager *manager, NMSettings *settings) policy->config_changed_id = g_signal_connect (policy->dns_manager, "config-changed", G_CALLBACK (dns_config_changed), policy); + policy->resolver = g_resolver_get_default (); + _connect_manager_signal (policy, "state-changed", global_state_changed); _connect_manager_signal (policy, "notify::" NM_MANAGER_HOSTNAME, hostname_changed); _connect_manager_signal (policy, "notify::" NM_MANAGER_SLEEPING, sleeping_changed); @@ -1992,14 +2026,13 @@ nm_policy_destroy (NMPolicy *policy) g_return_if_fail (policy != NULL); - /* Tell any existing hostname lookup thread to die, it'll get cleaned up - * by the lookup thread callback. - */ - if (policy->lookup) { - hostname_thread_kill (policy->lookup); - policy->lookup = NULL; + /* Tell any existing hostname lookup thread to die. */ + if (policy->lookup_cancellable) { + g_cancellable_cancel (policy->lookup_cancellable); + g_clear_object (&policy->lookup_cancellable); } - g_free (policy->lookup_ipv6_addr); + g_clear_object (&policy->lookup_addr); + g_clear_object (&policy->resolver); g_slist_foreach (policy->pending_activation_checks, (GFunc) activate_data_free, NULL); g_slist_free (policy->pending_activation_checks);