/* GIO - GLib Input, Output and Streaming Library
*
* Copyright (C) 2008 Red Hat, Inc.
+ * Copyright (C) 2018 Igalia S.L.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gnetworkingprivate.h"
#include "gasyncresult.h"
#include "ginetaddress.h"
-#include "ginetsocketaddress.h"
-#include "gsimpleasyncresult.h"
#include "gtask.h"
#include "gsrvtarget.h"
#include "gthreadedresolver.h"
+#include "gioerror.h"
+#include "gcancellable.h"
#ifdef G_OS_UNIX
#include <sys/stat.h>
* #GNetworkAddress and #GNetworkService provide wrappers around
* #GResolver functionality that also implement #GSocketConnectable,
* making it easy to connect to a remote host/service.
+ *
+ * The default resolver (see g_resolver_get_default()) has a timeout of 30s set
+ * on it since GLib 2.78. Earlier versions of GLib did not support resolver
+ * timeouts.
*/
+typedef enum {
+ PROP_TIMEOUT = 1,
+} GResolverProperty;
+
+static GParamSpec *props[PROP_TIMEOUT + 1] = { NULL, };
+
enum {
RELOAD,
LAST_SIGNAL
static guint signals[LAST_SIGNAL] = { 0 };
struct _GResolverPrivate {
+ unsigned timeout_ms;
+
#ifdef G_OS_UNIX
- time_t resolv_conf_timestamp;
-#else
- int dummy;
+ GMutex mutex;
+ time_t resolv_conf_timestamp; /* protected by @mutex */
#endif
};
*
* The object that handles DNS resolution. Use g_resolver_get_default()
* to get the default resolver.
+ *
+ * This is an abstract type; subclasses of it implement different resolvers for
+ * different platforms and situations.
*/
-G_DEFINE_TYPE (GResolver, g_resolver, G_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GResolver, g_resolver, G_TYPE_OBJECT,
+ G_ADD_PRIVATE (GResolver)
+ g_networking_init ();)
static GList *
srv_records_to_targets (GList *records)
}
static void
+g_resolver_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GResolver *self = G_RESOLVER (object);
+
+ switch ((GResolverProperty) prop_id)
+ {
+ case PROP_TIMEOUT:
+ g_value_set_uint (value, g_resolver_get_timeout (self));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+}
+
+static void
+g_resolver_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GResolver *self = G_RESOLVER (object);
+
+ switch ((GResolverProperty) prop_id)
+ {
+ case PROP_TIMEOUT:
+ g_resolver_set_timeout (self, g_value_get_uint (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ }
+}
+
+static void
+g_resolver_finalize (GObject *object)
+{
+#ifdef G_OS_UNIX
+ GResolver *resolver = G_RESOLVER (object);
+
+ g_mutex_clear (&resolver->priv->mutex);
+#endif
+
+ G_OBJECT_CLASS (g_resolver_parent_class)->finalize (object);
+}
+
+static void
g_resolver_class_init (GResolverClass *resolver_class)
{
+ GObjectClass *object_class = G_OBJECT_CLASS (resolver_class);
+
+ object_class->get_property = g_resolver_get_property;
+ object_class->set_property = g_resolver_set_property;
+ object_class->finalize = g_resolver_finalize;
+
/* Automatically pass these over to the lookup_records methods */
resolver_class->lookup_service = g_resolver_real_lookup_service;
resolver_class->lookup_service_async = g_resolver_real_lookup_service_async;
resolver_class->lookup_service_finish = g_resolver_real_lookup_service_finish;
- g_type_class_add_private (resolver_class, sizeof (GResolverPrivate));
-
- /* Make sure _g_networking_init() has been called */
- g_type_ensure (G_TYPE_INET_ADDRESS);
-
- /* Initialize _g_resolver_addrinfo_hints */
-#ifdef AI_ADDRCONFIG
- _g_resolver_addrinfo_hints.ai_flags |= AI_ADDRCONFIG;
-#endif
- /* These two don't actually matter, they just get copied into the
- * returned addrinfo structures (and then we ignore them). But if
- * we leave them unset, we'll get back duplicate answers.
+ /**
+ * GResolver:timeout:
+ *
+ * The timeout applied to all resolver lookups, in milliseconds.
+ *
+ * This may be changed through the lifetime of the #GResolver. The new value
+ * will apply to any lookups started after the change, but not to any
+ * already-ongoing lookups.
+ *
+ * If this is `0`, no timeout is applied to lookups.
+ *
+ * No timeout was applied to lookups before this property was added in
+ * GLib 2.78.
+ *
+ * Since: 2.78
*/
- _g_resolver_addrinfo_hints.ai_socktype = SOCK_STREAM;
- _g_resolver_addrinfo_hints.ai_protocol = IPPROTO_TCP;
+ props[PROP_TIMEOUT] =
+ g_param_spec_uint ("timeout",
+ P_("Timeout"),
+ P_("Timeout (ms) applied to all resolver lookups"),
+ 0, G_MAXUINT, 0,
+ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
+
+ g_object_class_install_properties (object_class, G_N_ELEMENTS (props), props);
/**
* GResolver::reload:
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GResolverClass, reload),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
}
struct stat st;
#endif
- resolver->priv = G_TYPE_INSTANCE_GET_PRIVATE (resolver, G_TYPE_RESOLVER, GResolverPrivate);
+ resolver->priv = g_resolver_get_instance_private (resolver);
#ifdef G_OS_UNIX
if (stat (_PATH_RESCONF, &st) == 0)
resolver->priv->resolv_conf_timestamp = st.st_mtime;
+
+ g_mutex_init (&resolver->priv->mutex);
#endif
}
+G_LOCK_DEFINE_STATIC (default_resolver);
static GResolver *default_resolver;
/**
* with it. #GResolver may use its reference count as a hint about how
* many threads it should allocate for concurrent DNS resolutions.
*
- * Return value: (transfer full): the default #GResolver.
+ * Returns: (transfer full): the default #GResolver.
*
* Since: 2.22
*/
GResolver *
g_resolver_get_default (void)
{
+ GResolver *ret;
+
+ G_LOCK (default_resolver);
if (!default_resolver)
- default_resolver = g_object_new (G_TYPE_THREADED_RESOLVER, NULL);
+ default_resolver = g_object_new (G_TYPE_THREADED_RESOLVER,
+ "timeout", 30000,
+ NULL);
+ ret = g_object_ref (default_resolver);
+ G_UNLOCK (default_resolver);
- return g_object_ref (default_resolver);
+ return ret;
}
/**
void
g_resolver_set_default (GResolver *resolver)
{
+ G_LOCK (default_resolver);
if (default_resolver)
g_object_unref (default_resolver);
default_resolver = g_object_ref (resolver);
+ G_UNLOCK (default_resolver);
}
-
static void
-g_resolver_maybe_reload (GResolver *resolver)
+maybe_emit_reload (GResolver *resolver)
{
#ifdef G_OS_UNIX
struct stat st;
if (stat (_PATH_RESCONF, &st) == 0)
{
+ g_mutex_lock (&resolver->priv->mutex);
if (st.st_mtime != resolver->priv->resolv_conf_timestamp)
{
resolver->priv->resolv_conf_timestamp = st.st_mtime;
-#ifndef __BIONIC__
- res_init ();
-#endif
+ g_mutex_unlock (&resolver->priv->mutex);
g_signal_emit (resolver, signals[RELOAD], 0);
}
+ else
+ g_mutex_unlock (&resolver->priv->mutex);
}
#endif
}
}
}
+static gboolean
+hostname_is_localhost (const char *hostname)
+{
+ size_t len = strlen (hostname);
+ const char *p;
+
+ /* Match "localhost", "localhost.", "*.localhost" and "*.localhost." */
+ if (len < strlen ("localhost"))
+ return FALSE;
+
+ if (hostname[len - 1] == '.')
+ len--;
+
+ /* Scan backwards in @hostname to find the right-most dot (excluding the final dot, if it exists, as it was chopped off above).
+ * We can’t use strrchr() because because we need to operate with string lengths.
+ * End with @p pointing to the character after the right-most dot. */
+ p = hostname + len - 1;
+ while (p >= hostname)
+ {
+ if (*p == '.')
+ {
+ p++;
+ break;
+ }
+ else if (p == hostname)
+ break;
+ p--;
+ }
+
+ len -= p - hostname;
+
+ return g_ascii_strncasecmp (p, "localhost", MAX (len, strlen ("localhost"))) == 0;
+}
+
+/* Note that this does not follow the "FALSE means @error is set"
+ * convention. The return value tells the caller whether it should
+ * return @addrs and @error to the caller right away, or if it should
+ * continue and trying to resolve the name as a hostname.
+ */
+static gboolean
+handle_ip_address_or_localhost (const char *hostname,
+ GList **addrs,
+ GResolverNameLookupFlags flags,
+ GError **error)
+{
+ GInetAddress *addr;
+
+#ifndef G_OS_WIN32
+ struct in_addr ip4addr;
+#endif
+
+ addr = g_inet_address_new_from_string (hostname);
+ if (addr)
+ {
+ *addrs = g_list_append (NULL, addr);
+ return TRUE;
+ }
+
+ *addrs = NULL;
+
+#ifdef G_OS_WIN32
+
+ /* Reject IPv6 addresses that have brackets ('[' or ']') and/or port numbers,
+ * as no valid addresses should contain these at this point.
+ * Non-standard IPv4 addresses would be rejected during the call to
+ * getaddrinfo() later.
+ */
+ if (strrchr (hostname, '[') != NULL ||
+ strrchr (hostname, ']') != NULL)
+#else
+
+ /* Reject non-standard IPv4 numbers-and-dots addresses.
+ * g_inet_address_new_from_string() will have accepted any "real" IP
+ * address, so if inet_aton() succeeds, then it's an address we want
+ * to reject.
+ */
+ if (inet_aton (hostname, &ip4addr))
+#endif
+ {
+#ifdef G_OS_WIN32
+ gchar *error_message = g_win32_error_message (WSAHOST_NOT_FOUND);
+#else
+ gchar *error_message = g_locale_to_utf8 (gai_strerror (EAI_NONAME), -1, NULL, NULL, NULL);
+ if (error_message == NULL)
+ error_message = g_strdup ("[Invalid UTF-8]");
+#endif
+ g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_NOT_FOUND,
+ _("Error resolving “%s”: %s"),
+ hostname, error_message);
+ g_free (error_message);
+
+ return TRUE;
+ }
+
+ /* Always resolve localhost to a loopback address so it can be reliably considered secure.
+ This behavior is being adopted by browsers:
+ - https://w3c.github.io/webappsec-secure-contexts/
+ - https://groups.google.com/a/chromium.org/forum/#!msg/blink-dev/RC9dSw-O3fE/E3_0XaT0BAAJ
+ - https://chromium.googlesource.com/chromium/src.git/+/8da2a80724a9b896890602ff77ef2216cb951399
+ - https://bugs.webkit.org/show_bug.cgi?id=171934
+ - https://tools.ietf.org/html/draft-west-let-localhost-be-localhost-06
+ */
+ if (hostname_is_localhost (hostname))
+ {
+ if (flags & G_RESOLVER_NAME_LOOKUP_FLAGS_IPV6_ONLY)
+ *addrs = g_list_append (*addrs, g_inet_address_new_loopback (G_SOCKET_FAMILY_IPV6));
+ if (flags & G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY)
+ *addrs = g_list_append (*addrs, g_inet_address_new_loopback (G_SOCKET_FAMILY_IPV4));
+ if (*addrs == NULL)
+ {
+ *addrs = g_list_append (*addrs, g_inet_address_new_loopback (G_SOCKET_FAMILY_IPV6));
+ *addrs = g_list_append (*addrs, g_inet_address_new_loopback (G_SOCKET_FAMILY_IPV4));
+ }
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static GList *
+lookup_by_name_real (GResolver *resolver,
+ const gchar *hostname,
+ GResolverNameLookupFlags flags,
+ GCancellable *cancellable,
+ GError **error)
+{
+ GList *addrs;
+ gchar *ascii_hostname = NULL;
+
+ g_return_val_if_fail (G_IS_RESOLVER (resolver), NULL);
+ g_return_val_if_fail (hostname != NULL, NULL);
+ g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
+ g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ /* Check if @hostname is just an IP address */
+ if (handle_ip_address_or_localhost (hostname, &addrs, flags, error))
+ return addrs;
+
+ if (g_hostname_is_non_ascii (hostname))
+ hostname = ascii_hostname = g_hostname_to_ascii (hostname);
+
+ if (!hostname)
+ {
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ _("Invalid hostname"));
+ return NULL;
+ }
+
+ maybe_emit_reload (resolver);
+
+ if (flags != G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT)
+ {
+ if (!G_RESOLVER_GET_CLASS (resolver)->lookup_by_name_with_flags)
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+ /* Translators: The placeholder is for a function name. */
+ _("%s not implemented"), "lookup_by_name_with_flags");
+ g_free (ascii_hostname);
+ return NULL;
+ }
+ addrs = G_RESOLVER_GET_CLASS (resolver)->
+ lookup_by_name_with_flags (resolver, hostname, flags, cancellable, error);
+ }
+ else
+ addrs = G_RESOLVER_GET_CLASS (resolver)->
+ lookup_by_name (resolver, hostname, cancellable, error);
+
+ remove_duplicates (addrs);
+
+ g_free (ascii_hostname);
+ return addrs;
+}
/**
* g_resolver_lookup_by_name:
* @resolver: a #GResolver
* @hostname: the hostname to look up
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Synchronously resolves @hostname to determine its associated IP
* the textual form of an IP address (in which case this just becomes
* a wrapper around g_inet_address_new_from_string()).
*
- * On success, g_resolver_lookup_by_name() will return a #GList of
+ * On success, g_resolver_lookup_by_name() will return a non-empty #GList of
* #GInetAddress, sorted in order of preference and guaranteed to not
* contain duplicates. That is, if using the result to connect to
* @hostname, you should attempt to connect to the first address
* result using e.g. g_socket_listener_add_address().
*
* If the DNS resolution fails, @error (if non-%NULL) will be set to a
- * value from #GResolverError.
+ * value from #GResolverError and %NULL will be returned.
*
* If @cancellable is non-%NULL, it can be used to cancel the
* operation, in which case @error (if non-%NULL) will be set to
* address, it may be easier to create a #GNetworkAddress and use its
* #GSocketConnectable interface.
*
- * Return value: (element-type GInetAddress) (transfer full): a #GList
+ * Returns: (element-type GInetAddress) (transfer full): a non-empty #GList
* of #GInetAddress, or %NULL on error. You
* must unref each of the addresses and free the list when you are
* done with it. (You can use g_resolver_free_addresses() to do this.)
GCancellable *cancellable,
GError **error)
{
- GInetAddress *addr;
- GList *addrs;
+ return lookup_by_name_real (resolver,
+ hostname,
+ G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT,
+ cancellable,
+ error);
+}
+
+/**
+ * g_resolver_lookup_by_name_with_flags:
+ * @resolver: a #GResolver
+ * @hostname: the hostname to look up
+ * @flags: extra #GResolverNameLookupFlags for the lookup
+ * @cancellable: (nullable): a #GCancellable, or %NULL
+ * @error: (nullable): return location for a #GError, or %NULL
+ *
+ * This differs from g_resolver_lookup_by_name() in that you can modify
+ * the lookup behavior with @flags. For example this can be used to limit
+ * results with %G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY.
+ *
+ * Returns: (element-type GInetAddress) (transfer full): a non-empty #GList
+ * of #GInetAddress, or %NULL on error. You
+ * must unref each of the addresses and free the list when you are
+ * done with it. (You can use g_resolver_free_addresses() to do this.)
+ *
+ * Since: 2.60
+ */
+GList *
+g_resolver_lookup_by_name_with_flags (GResolver *resolver,
+ const gchar *hostname,
+ GResolverNameLookupFlags flags,
+ GCancellable *cancellable,
+ GError **error)
+{
+ return lookup_by_name_real (resolver,
+ hostname,
+ flags,
+ cancellable,
+ error);
+}
+
+static void
+lookup_by_name_async_real (GResolver *resolver,
+ const gchar *hostname,
+ GResolverNameLookupFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
gchar *ascii_hostname = NULL;
+ GList *addrs;
+ GError *error = NULL;
- g_return_val_if_fail (G_IS_RESOLVER (resolver), NULL);
- g_return_val_if_fail (hostname != NULL, NULL);
+ g_return_if_fail (G_IS_RESOLVER (resolver));
+ g_return_if_fail (hostname != NULL);
+ g_return_if_fail (!(flags & G_RESOLVER_NAME_LOOKUP_FLAGS_IPV4_ONLY && flags & G_RESOLVER_NAME_LOOKUP_FLAGS_IPV6_ONLY));
/* Check if @hostname is just an IP address */
- addr = g_inet_address_new_from_string (hostname);
- if (addr)
- return g_list_append (NULL, addr);
+ if (handle_ip_address_or_localhost (hostname, &addrs, flags, &error))
+ {
+ GTask *task;
+
+ task = g_task_new (resolver, cancellable, callback, user_data);
+ g_task_set_source_tag (task, lookup_by_name_async_real);
+ g_task_set_name (task, "[gio] resolver lookup");
+ if (addrs)
+ g_task_return_pointer (task, addrs, (GDestroyNotify) g_resolver_free_addresses);
+ else
+ g_task_return_error (task, error);
+ g_object_unref (task);
+ return;
+ }
if (g_hostname_is_non_ascii (hostname))
hostname = ascii_hostname = g_hostname_to_ascii (hostname);
- g_resolver_maybe_reload (resolver);
- addrs = G_RESOLVER_GET_CLASS (resolver)->
- lookup_by_name (resolver, hostname, cancellable, error);
+ if (!hostname)
+ {
+ GTask *task;
- remove_duplicates (addrs);
+ g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ _("Invalid hostname"));
+ task = g_task_new (resolver, cancellable, callback, user_data);
+ g_task_set_source_tag (task, lookup_by_name_async_real);
+ g_task_set_name (task, "[gio] resolver lookup");
+ g_task_return_error (task, error);
+ g_object_unref (task);
+ return;
+ }
+
+ maybe_emit_reload (resolver);
+
+ if (flags != G_RESOLVER_NAME_LOOKUP_FLAGS_DEFAULT)
+ {
+ if (G_RESOLVER_GET_CLASS (resolver)->lookup_by_name_with_flags_async == NULL)
+ {
+ GTask *task;
+
+ g_set_error (&error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+ /* Translators: The placeholder is for a function name. */
+ _("%s not implemented"), "lookup_by_name_with_flags_async");
+ task = g_task_new (resolver, cancellable, callback, user_data);
+ g_task_set_source_tag (task, lookup_by_name_async_real);
+ g_task_set_name (task, "[gio] resolver lookup");
+ g_task_return_error (task, error);
+ g_object_unref (task);
+ }
+ else
+ G_RESOLVER_GET_CLASS (resolver)->
+ lookup_by_name_with_flags_async (resolver, hostname, flags, cancellable, callback, user_data);
+ }
+ else
+ G_RESOLVER_GET_CLASS (resolver)->
+ lookup_by_name_async (resolver, hostname, cancellable, callback, user_data);
g_free (ascii_hostname);
+}
+
+static GList *
+lookup_by_name_finish_real (GResolver *resolver,
+ GAsyncResult *result,
+ GError **error,
+ gboolean with_flags)
+{
+ GList *addrs;
+
+ g_return_val_if_fail (G_IS_RESOLVER (resolver), NULL);
+ g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL);
+ g_return_val_if_fail (error == NULL || *error == NULL, NULL);
+
+ if (g_async_result_legacy_propagate_error (result, error))
+ return NULL;
+ else if (g_async_result_is_tagged (result, lookup_by_name_async_real))
+ {
+ /* Handle the stringified-IP-addr case */
+ return g_task_propagate_pointer (G_TASK (result), error);
+ }
+
+ if (with_flags)
+ {
+ g_assert (G_RESOLVER_GET_CLASS (resolver)->lookup_by_name_with_flags_finish != NULL);
+ addrs = G_RESOLVER_GET_CLASS (resolver)->
+ lookup_by_name_with_flags_finish (resolver, result, error);
+ }
+ else
+ addrs = G_RESOLVER_GET_CLASS (resolver)->
+ lookup_by_name_finish (resolver, result, error);
+
+ remove_duplicates (addrs);
+
return addrs;
}
/**
+ * g_resolver_lookup_by_name_with_flags_async:
+ * @resolver: a #GResolver
+ * @hostname: the hostname to look up the address of
+ * @flags: extra #GResolverNameLookupFlags for the lookup
+ * @cancellable: (nullable): a #GCancellable, or %NULL
+ * @callback: (scope async) (closure user_data): callback to call after resolution completes
+ * @user_data: data for @callback
+ *
+ * Begins asynchronously resolving @hostname to determine its
+ * associated IP address(es), and eventually calls @callback, which
+ * must call g_resolver_lookup_by_name_with_flags_finish() to get the result.
+ * See g_resolver_lookup_by_name() for more details.
+ *
+ * Since: 2.60
+ */
+void
+g_resolver_lookup_by_name_with_flags_async (GResolver *resolver,
+ const gchar *hostname,
+ GResolverNameLookupFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ lookup_by_name_async_real (resolver,
+ hostname,
+ flags,
+ cancellable,
+ callback,
+ user_data);
+}
+
+/**
* g_resolver_lookup_by_name_async:
* @resolver: a #GResolver
* @hostname: the hostname to look up the address of
- * @cancellable: (allow-none): a #GCancellable, or %NULL
- * @callback: (scope async): callback to call after resolution completes
- * @user_data: (closure): data for @callback
+ * @cancellable: (nullable): a #GCancellable, or %NULL
+ * @callback: (scope async) (closure user_data): callback to call after resolution completes
+ * @user_data: data for @callback
*
* Begins asynchronously resolving @hostname to determine its
* associated IP address(es), and eventually calls @callback, which
GAsyncReadyCallback callback,
gpointer user_data)
{
- GInetAddress *addr;
- gchar *ascii_hostname = NULL;
-
- g_return_if_fail (G_IS_RESOLVER (resolver));
- g_return_if_fail (hostname != NULL);
-
- /* Check if @hostname is just an IP address */
- addr = g_inet_address_new_from_string (hostname);
- if (addr)
- {
- GTask *task;
-
- task = g_task_new (resolver, cancellable, callback, user_data);
- g_task_set_source_tag (task, g_resolver_lookup_by_name_async);
- g_task_return_pointer (task, g_list_append (NULL, addr),
- (GDestroyNotify) g_resolver_free_addresses);
- g_object_unref (task);
- return;
- }
-
- if (g_hostname_is_non_ascii (hostname))
- hostname = ascii_hostname = g_hostname_to_ascii (hostname);
-
- g_resolver_maybe_reload (resolver);
- G_RESOLVER_GET_CLASS (resolver)->
- lookup_by_name_async (resolver, hostname, cancellable, callback, user_data);
-
- g_free (ascii_hostname);
+ lookup_by_name_async_real (resolver,
+ hostname,
+ 0,
+ cancellable,
+ callback,
+ user_data);
}
/**
* a value from #GResolverError. If the operation was cancelled,
* @error will be set to %G_IO_ERROR_CANCELLED.
*
- * Return value: (element-type GInetAddress) (transfer full): a #GList
+ * Returns: (element-type GInetAddress) (transfer full): a #GList
* of #GInetAddress, or %NULL on error. See g_resolver_lookup_by_name()
* for more details.
*
GAsyncResult *result,
GError **error)
{
- GList *addrs;
-
- g_return_val_if_fail (G_IS_RESOLVER (resolver), NULL);
-
- if (g_async_result_legacy_propagate_error (result, error))
- return NULL;
- else if (g_async_result_is_tagged (result, g_resolver_lookup_by_name_async))
- {
- /* Handle the stringified-IP-addr case */
- return g_task_propagate_pointer (G_TASK (result), error);
- }
-
- addrs = G_RESOLVER_GET_CLASS (resolver)->
- lookup_by_name_finish (resolver, result, error);
-
- remove_duplicates (addrs);
+ return lookup_by_name_finish_real (resolver,
+ result,
+ error,
+ FALSE);
+}
- return addrs;
+/**
+ * g_resolver_lookup_by_name_with_flags_finish:
+ * @resolver: a #GResolver
+ * @result: the result passed to your #GAsyncReadyCallback
+ * @error: return location for a #GError, or %NULL
+ *
+ * Retrieves the result of a call to
+ * g_resolver_lookup_by_name_with_flags_async().
+ *
+ * If the DNS resolution failed, @error (if non-%NULL) will be set to
+ * a value from #GResolverError. If the operation was cancelled,
+ * @error will be set to %G_IO_ERROR_CANCELLED.
+ *
+ * Returns: (element-type GInetAddress) (transfer full): a #GList
+ * of #GInetAddress, or %NULL on error. See g_resolver_lookup_by_name()
+ * for more details.
+ *
+ * Since: 2.60
+ */
+GList *
+g_resolver_lookup_by_name_with_flags_finish (GResolver *resolver,
+ GAsyncResult *result,
+ GError **error)
+{
+ return lookup_by_name_finish_real (resolver,
+ result,
+ error,
+ TRUE);
}
/**
* g_resolver_lookup_by_address:
* @resolver: a #GResolver
* @address: the address to reverse-resolve
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Synchronously reverse-resolves @address to determine its
* operation, in which case @error (if non-%NULL) will be set to
* %G_IO_ERROR_CANCELLED.
*
- * Return value: a hostname (either ASCII-only, or in ASCII-encoded
+ * Returns: a hostname (either ASCII-only, or in ASCII-encoded
* form), or %NULL on error.
*
* Since: 2.22
g_return_val_if_fail (G_IS_RESOLVER (resolver), NULL);
g_return_val_if_fail (G_IS_INET_ADDRESS (address), NULL);
- g_resolver_maybe_reload (resolver);
+ maybe_emit_reload (resolver);
return G_RESOLVER_GET_CLASS (resolver)->
lookup_by_address (resolver, address, cancellable, error);
}
* g_resolver_lookup_by_address_async:
* @resolver: a #GResolver
* @address: the address to reverse-resolve
- * @cancellable: (allow-none): a #GCancellable, or %NULL
- * @callback: (scope async): callback to call after resolution completes
- * @user_data: (closure): data for @callback
+ * @cancellable: (nullable): a #GCancellable, or %NULL
+ * @callback: (scope async) (closure user_data): callback to call after resolution completes
+ * @user_data: data for @callback
*
* Begins asynchronously reverse-resolving @address to determine its
* associated hostname, and eventually calls @callback, which must
g_return_if_fail (G_IS_RESOLVER (resolver));
g_return_if_fail (G_IS_INET_ADDRESS (address));
- g_resolver_maybe_reload (resolver);
+ maybe_emit_reload (resolver);
G_RESOLVER_GET_CLASS (resolver)->
lookup_by_address_async (resolver, address, cancellable, callback, user_data);
}
* a value from #GResolverError. If the operation was cancelled,
* @error will be set to %G_IO_ERROR_CANCELLED.
*
- * Return value: a hostname (either ASCII-only, or in ASCII-encoded
+ * Returns: a hostname (either ASCII-only, or in ASCII-encoded
* form), or %NULL on error.
*
* Since: 2.22
if (g_hostname_is_non_ascii (domain))
domain = ascii_domain = g_hostname_to_ascii (domain);
+ if (!domain)
+ return NULL;
rrname = g_strdup_printf ("_%s._%s.%s", service, protocol, domain);
* @service: the service type to look up (eg, "ldap")
* @protocol: the networking protocol to use for @service (eg, "tcp")
* @domain: the DNS domain to look up the service in
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Synchronously performs a DNS SRV lookup for the given @service and
* @protocol in the given @domain and returns an array of #GSrvTarget.
* @domain may be an ASCII-only or UTF-8 hostname. Note also that the
- * @service and @protocol arguments <emphasis>do not</emphasis>
- * include the leading underscore that appears in the actual DNS
- * entry.
+ * @service and @protocol arguments do not include the leading underscore
+ * that appears in the actual DNS entry.
*
- * On success, g_resolver_lookup_service() will return a #GList of
+ * On success, g_resolver_lookup_service() will return a non-empty #GList of
* #GSrvTarget, sorted in order of preference. (That is, you should
* attempt to connect to the first target first, then the second if
* the first fails, etc.)
*
* If the DNS resolution fails, @error (if non-%NULL) will be set to
- * a value from #GResolverError.
+ * a value from #GResolverError and %NULL will be returned.
*
* If @cancellable is non-%NULL, it can be used to cancel the
* operation, in which case @error (if non-%NULL) will be set to
* to create a #GNetworkService and use its #GSocketConnectable
* interface.
*
- * Return value: (element-type GSrvTarget) (transfer full): a #GList of #GSrvTarget,
- * or %NULL on error. You must free each of the targets and the list when you are
- * done with it. (You can use g_resolver_free_targets() to do this.)
+ * Returns: (element-type GSrvTarget) (transfer full): a non-empty #GList of
+ * #GSrvTarget, or %NULL on error. You must free each of the targets and the
+ * list when you are done with it. (You can use g_resolver_free_targets() to do
+ * this.)
*
* Since: 2.22
*/
g_return_val_if_fail (domain != NULL, NULL);
rrname = g_resolver_get_service_rrname (service, protocol, domain);
+ if (!rrname)
+ {
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ _("Invalid domain"));
+ return NULL;
+ }
- g_resolver_maybe_reload (resolver);
+ maybe_emit_reload (resolver);
targets = G_RESOLVER_GET_CLASS (resolver)->
lookup_service (resolver, rrname, cancellable, error);
* @service: the service type to look up (eg, "ldap")
* @protocol: the networking protocol to use for @service (eg, "tcp")
* @domain: the DNS domain to look up the service in
- * @cancellable: (allow-none): a #GCancellable, or %NULL
- * @callback: (scope async): callback to call after resolution completes
- * @user_data: (closure): data for @callback
+ * @cancellable: (nullable): a #GCancellable, or %NULL
+ * @callback: (scope async) (closure user_data): callback to call after resolution completes
+ * @user_data: data for @callback
*
* Begins asynchronously performing a DNS SRV lookup for the given
* @service and @protocol in the given @domain, and eventually calls
g_return_if_fail (domain != NULL);
rrname = g_resolver_get_service_rrname (service, protocol, domain);
+ if (!rrname)
+ {
+ g_task_report_new_error (resolver, callback, user_data,
+ g_resolver_lookup_service_async,
+ G_IO_ERROR, G_IO_ERROR_FAILED,
+ _("Invalid domain"));
+ return;
+ }
- g_resolver_maybe_reload (resolver);
+ maybe_emit_reload (resolver);
G_RESOLVER_GET_CLASS (resolver)->
lookup_service_async (resolver, rrname, cancellable, callback, user_data);
* a value from #GResolverError. If the operation was cancelled,
* @error will be set to %G_IO_ERROR_CANCELLED.
*
- * Return value: (element-type GSrvTarget) (transfer full): a #GList of #GSrvTarget,
- * or %NULL on error. See g_resolver_lookup_service() for more details.
+ * Returns: (element-type GSrvTarget) (transfer full): a non-empty #GList of
+ * #GSrvTarget, or %NULL on error. See g_resolver_lookup_service() for more
+ * details.
*
* Since: 2.22
*/
/**
* g_resolver_lookup_records:
* @resolver: a #GResolver
- * @rrname: the DNS name to lookup the record for
- * @record_type: the type of DNS record to lookup
- * @cancellable: (allow-none): a #GCancellable, or %NULL
+ * @rrname: the DNS name to look up the record for
+ * @record_type: the type of DNS record to look up
+ * @cancellable: (nullable): a #GCancellable, or %NULL
* @error: return location for a #GError, or %NULL
*
* Synchronously performs a DNS record lookup for the given @rrname and returns
* information on what the records contain for each @record_type.
*
* If the DNS resolution fails, @error (if non-%NULL) will be set to
- * a value from #GResolverError.
+ * a value from #GResolverError and %NULL will be returned.
*
* If @cancellable is non-%NULL, it can be used to cancel the
* operation, in which case @error (if non-%NULL) will be set to
* %G_IO_ERROR_CANCELLED.
*
- * Return value: (element-type GVariant) (transfer full): a #GList of #GVariant,
- * or %NULL on error. You must free each of the records and the list when you are
- * done with it. (You can use g_list_free_full() with g_variant_unref() to do this.)
+ * Returns: (element-type GVariant) (transfer full): a non-empty #GList of
+ * #GVariant, or %NULL on error. You must free each of the records and the list
+ * when you are done with it. (You can use g_list_free_full() with
+ * g_variant_unref() to do this.)
*
* Since: 2.34
*/
g_return_val_if_fail (G_IS_RESOLVER (resolver), NULL);
g_return_val_if_fail (rrname != NULL, NULL);
- g_resolver_maybe_reload (resolver);
+ maybe_emit_reload (resolver);
records = G_RESOLVER_GET_CLASS (resolver)->
lookup_records (resolver, rrname, record_type, cancellable, error);
/**
* g_resolver_lookup_records_async:
* @resolver: a #GResolver
- * @rrname: the DNS name to lookup the record for
- * @record_type: the type of DNS record to lookup
- * @cancellable: (allow-none): a #GCancellable, or %NULL
- * @callback: (scope async): callback to call after resolution completes
- * @user_data: (closure): data for @callback
+ * @rrname: the DNS name to look up the record for
+ * @record_type: the type of DNS record to look up
+ * @cancellable: (nullable): a #GCancellable, or %NULL
+ * @callback: (scope async) (closure user_data): callback to call after resolution completes
+ * @user_data: data for @callback
*
* Begins asynchronously performing a DNS lookup for the given
* @rrname, and eventually calls @callback, which must call
g_return_if_fail (G_IS_RESOLVER (resolver));
g_return_if_fail (rrname != NULL);
- g_resolver_maybe_reload (resolver);
+ maybe_emit_reload (resolver);
G_RESOLVER_GET_CLASS (resolver)->
lookup_records_async (resolver, rrname, record_type, cancellable, callback, user_data);
}
* @error: return location for a #GError, or %NULL
*
* Retrieves the result of a previous call to
- * g_resolver_lookup_records_async(). Returns a list of records as #GVariant
- * tuples. See #GResolverRecordType for information on what the records contain.
+ * g_resolver_lookup_records_async(). Returns a non-empty list of records as
+ * #GVariant tuples. See #GResolverRecordType for information on what the
+ * records contain.
*
* If the DNS resolution failed, @error (if non-%NULL) will be set to
* a value from #GResolverError. If the operation was cancelled,
* @error will be set to %G_IO_ERROR_CANCELLED.
*
- * Return value: (element-type GVariant) (transfer full): a #GList of #GVariant,
- * or %NULL on error. You must free each of the records and the list when you are
- * done with it. (You can use g_list_free_full() with g_variant_unref() to do this.)
+ * Returns: (element-type GVariant) (transfer full): a non-empty #GList of
+ * #GVariant, or %NULL on error. You must free each of the records and the list
+ * when you are done with it. (You can use g_list_free_full() with
+ * g_variant_unref() to do this.)
*
* Since: 2.34
*/
lookup_records_finish (resolver, result, error);
}
-/**
- * g_resolver_error_quark:
- *
- * Gets the #GResolver Error Quark.
- *
- * Return value: a #GQuark.
- *
- * Since: 2.22
- */
-G_DEFINE_QUARK (g-resolver-error-quark, g_resolver_error)
-
-static GResolverError
-g_resolver_error_from_addrinfo_error (gint err)
-{
- switch (err)
- {
- case EAI_FAIL:
-#if defined(EAI_NODATA) && (EAI_NODATA != EAI_NONAME)
- case EAI_NODATA:
-#endif
- case EAI_NONAME:
- return G_RESOLVER_ERROR_NOT_FOUND;
-
- case EAI_AGAIN:
- return G_RESOLVER_ERROR_TEMPORARY_FAILURE;
-
- default:
- return G_RESOLVER_ERROR_INTERNAL;
- }
-}
-
-struct addrinfo _g_resolver_addrinfo_hints;
-
-/* Private method to process a getaddrinfo() response. */
-GList *
-_g_resolver_addresses_from_addrinfo (const char *hostname,
- struct addrinfo *res,
- gint gai_retval,
- GError **error)
-{
- struct addrinfo *ai;
- GSocketAddress *sockaddr;
- GInetAddress *addr;
- GList *addrs;
-
- if (gai_retval != 0)
- {
- g_set_error (error, G_RESOLVER_ERROR,
- g_resolver_error_from_addrinfo_error (gai_retval),
- _("Error resolving '%s': %s"),
- hostname, gai_strerror (gai_retval));
- return NULL;
- }
-
- g_return_val_if_fail (res != NULL, NULL);
-
- addrs = NULL;
- for (ai = res; ai; ai = ai->ai_next)
- {
- sockaddr = g_socket_address_new_from_native (ai->ai_addr, ai->ai_addrlen);
- if (!sockaddr || !G_IS_INET_SOCKET_ADDRESS (sockaddr))
- continue;
-
- addr = g_object_ref (g_inet_socket_address_get_address ((GInetSocketAddress *)sockaddr));
- addrs = g_list_prepend (addrs, addr);
- g_object_unref (sockaddr);
- }
-
- return g_list_reverse (addrs);
-}
-
-/* Private method to set up a getnameinfo() request */
-void
-_g_resolver_address_to_sockaddr (GInetAddress *address,
- struct sockaddr_storage *sa,
- gsize *len)
+guint64
+g_resolver_get_serial (GResolver *resolver)
{
- GSocketAddress *sockaddr;
-
- sockaddr = g_inet_socket_address_new (address, 0);
- g_socket_address_to_native (sockaddr, (struct sockaddr *)sa, sizeof (*sa), NULL);
- *len = g_socket_address_get_native_size (sockaddr);
- g_object_unref (sockaddr);
-}
-
-/* Private method to process a getnameinfo() response. */
-char *
-_g_resolver_name_from_nameinfo (GInetAddress *address,
- const gchar *name,
- gint gni_retval,
- GError **error)
-{
- if (gni_retval != 0)
- {
- gchar *phys;
-
- phys = g_inet_address_to_string (address);
- g_set_error (error, G_RESOLVER_ERROR,
- g_resolver_error_from_addrinfo_error (gni_retval),
- _("Error reverse-resolving '%s': %s"),
- phys ? phys : "(unknown)", gai_strerror (gni_retval));
- g_free (phys);
- return NULL;
- }
+ guint64 result;
- return g_strdup (name);
-}
+ g_return_val_if_fail (G_IS_RESOLVER (resolver), 0);
-#if defined(G_OS_UNIX)
-
-#ifdef __BIONIC__
-/* Copy from bionic/libc/private/arpa_nameser_compat.h
- * and bionic/libc/private/arpa_nameser.h */
-typedef struct {
- unsigned id :16; /* query identification number */
-#if BYTE_ORDER == BIG_ENDIAN
- /* fields in third byte */
- unsigned qr: 1; /* response flag */
- unsigned opcode: 4; /* purpose of message */
- unsigned aa: 1; /* authoritive answer */
- unsigned tc: 1; /* truncated message */
- unsigned rd: 1; /* recursion desired */
- /* fields in fourth byte */
- unsigned ra: 1; /* recursion available */
- unsigned unused :1; /* unused bits (MBZ as of 4.9.3a3) */
- unsigned ad: 1; /* authentic data from named */
- unsigned cd: 1; /* checking disabled by resolver */
- unsigned rcode :4; /* response code */
-#endif
-#if BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN
- /* fields in third byte */
- unsigned rd :1; /* recursion desired */
- unsigned tc :1; /* truncated message */
- unsigned aa :1; /* authoritive answer */
- unsigned opcode :4; /* purpose of message */
- unsigned qr :1; /* response flag */
- /* fields in fourth byte */
- unsigned rcode :4; /* response code */
- unsigned cd: 1; /* checking disabled by resolver */
- unsigned ad: 1; /* authentic data from named */
- unsigned unused :1; /* unused bits (MBZ as of 4.9.3a3) */
- unsigned ra :1; /* recursion available */
-#endif
- /* remaining bytes */
- unsigned qdcount :16; /* number of question entries */
- unsigned ancount :16; /* number of answer entries */
- unsigned nscount :16; /* number of authority entries */
- unsigned arcount :16; /* number of resource entries */
-} HEADER;
-
-#define NS_INT32SZ 4 /* #/bytes of data in a uint32_t */
-#define NS_INT16SZ 2 /* #/bytes of data in a uint16_t */
-
-#define NS_GET16(s, cp) do { \
- const u_char *t_cp = (const u_char *)(cp); \
- (s) = ((uint16_t)t_cp[0] << 8) \
- | ((uint16_t)t_cp[1]) \
- ; \
- (cp) += NS_INT16SZ; \
-} while (/*CONSTCOND*/0)
-
-#define NS_GET32(l, cp) do { \
- const u_char *t_cp = (const u_char *)(cp); \
- (l) = ((uint32_t)t_cp[0] << 24) \
- | ((uint32_t)t_cp[1] << 16) \
- | ((uint32_t)t_cp[2] << 8) \
- | ((uint32_t)t_cp[3]) \
- ; \
- (cp) += NS_INT32SZ; \
-} while (/*CONSTCOND*/0)
-
-#define GETSHORT NS_GET16
-#define GETLONG NS_GET32
-
-#define C_IN 1
-
-/* From bionic/libc/private/resolv_private.h */
-int dn_expand(const u_char *, const u_char *, const u_char *, char *, int);
-#define dn_skipname __dn_skipname
-int dn_skipname(const u_char *, const u_char *);
-
-/* From bionic/libc/private/arpa_nameser_compat.h */
-#define T_MX ns_t_mx
-#define T_TXT ns_t_txt
-#define T_SOA ns_t_soa
-#define T_NS ns_t_ns
-
-/* From bionic/libc/private/arpa_nameser.h */
-typedef enum __ns_type {
- ns_t_invalid = 0, /* Cookie. */
- ns_t_a = 1, /* Host address. */
- ns_t_ns = 2, /* Authoritative server. */
- ns_t_md = 3, /* Mail destination. */
- ns_t_mf = 4, /* Mail forwarder. */
- ns_t_cname = 5, /* Canonical name. */
- ns_t_soa = 6, /* Start of authority zone. */
- ns_t_mb = 7, /* Mailbox domain name. */
- ns_t_mg = 8, /* Mail group member. */
- ns_t_mr = 9, /* Mail rename name. */
- ns_t_null = 10, /* Null resource record. */
- ns_t_wks = 11, /* Well known service. */
- ns_t_ptr = 12, /* Domain name pointer. */
- ns_t_hinfo = 13, /* Host information. */
- ns_t_minfo = 14, /* Mailbox information. */
- ns_t_mx = 15, /* Mail routing information. */
- ns_t_txt = 16, /* Text strings. */
- ns_t_rp = 17, /* Responsible person. */
- ns_t_afsdb = 18, /* AFS cell database. */
- ns_t_x25 = 19, /* X_25 calling address. */
- ns_t_isdn = 20, /* ISDN calling address. */
- ns_t_rt = 21, /* Router. */
- ns_t_nsap = 22, /* NSAP address. */
- ns_t_nsap_ptr = 23, /* Reverse NSAP lookup (deprecated). */
- ns_t_sig = 24, /* Security signature. */
- ns_t_key = 25, /* Security key. */
- ns_t_px = 26, /* X.400 mail mapping. */
- ns_t_gpos = 27, /* Geographical position (withdrawn). */
- ns_t_aaaa = 28, /* Ip6 Address. */
- ns_t_loc = 29, /* Location Information. */
- ns_t_nxt = 30, /* Next domain (security). */
- ns_t_eid = 31, /* Endpoint identifier. */
- ns_t_nimloc = 32, /* Nimrod Locator. */
- ns_t_srv = 33, /* Server Selection. */
- ns_t_atma = 34, /* ATM Address */
- ns_t_naptr = 35, /* Naming Authority PoinTeR */
- ns_t_kx = 36, /* Key Exchange */
- ns_t_cert = 37, /* Certification record */
- ns_t_a6 = 38, /* IPv6 address (deprecates AAAA) */
- ns_t_dname = 39, /* Non-terminal DNAME (for IPv6) */
- ns_t_sink = 40, /* Kitchen sink (experimentatl) */
- ns_t_opt = 41, /* EDNS0 option (meta-RR) */
- ns_t_apl = 42, /* Address prefix list (RFC 3123) */
- ns_t_tkey = 249, /* Transaction key */
- ns_t_tsig = 250, /* Transaction signature. */
- ns_t_ixfr = 251, /* Incremental zone transfer. */
- ns_t_axfr = 252, /* Transfer zone of authority. */
- ns_t_mailb = 253, /* Transfer mailbox records. */
- ns_t_maila = 254, /* Transfer mail agent records. */
- ns_t_any = 255, /* Wildcard match. */
- ns_t_zxfr = 256, /* BIND-specific, nonstandard. */
- ns_t_max = 65536
-} ns_type;
+ maybe_emit_reload (resolver);
+#ifdef G_OS_UNIX
+ g_mutex_lock (&resolver->priv->mutex);
+ result = resolver->priv->resolv_conf_timestamp;
+ g_mutex_unlock (&resolver->priv->mutex);
+#else
+ result = 1;
#endif
-static gboolean
-parse_short (guchar **p,
- guchar *end,
- guint16 *value)
-{
- if (*p + 2 > end)
- return FALSE;
- GETSHORT (*value, *p);
- return TRUE;
-}
-
-static gboolean
-parse_long (guchar **p,
- guchar *end,
- guint32 *value)
-{
- if (*p + 4 > end)
- return FALSE;
- GETLONG (*value, *p);
- return TRUE;
-}
-
-static GVariant *
-parse_res_srv (guchar *answer,
- guchar *end,
- guchar *p)
-{
- gchar namebuf[1024];
- guint16 priority, weight, port;
- gint n;
-
- if (!parse_short (&p, end, &priority) ||
- !parse_short (&p, end, &weight) ||
- !parse_short (&p, end, &port))
- return NULL;
-
- n = dn_expand (answer, end, p, namebuf, sizeof (namebuf));
- if (n < 0)
- return NULL;
- *p += n;
-
- return g_variant_new ("(qqqs)",
- priority,
- weight,
- port,
- namebuf);
-}
-
-static GVariant *
-parse_res_soa (guchar *answer,
- guchar *end,
- guchar *p)
-{
- gchar mnamebuf[1024];
- gchar rnamebuf[1024];
- guint32 serial, refresh, retry, expire, ttl;
- gint n;
-
- n = dn_expand (answer, end, p, mnamebuf, sizeof (mnamebuf));
- if (n < 0)
- return NULL;
- p += n;
-
- n = dn_expand (answer, end, p, rnamebuf, sizeof (rnamebuf));
- if (n < 0)
- return NULL;
- p += n;
-
- if (!parse_long (&p, end, &serial) ||
- !parse_long (&p, end, &refresh) ||
- !parse_long (&p, end, &retry) ||
- !parse_long (&p, end, &expire) ||
- !parse_long (&p, end, &ttl))
- return NULL;
-
- return g_variant_new ("(ssuuuuu)",
- mnamebuf,
- rnamebuf,
- serial,
- refresh,
- retry,
- expire,
- ttl);
-}
-
-static GVariant *
-parse_res_ns (guchar *answer,
- guchar *end,
- guchar *p)
-{
- gchar namebuf[1024];
- gint n;
-
- n = dn_expand (answer, end, p, namebuf, sizeof (namebuf));
- if (n < 0)
- return NULL;
-
- return g_variant_new ("(s)", namebuf);
-}
-
-static GVariant *
-parse_res_mx (guchar *answer,
- guchar *end,
- guchar *p)
-{
- gchar namebuf[1024];
- guint16 preference;
- gint n;
-
- if (!parse_short (&p, end, &preference))
- return NULL;
-
- n = dn_expand (answer, end, p, namebuf, sizeof (namebuf));
- if (n < 0)
- return NULL;
- p += n;
-
- return g_variant_new ("(qs)",
- preference,
- namebuf);
-}
-
-static GVariant *
-parse_res_txt (guchar *answer,
- guchar *end,
- guchar *p)
-{
- GVariant *record;
- GPtrArray *array;
- gsize len;
-
- array = g_ptr_array_new_with_free_func (g_free);
- while (p < end)
- {
- len = *(p++);
- if (len > p - end)
- break;
- g_ptr_array_add (array, g_strndup ((gchar *)p, len));
- p += len;
- }
-
- record = g_variant_new ("(@as)",
- g_variant_new_strv ((const gchar **)array->pdata, array->len));
- g_ptr_array_free (array, TRUE);
- return record;
-}
-
-gint
-_g_resolver_record_type_to_rrtype (GResolverRecordType type)
-{
- switch (type)
- {
- case G_RESOLVER_RECORD_SRV:
- return T_SRV;
- case G_RESOLVER_RECORD_TXT:
- return T_TXT;
- case G_RESOLVER_RECORD_SOA:
- return T_SOA;
- case G_RESOLVER_RECORD_NS:
- return T_NS;
- case G_RESOLVER_RECORD_MX:
- return T_MX;
- }
- g_return_val_if_reached (-1);
-}
-
-/* Private method to process a res_query response into GSrvTargets */
-GList *
-_g_resolver_records_from_res_query (const gchar *rrname,
- gint rrtype,
- guchar *answer,
- gint len,
- gint herr,
- GError **error)
-{
- gint count;
- guchar *end, *p;
- guint16 type, qclass, rdlength;
- guint32 ttl;
- HEADER *header;
- GList *records;
- GVariant *record;
- gint n, i;
-
- if (len <= 0)
- {
- GResolverError errnum;
- const gchar *format;
-
- if (len == 0 || herr == HOST_NOT_FOUND || herr == NO_DATA)
- {
- errnum = G_RESOLVER_ERROR_NOT_FOUND;
- format = _("No DNS record of the requested type for '%s'");
- }
- else if (herr == TRY_AGAIN)
- {
- errnum = G_RESOLVER_ERROR_TEMPORARY_FAILURE;
- format = _("Temporarily unable to resolve '%s'");
- }
- else
- {
- errnum = G_RESOLVER_ERROR_INTERNAL;
- format = _("Error resolving '%s'");
- }
-
- g_set_error (error, G_RESOLVER_ERROR, errnum, format, rrname);
- return NULL;
- }
-
- records = NULL;
-
- header = (HEADER *)answer;
- p = answer + sizeof (HEADER);
- end = answer + len;
-
- /* Skip query */
- count = ntohs (header->qdcount);
- for (i = 0; i < count && p < end; i++)
- {
- n = dn_skipname (p, end);
- if (n < 0)
- break;
- p += n;
- p += 4;
- }
-
- /* Incomplete response */
- if (i < count)
- {
- g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_TEMPORARY_FAILURE,
- _("Incomplete data received for '%s'"), rrname);
- return NULL;
- }
-
- /* Read answers */
- count = ntohs (header->ancount);
- for (i = 0; i < count && p < end; i++)
- {
- n = dn_skipname (p, end);
- if (n < 0)
- break;
- p += n;
-
- if (!parse_short (&p, end, &type) ||
- !parse_short (&p, end, &qclass) ||
- !parse_long (&p, end, &ttl) ||
- !parse_short (&p, end, &rdlength))
- break;
-
- ttl = ttl; /* To avoid -Wunused-but-set-variable */
-
- if (p + rdlength > end)
- break;
-
- if (type == rrtype && qclass == C_IN)
- {
- switch (rrtype)
- {
- case T_SRV:
- record = parse_res_srv (answer, end, p);
- break;
- case T_MX:
- record = parse_res_mx (answer, end, p);
- break;
- case T_SOA:
- record = parse_res_soa (answer, end, p);
- break;
- case T_NS:
- record = parse_res_ns (answer, end, p);
- break;
- case T_TXT:
- record = parse_res_txt (answer, p + rdlength, p);
- break;
- default:
- g_warn_if_reached ();
- record = NULL;
- break;
- }
-
- if (record != NULL)
- records = g_list_prepend (records, record);
- }
-
- p += rdlength;
- }
-
- /* Somehow got a truncated response */
- if (i < count)
- {
- g_list_free_full (records, (GDestroyNotify)g_variant_unref);
- g_set_error (error, G_RESOLVER_ERROR, G_RESOLVER_ERROR_TEMPORARY_FAILURE,
- _("Incomplete data received for '%s'"), rrname);
- return NULL;
- }
-
- return records;
+ return result;
}
-#elif defined(G_OS_WIN32)
-static GVariant *
-parse_dns_srv (DNS_RECORD *rec)
-{
- return g_variant_new ("(qqqs)",
- (guint16)rec->Data.SRV.wPriority,
- (guint16)rec->Data.SRV.wWeight,
- (guint16)rec->Data.SRV.wPort,
- rec->Data.SRV.pNameTarget);
-}
-
-static GVariant *
-parse_dns_soa (DNS_RECORD *rec)
-{
- return g_variant_new ("(ssuuuuu)",
- rec->Data.SOA.pNamePrimaryServer,
- rec->Data.SOA.pNameAdministrator,
- (guint32)rec->Data.SOA.dwSerialNo,
- (guint32)rec->Data.SOA.dwRefresh,
- (guint32)rec->Data.SOA.dwRetry,
- (guint32)rec->Data.SOA.dwExpire,
- (guint32)rec->Data.SOA.dwDefaultTtl);
-}
-
-static GVariant *
-parse_dns_ns (DNS_RECORD *rec)
+/**
+ * g_resolver_get_timeout:
+ * @resolver: a #GResolver
+ *
+ * Get the timeout applied to all resolver lookups. See #GResolver:timeout.
+ *
+ * Returns: the resolver timeout, in milliseconds, or `0` for no timeout
+ *
+ * Since: 2.78
+ */
+unsigned
+g_resolver_get_timeout (GResolver *resolver)
{
- return g_variant_new ("(s)", rec->Data.NS.pNameHost);
-}
+ GResolverPrivate *priv = g_resolver_get_instance_private (resolver);
-static GVariant *
-parse_dns_mx (DNS_RECORD *rec)
-{
- return g_variant_new ("(qs)",
- (guint16)rec->Data.MX.wPreference,
- rec->Data.MX.pNameExchange);
-}
+ g_return_val_if_fail (G_IS_RESOLVER (resolver), 0);
-static GVariant *
-parse_dns_txt (DNS_RECORD *rec)
-{
- GVariant *record;
- GPtrArray *array;
- DWORD i;
-
- array = g_ptr_array_new ();
- for (i = 0; i < rec->Data.TXT.dwStringCount; i++)
- g_ptr_array_add (array, rec->Data.TXT.pStringArray[i]);
- record = g_variant_new ("(@as)",
- g_variant_new_strv ((const gchar **)array->pdata, array->len));
- g_ptr_array_free (array, TRUE);
- return record;
+ return priv->timeout_ms;
}
-WORD
-_g_resolver_record_type_to_dnstype (GResolverRecordType type)
+/**
+ * g_resolver_set_timeout:
+ * @resolver: a #GResolver
+ * @timeout_ms: timeout in milliseconds, or `0` for no timeouts
+ *
+ * Set the timeout applied to all resolver lookups. See #GResolver:timeout.
+ *
+ * Since: 2.78
+ */
+void
+g_resolver_set_timeout (GResolver *resolver,
+ unsigned timeout_ms)
{
- switch (type)
- {
- case G_RESOLVER_RECORD_SRV:
- return DNS_TYPE_SRV;
- case G_RESOLVER_RECORD_TXT:
- return DNS_TYPE_TEXT;
- case G_RESOLVER_RECORD_SOA:
- return DNS_TYPE_SOA;
- case G_RESOLVER_RECORD_NS:
- return DNS_TYPE_NS;
- case G_RESOLVER_RECORD_MX:
- return DNS_TYPE_MX;
- }
- g_return_val_if_reached (-1);
-}
+ GResolverPrivate *priv = g_resolver_get_instance_private (resolver);
-/* Private method to process a DnsQuery response into GVariants */
-GList *
-_g_resolver_records_from_DnsQuery (const gchar *rrname,
- WORD dnstype,
- DNS_STATUS status,
- DNS_RECORD *results,
- GError **error)
-{
- DNS_RECORD *rec;
- gpointer record;
- GList *records;
-
- if (status != ERROR_SUCCESS)
- {
- GResolverError errnum;
- const gchar *format;
-
- if (status == DNS_ERROR_RCODE_NAME_ERROR)
- {
- errnum = G_RESOLVER_ERROR_NOT_FOUND;
- format = _("No DNS record of the requested type for '%s'");
- }
- else if (status == DNS_ERROR_RCODE_SERVER_FAILURE)
- {
- errnum = G_RESOLVER_ERROR_TEMPORARY_FAILURE;
- format = _("Temporarily unable to resolve '%s'");
- }
- else
- {
- errnum = G_RESOLVER_ERROR_INTERNAL;
- format = _("Error resolving '%s'");
- }
+ g_return_if_fail (G_IS_RESOLVER (resolver));
- g_set_error (error, G_RESOLVER_ERROR, errnum, format, rrname);
- return NULL;
- }
+ if (priv->timeout_ms == timeout_ms)
+ return;
- records = NULL;
- for (rec = results; rec; rec = rec->pNext)
- {
- if (rec->wType != dnstype)
- continue;
- switch (dnstype)
- {
- case DNS_TYPE_SRV:
- record = parse_dns_srv (rec);
- break;
- case DNS_TYPE_SOA:
- record = parse_dns_soa (rec);
- break;
- case DNS_TYPE_NS:
- record = parse_dns_ns (rec);
- break;
- case DNS_TYPE_MX:
- record = parse_dns_mx (rec);
- break;
- case DNS_TYPE_TEXT:
- record = parse_dns_txt (rec);
- break;
- default:
- g_warn_if_reached ();
- record = NULL;
- break;
- }
- if (record != NULL)
- records = g_list_prepend (records, g_variant_ref_sink (record));
- }
-
- return records;
+ priv->timeout_ms = timeout_ms;
+ g_object_notify_by_pspec (G_OBJECT (resolver), props[PROP_TIMEOUT]);
}
-#endif
+/**
+ * g_resolver_error_quark:
+ *
+ * Gets the #GResolver Error Quark.
+ *
+ * Returns: a #GQuark.
+ *
+ * Since: 2.22
+ */
+G_DEFINE_QUARK (g-resolver-error-quark, g_resolver_error)
projects / platform / upstream / glib.git / blobdiff