*
* Resolver library with GLib integration
*
- * Copyright (C) 2009-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2009-2013 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include <stdarg.h>
#include <string.h>
#include <stdlib.h>
+#include <stdio.h>
#include <resolv.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#include <arpa/inet.h>
#include <arpa/nameser.h>
+#include <net/if.h>
#include "gresolv.h"
int dst_scope;
int src_label;
int dst_label;
- gboolean reachable;
+ bool reachable;
union {
struct sockaddr sa;
struct sockaddr_in sin;
struct resolv_query {
GResolv *resolv;
+ int nr_ns;
guint timeout;
uint16_t msgid;
};
struct _GResolv {
- gint ref_count;
+ int ref_count;
int result_family;
gpointer debug_data;
};
-static inline void debug(GResolv *resolv, const char *format, ...)
+#define debug(resolv, format, arg...) \
+ _debug(resolv, __FILE__, __func__, format, ## arg)
+
+static void _debug(GResolv *resolv, const char *file, const char *caller,
+ const char *format, ...)
{
char str[256];
va_list ap;
+ int len;
- if (resolv->debug_func == NULL)
+ if (!resolv->debug_func)
return;
va_start(ap, format);
- if (vsnprintf(str, sizeof(str), format, ap) > 0)
- resolv->debug_func(str, resolv->debug_data);
+ if ((len = snprintf(str, sizeof(str), "%s:%s() resolv %p ",
+ file, caller, resolv)) > 0) {
+ if (vsnprintf(str + len, sizeof(str) - len, format, ap) > 0)
+ resolv->debug_func(str, resolv->debug_data);
+ }
va_end(ap);
}
static void destroy_query(struct resolv_query *query)
{
+ debug(query->resolv, "query %p timeout %d", query, query->timeout);
+
if (query->timeout > 0)
g_source_remove(query->timeout);
static void destroy_lookup(struct resolv_lookup *lookup)
{
- if (lookup->ipv4_query != NULL) {
+ debug(lookup->resolv, "lookup %p id %d ipv4 %p ipv6 %p",
+ lookup, lookup->id, lookup->ipv4_query, lookup->ipv6_query);
+
+ if (lookup->ipv4_query) {
g_queue_remove(lookup->resolv->query_queue,
lookup->ipv4_query);
destroy_query(lookup->ipv4_query);
}
- if (lookup->ipv6_query != NULL) {
+ if (lookup->ipv6_query) {
g_queue_remove(lookup->resolv->query_queue,
lookup->ipv6_query);
destroy_query(lookup->ipv6_query);
socklen_t sl = sizeof(res->src);
int fd;
- fd = socket(res->dst.sa.sa_family, SOCK_DGRAM, IPPROTO_IP);
+ fd = socket(res->dst.sa.sa_family, SOCK_DGRAM | SOCK_CLOEXEC,
+ IPPROTO_IP);
if (fd < 0)
return;
- if (connect(fd, &res->dst.sa, sizeof(res->dst)) < 0) {
- close(fd);
- return;
- }
+ if (connect(fd, &res->dst.sa, sizeof(res->dst)) < 0)
+ goto out;
- if (getsockname(fd, &res->src.sa, &sl) < 0) {
- close(fd);
- return;
- }
+ if (getsockname(fd, &res->src.sa, &sl) < 0)
+ goto out;
- res->reachable = TRUE;
+ res->reachable = true;
+
+out:
close(fd);
}
static unsigned char v4mapped[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 };
-static gboolean mask_compare(const unsigned char *one,
+static bool mask_compare(const unsigned char *one,
const unsigned char *two, int mask)
{
if (mask > 8) {
if (memcmp(one, two, mask / 8))
- return FALSE;
+ return false;
one += mask / 8;
two += mask / 8;
mask %= 8;
}
if (mask && ((*one ^ *two) >> (8 - mask)))
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
static int match_gai_table(struct sockaddr *sa, const struct gai_table *tbl)
}
}
-#define DQUAD(_a,_b,_c,_d) ( ((_a)<<24) | ((_b)<<16) | ((_c)<<8) | (_d) )
+#define DQUAD(_a,_b,_c,_d) ( (((uint32_t)_a)<<24) | (((uint32_t)_b)<<16) | \
+ (((uint32_t)_c)<<8) | ((uint32_t)_d) )
#define V4MATCH(addr, a,b,c,d, m) ( ((addr) ^ DQUAD(a,b,c,d)) >> (32 - (m)) )
#define RFC3484_SCOPE_LINK 2
{
if (sa->sa_family == AF_INET) {
struct sockaddr_in *sin = (void *)sa;
- guint32 addr = ntohl(sin->sin_addr.s_addr);
+ uint32_t addr = ntohl(sin->sin_addr.s_addr);
if (V4MATCH(addr, 169,254,0,0, 16) ||
V4MATCH(addr, 127,0,0,0, 8))
char buf[INET6_ADDRSTRLEN + 1];
GResolvResultStatus status;
char **results = g_try_new0(char *, lookup->nr_results + 1);
+ GResolvResultFunc result_func = lookup->result_func;
+ void *result_data = lookup->result_data;
int i, n = 0;
if (!results)
for (i = 0; i < lookup->nr_results; i++) {
if (lookup->results[i].dst.sa.sa_family == AF_INET) {
- if (inet_ntop(AF_INET,
+ if (!inet_ntop(AF_INET,
&lookup->results[i].dst.sin.sin_addr,
- buf, sizeof(buf) - 1) == NULL)
+ buf, sizeof(buf) - 1))
continue;
} else if (lookup->results[i].dst.sa.sa_family == AF_INET6) {
- if (inet_ntop(AF_INET6,
+ if (!inet_ntop(AF_INET6,
&lookup->results[i].dst.sin6.sin6_addr,
- buf, sizeof(buf) - 1) == NULL)
+ buf, sizeof(buf) - 1))
continue;
} else
continue;
- results[n++] = strdup(buf);
+ results[n++] = g_strdup(buf);
}
results[n++] = NULL;
- status = lookup->ipv4_status;
-
- if (status == G_RESOLV_RESULT_STATUS_SUCCESS)
+ if (lookup->resolv->result_family == AF_INET)
+ status = lookup->ipv4_status;
+ else if (lookup->resolv->result_family == AF_INET6)
status = lookup->ipv6_status;
+ else {
+ if (lookup->ipv6_status == G_RESOLV_RESULT_STATUS_SUCCESS)
+ status = lookup->ipv6_status;
+ else
+ status = lookup->ipv4_status;
+ }
- lookup->result_func(status, results, lookup->result_data);
+ debug(lookup->resolv, "lookup %p received %d results", lookup, n-1);
- g_strfreev(results);
g_queue_remove(lookup->resolv->lookup_queue, lookup);
destroy_lookup(lookup);
+
+ result_func(status, results, result_data);
+
+ g_strfreev(results);
}
static gboolean query_timeout(gpointer user_data)
lookup->ipv6_query = NULL;
}
- if (lookup->ipv4_query == NULL && lookup->ipv4_query == NULL)
- sort_and_return_results(lookup);
-
- destroy_query(query);
g_queue_remove(resolv->query_queue, query);
+ destroy_query(query);
+
+ if (!lookup->ipv4_query && !lookup->ipv6_query)
+ sort_and_return_results(lookup);
return FALSE;
}
static void free_nameserver(struct resolv_nameserver *nameserver)
{
- if (nameserver == NULL)
+ if (!nameserver)
return;
if (nameserver->udp_watch > 0)
g_source_remove(nameserver->udp_watch);
- if (nameserver->udp_channel != NULL)
+ if (nameserver->udp_channel) {
+ g_io_channel_shutdown(nameserver->udp_channel, TRUE, NULL);
g_io_channel_unref(nameserver->udp_channel);
+ }
g_free(nameserver->address);
g_free(nameserver);
static int send_query(GResolv *resolv, const unsigned char *buf, int len)
{
GList *list;
+ int nr_ns;
- if (resolv->nameserver_list == NULL)
+ if (!resolv->nameserver_list)
return -ENOENT;
- for (list = g_list_first(resolv->nameserver_list);
- list; list = g_list_next(list)) {
+ for (list = g_list_first(resolv->nameserver_list), nr_ns = 0;
+ list; list = g_list_next(list), nr_ns++) {
struct resolv_nameserver *nameserver = list->data;
int sk, sent;
- if (nameserver->udp_channel == NULL)
+ if (!nameserver->udp_channel)
continue;
sk = g_io_channel_unix_get_fd(nameserver->udp_channel);
continue;
}
- return 0;
+ return nr_ns;
}
static gint compare_lookup_id(gconstpointer a, gconstpointer b)
const void *data)
{
int n = lookup->nr_results++;
- lookup->results = g_realloc(lookup->results,
+ lookup->results = g_try_realloc(lookup->results,
sizeof(struct sort_result) * (n + 1));
+ if (!lookup->results)
+ return;
memset(&lookup->results[n], 0, sizeof(struct sort_result));
debug(resolv, "response from %s", nameserver->address);
- ns_initparse(buf, len, &msg);
+ if (ns_initparse(buf, len, &msg) < 0)
+ return;
+
+ list = g_queue_find_custom(resolv->query_queue,
+ GUINT_TO_POINTER(ns_msg_id(msg)), compare_query_msgid);
+ if (!list)
+ return;
rcode = ns_msg_getflag(msg, ns_f_rcode);
count = ns_msg_count(msg, ns_s_an);
ns_msg_id(msg), rcode, count);
switch (rcode) {
- case 0:
- status = G_RESOLV_RESULT_STATUS_SUCCESS;
+ case ns_r_noerror:
+ if (count > 0)
+ status = G_RESOLV_RESULT_STATUS_SUCCESS;
+ else
+ status = G_RESOLV_RESULT_STATUS_NO_ANSWER;
break;
- case 1:
+ case ns_r_formerr:
status = G_RESOLV_RESULT_STATUS_FORMAT_ERROR;
break;
- case 2:
+ case ns_r_servfail:
status = G_RESOLV_RESULT_STATUS_SERVER_FAILURE;
break;
- case 3:
+ case ns_r_nxdomain:
status = G_RESOLV_RESULT_STATUS_NAME_ERROR;
break;
- case 4:
+ case ns_r_notimpl:
status = G_RESOLV_RESULT_STATUS_NOT_IMPLEMENTED;
break;
- case 5:
+ case ns_r_refused:
status = G_RESOLV_RESULT_STATUS_REFUSED;
break;
default:
break;
}
- list = g_queue_find_custom(resolv->query_queue,
- GUINT_TO_POINTER(ns_msg_id(msg)), compare_query_msgid);
- if (!list)
- return;
-
query = list->data;
+ query->nr_ns--;
+
lookup = query->lookup;
- if (query == lookup->ipv6_query) {
+ if (query == lookup->ipv6_query)
lookup->ipv6_status = status;
- lookup->ipv6_query = NULL;
- } else if (query == lookup->ipv4_query) {
+ else if (query == lookup->ipv4_query)
lookup->ipv4_status = status;
- lookup->ipv4_query = NULL;
- }
for (i = 0; i < count; i++) {
- ns_parserr(&msg, ns_s_an, i, &rr);
+ if (ns_parserr(&msg, ns_s_an, i, &rr) < 0)
+ continue;
if (ns_rr_class(rr) != ns_c_in)
continue;
}
}
- if (lookup->ipv4_query == NULL && lookup->ipv6_query == NULL)
- sort_and_return_results(lookup);
+ if (status != G_RESOLV_RESULT_STATUS_SUCCESS && query->nr_ns > 0)
+ return;
+
+ if (query == lookup->ipv6_query)
+ lookup->ipv6_query = NULL;
+ else
+ lookup->ipv4_query = NULL;
- destroy_query(query);
g_queue_remove(resolv->query_queue, query);
+ destroy_query(query);
+
+ if (!lookup->ipv4_query && !lookup->ipv6_query)
+ sort_and_return_results(lookup);
}
static gboolean received_udp_data(GIOChannel *channel, GIOCondition cond,
return -EIO;
}
+ /*
+ * If nameserver points to localhost ip, their is no need to
+ * bind the socket on any interface.
+ */
+ if (nameserver->resolv->index > 0 &&
+ strncmp(nameserver->address, "127.0.0.1", 9) != 0) {
+ char interface[IF_NAMESIZE];
+
+ memset(interface, 0, IF_NAMESIZE);
+ if (if_indextoname(nameserver->resolv->index, interface)) {
+ if (setsockopt(sk, SOL_SOCKET, SO_BINDTODEVICE,
+ interface, IF_NAMESIZE) < 0) {
+ close(sk);
+ freeaddrinfo(rp);
+ return -EIO;
+ }
+ }
+ }
+
if (connect(sk, rp->ai_addr, rp->ai_addrlen) < 0) {
close(sk);
freeaddrinfo(rp);
freeaddrinfo(rp);
nameserver->udp_channel = g_io_channel_unix_new(sk);
- if (nameserver->udp_channel == NULL) {
+ if (!nameserver->udp_channel) {
close(sk);
return -ENOMEM;
}
return NULL;
resolv = g_try_new0(GResolv, 1);
- if (resolv == NULL)
+ if (!resolv)
return NULL;
resolv->ref_count = 1;
resolv->next_lookup_id = 1;
resolv->query_queue = g_queue_new();
- if (resolv->query_queue == NULL) {
+ if (!resolv->query_queue) {
g_free(resolv);
return NULL;
}
resolv->lookup_queue = g_queue_new();
- if (resolv->lookup_queue == NULL) {
+ if (!resolv->lookup_queue) {
g_queue_free(resolv->query_queue);
g_free(resolv);
return NULL;
GResolv *g_resolv_ref(GResolv *resolv)
{
- if (resolv == NULL)
+ if (!resolv)
return NULL;
- g_atomic_int_inc(&resolv->ref_count);
+ __sync_fetch_and_add(&resolv->ref_count, 1);
return resolv;
}
void g_resolv_unref(GResolv *resolv)
{
struct resolv_query *query;
+ struct resolv_lookup *lookup;
- if (resolv == NULL)
+ if (!resolv)
return;
- if (g_atomic_int_dec_and_test(&resolv->ref_count) == FALSE)
+ if (__sync_fetch_and_sub(&resolv->ref_count, 1) != 1)
return;
- while ((query = g_queue_pop_head(resolv->query_queue)))
+ while ((lookup = g_queue_pop_head(resolv->lookup_queue))) {
+ debug(resolv, "lookup %p id %d", lookup, lookup->id);
+ destroy_lookup(lookup);
+ }
+
+ while ((query = g_queue_pop_head(resolv->query_queue))) {
+ debug(resolv, "query %p", query);
destroy_query(query);
+ }
g_queue_free(resolv->query_queue);
g_queue_free(resolv->lookup_queue);
void g_resolv_set_debug(GResolv *resolv, GResolvDebugFunc func,
gpointer user_data)
{
- if (resolv == NULL)
+ if (!resolv)
return;
resolv->debug_func = func;
resolv->debug_data = user_data;
}
-gboolean g_resolv_add_nameserver(GResolv *resolv, const char *address,
+bool g_resolv_add_nameserver(GResolv *resolv, const char *address,
uint16_t port, unsigned long flags)
{
struct resolv_nameserver *nameserver;
- if (resolv == NULL)
- return FALSE;
+ if (!resolv)
+ return false;
nameserver = g_try_new0(struct resolv_nameserver, 1);
- if (nameserver == NULL)
- return FALSE;
+ if (!nameserver)
+ return false;
nameserver->address = g_strdup(address);
nameserver->port = port;
nameserver->flags = flags;
+ nameserver->resolv = resolv;
if (connect_udp_channel(nameserver) < 0) {
free_nameserver(nameserver);
- return FALSE;
+ return false;
}
- nameserver->resolv = resolv;
-
resolv->nameserver_list = g_list_append(resolv->nameserver_list,
nameserver);
debug(resolv, "setting nameserver %s", address);
- return TRUE;
+ return true;
}
void g_resolv_flush_nameservers(GResolv *resolv)
{
- if (resolv == NULL)
+ if (!resolv)
return;
flush_nameservers(resolv);
unsigned char buf[4096];
int len;
- if (query == NULL)
+ if (!query)
return -ENOMEM;
len = res_mkquery(ns_o_query, hostname, ns_c_in, type,
query->msgid = buf[0] << 8 | buf[1];
- if (send_query(lookup->resolv, buf, len) < 0) {
+ debug(lookup->resolv, "sending %d bytes", len);
+
+ query->nr_ns = send_query(lookup->resolv, buf, len);
+ if (query->nr_ns <= 0) {
g_free(query);
return -EIO;
}
g_queue_push_tail(lookup->resolv->query_queue, query);
+ debug(lookup->resolv, "lookup %p id %d query %p", lookup, lookup->id,
+ query);
+
query->timeout = g_timeout_add_seconds(5, query_timeout, query);
if (type == ns_t_aaaa)
{
struct resolv_lookup *lookup;
- debug(resolv, "lookup hostname %s", hostname);
-
- if (resolv == NULL)
+ if (!resolv)
return 0;
- if (resolv->nameserver_list == NULL) {
+ debug(resolv, "hostname %s", hostname);
+
+ if (!resolv->nameserver_list) {
int i;
for (i = 0; i < resolv->res.nscount; i++) {
g_resolv_add_nameserver(resolv, buf, 53, 0);
}
- if (resolv->nameserver_list == NULL)
+ if (!resolv->nameserver_list)
g_resolv_add_nameserver(resolv, "127.0.0.1", 53, 0);
}
lookup = g_try_new0(struct resolv_lookup, 1);
- if (lookup == NULL)
+ if (!lookup)
return 0;
lookup->resolv = resolv;
if (resolv->result_family != AF_INET) {
if (add_query(lookup, hostname, ns_t_aaaa)) {
if (resolv->result_family != AF_INET6) {
- destroy_query(lookup->ipv4_query);
g_queue_remove(resolv->query_queue,
lookup->ipv4_query);
+ destroy_query(lookup->ipv4_query);
}
g_free(lookup);
}
g_queue_push_tail(resolv->lookup_queue, lookup);
+
+ debug(resolv, "lookup %p id %d", lookup, lookup->id);
+
return lookup->id;
}
-gboolean g_resolv_cancel_lookup(GResolv *resolv, guint id)
+bool g_resolv_cancel_lookup(GResolv *resolv, guint id)
{
+ struct resolv_lookup *lookup;
GList *list;
+ debug(resolv, "lookup id %d", id);
+
list = g_queue_find_custom(resolv->lookup_queue,
GUINT_TO_POINTER(id), compare_lookup_id);
- if (list == NULL)
- return FALSE;
+ if (!list)
+ return false;
- destroy_lookup(list->data);
- g_queue_remove(resolv->query_queue, list->data);
+ lookup = list->data;
- return TRUE;
+ debug(resolv, "lookup %p", lookup);
+
+ g_queue_remove(resolv->lookup_queue, lookup);
+ destroy_lookup(lookup);
+
+ return true;
}
-gboolean g_resolv_set_address_family(GResolv *resolv, int family)
+bool g_resolv_set_address_family(GResolv *resolv, int family)
{
- if (resolv == NULL)
- return FALSE;
+ if (!resolv)
+ return false;
if (family != AF_UNSPEC && family != AF_INET && family != AF_INET6)
- return FALSE;
+ return false;
resolv->result_family = family;
- return TRUE;
+ return true;
}
projects / platform / upstream / connman.git / blobdiff