WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
#include "gnunet_statistics_service.h"
#include "resolver.h"
+
+/**
+ * How long do we wait for DNS answers?
+ */
+#define DNS_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+
+/**
+ * Maximum number of hostnames we cache results for.
+ */
+#define MAX_CACHE 1024
+
/**
- * A cached DNS lookup result (for reverse lookup).
+ * Entry in list of cached DNS records for a hostname.
*/
-struct IPCache
+struct RecordListEntry
{
/**
* This is a doubly linked list.
*/
- struct IPCache *next;
+ struct RecordListEntry *next;
/**
* This is a doubly linked list.
*/
- struct IPCache *prev;
+ struct RecordListEntry *prev;
+
+ /**
+ * Cached data.
+ */
+ struct GNUNET_DNSPARSER_Record *record;
+
+};
+
+/**
+ * A cached DNS lookup result.
+ */
+struct ResolveCache
+{
/**
- * Hostname in human-readable form.
+ * This is a doubly linked list.
*/
- char *addr;
+ struct ResolveCache *next;
/**
- * Binary IP address, allocated at the end of this struct.
+ * This is a doubly linked list.
*/
- const void *ip;
+ struct ResolveCache *prev;
/**
- * Last time this entry was updated.
+ * Which hostname is this cache for?
*/
- struct GNUNET_TIME_Absolute last_refresh;
+ char *hostname;
/**
- * Last time this entry was requested.
+ * head of a double linked list containing the lookup results
*/
- struct GNUNET_TIME_Absolute last_request;
+ struct RecordListEntry *records_head;
/**
- * Number of bytes in ip.
+ * tail of a double linked list containing the lookup results
*/
- size_t ip_len;
+ struct RecordListEntry *records_tail;
+
+};
+
+/**
+ * Information about pending lookups.
+ */
+struct ActiveLookup
+{
/**
- * Address family of the IP.
+ * Stored in a DLL.
*/
- int af;
+ struct ActiveLookup *next;
+
+ /**
+ * Stored in a DLL.
+ */
+ struct ActiveLookup *prev;
+
+ /**
+ * The client that queried the records contained in this cache entry.
+ */
+ struct GNUNET_SERVICE_Client *client;
+
+ /**
+ * handle for cancelling a request
+ */
+ struct GNUNET_DNSSTUB_RequestSocket *resolve_handle;
+
+ /**
+ * handle for the resolution timeout task
+ */
+ struct GNUNET_SCHEDULER_Task *timeout_task;
+
+ /**
+ * Which hostname are we resolving?
+ */
+ char *hostname;
+
+ /**
+ * If @a record_type is #GNUNET_DNSPARSER_TYPE_ALL, did we go again
+ * for the AAAA records yet?
+ */
+ int did_aaaa;
+
+ /**
+ * type of queried DNS record
+ */
+ uint16_t record_type;
+
+ /**
+ * Unique request ID of a client if a query for this hostname/record_type
+ * is currently pending, undefined otherwise.
+ */
+ uint32_t client_request_id;
+
+ /**
+ * Unique DNS request ID of a client if a query for this hostname/record_type
+ * is currently pending, undefined otherwise.
+ */
+ uint16_t dns_id;
+
};
/**
* Start of the linked list of cached DNS lookup results.
*/
-static struct IPCache *cache_head;
+static struct ResolveCache *cache_head;
/**
* Tail of the linked list of cached DNS lookup results.
*/
-static struct IPCache *cache_tail;
+static struct ResolveCache *cache_tail;
+/**
+ * Head of the linked list of DNS lookup results from /etc/hosts.
+ */
+static struct ResolveCache *hosts_head;
+
+/**
+ * Tail of the linked list of DNS lookup results from /etc/hosts.
+ */
+static struct ResolveCache *hosts_tail;
+
+/**
+ * Start of the linked list of active DNS lookups.
+ */
+static struct ActiveLookup *lookup_head;
+
+/**
+ * Tail of the linked list of active DNS lookups.
+ */
+static struct ActiveLookup *lookup_tail;
+
+/**
+ * context of dnsstub library
+ */
+static struct GNUNET_DNSSTUB_Context *dnsstub_ctx;
-#if HAVE_GETNAMEINFO
/**
- * Resolve the given request using getnameinfo
+ * My domain, to be appended to the hostname to get a FQDN.
+ */
+static char *my_domain;
+
+/**
+ * How many entries do we have in #cache_head DLL?
+ */
+static unsigned int cache_size;
+
+
+/**
+ * Remove @a entry from cache.
*
- * @param cache the request to resolve (and where to store the result)
+ * @param rc entry to free
*/
static void
-getnameinfo_resolve (struct IPCache *cache)
+free_cache_entry (struct ResolveCache *rc)
{
- char hostname[256];
- const struct sockaddr *sa;
- struct sockaddr_in v4;
- struct sockaddr_in6 v6;
- size_t salen;
- int ret;
-
- switch (cache->af)
- {
- case AF_INET:
- GNUNET_assert (cache->ip_len == sizeof (struct in_addr));
- sa = (const struct sockaddr*) &v4;
- memset (&v4, 0, sizeof (v4));
- v4.sin_addr = * (const struct in_addr*) cache->ip;
- v4.sin_family = AF_INET;
-#if HAVE_SOCKADDR_IN_SIN_LEN
- v4.sin_len = sizeof (v4);
-#endif
- salen = sizeof (v4);
- break;
- case AF_INET6:
- GNUNET_assert (cache->ip_len == sizeof (struct in6_addr));
- sa = (const struct sockaddr*) &v6;
- memset (&v6, 0, sizeof (v6));
- v6.sin6_addr = * (const struct in6_addr*) cache->ip;
- v6.sin6_family = AF_INET6;
-#if HAVE_SOCKADDR_IN_SIN_LEN
- v6.sin6_len = sizeof (v6);
-#endif
- salen = sizeof (v6);
- break;
- default:
- GNUNET_assert (0);
- }
+ struct RecordListEntry *pos;
- if (0 ==
- (ret = getnameinfo (sa, salen,
- hostname, sizeof (hostname),
- NULL,
- 0, 0)))
+ while (NULL != (pos = rc->records_head))
{
- cache->addr = GNUNET_strdup (hostname);
+ GNUNET_CONTAINER_DLL_remove (rc->records_head,
+ rc->records_tail,
+ pos);
+ GNUNET_DNSPARSER_free_record (pos->record);
+ GNUNET_free (pos->record);
+ GNUNET_free (pos);
}
- else
+ GNUNET_free_non_null (rc->hostname);
+ GNUNET_CONTAINER_DLL_remove (cache_head,
+ cache_tail,
+ rc);
+ cache_size--;
+ GNUNET_free (rc);
+}
+
+
+/**
+ * Remove @a entry from cache.
+ *
+ * @param rc entry to free
+ */
+static void
+free_hosts_entry (struct ResolveCache *rc)
+{
+ struct RecordListEntry *pos;
+
+ while (NULL != (pos = rc->records_head))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "getnameinfo failed: %s\n",
- gai_strerror (ret));
+ GNUNET_CONTAINER_DLL_remove (rc->records_head,
+ rc->records_tail,
+ pos);
+ GNUNET_DNSPARSER_free_record (pos->record);
+ GNUNET_free (pos->record);
+ GNUNET_free (pos);
}
+ GNUNET_free_non_null (rc->hostname);
+ GNUNET_CONTAINER_DLL_remove (hosts_head,
+ hosts_tail,
+ rc);
+ cache_size--;
+ GNUNET_free (rc);
}
-#endif
-#if HAVE_GETHOSTBYADDR
/**
- * Resolve the given request using gethostbyaddr
+ * Release resources associated with @a al
*
- * @param cache the request to resolve (and where to store the result)
+ * @param al an active lookup
*/
static void
-gethostbyaddr_resolve (struct IPCache *cache)
+free_active_lookup (struct ActiveLookup *al)
{
- struct hostent *ent;
-
- ent = gethostbyaddr (cache->ip,
- cache->ip_len,
- cache->af);
- if (NULL != ent)
+ GNUNET_CONTAINER_DLL_remove (lookup_head,
+ lookup_tail,
+ al);
+ if (NULL != al->resolve_handle)
{
- cache->addr = GNUNET_strdup (ent->h_name);
+ GNUNET_DNSSTUB_resolve_cancel (al->resolve_handle);
+ al->resolve_handle = NULL;
}
- else
+ if (NULL != al->timeout_task)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "gethostbyaddr failed: %s\n",
- hstrerror (h_errno));
+ GNUNET_SCHEDULER_cancel (al->timeout_task);
+ al->timeout_task = NULL;
}
+ GNUNET_free_non_null (al->hostname);
+ GNUNET_free (al);
}
-#endif
+
/**
- * Resolve the given request using the available methods.
+ * Find out if the configuration file line contains a string
+ * starting with "nameserver ", and if so, return a copy of
+ * the nameserver's IP.
*
- * @param cache the request to resolve (and where to store the result)
+ * @param line line to parse
+ * @param line_len number of characters in @a line
+ * @return NULL if no nameserver is configured in this @a line
*/
-static void
-cache_resolve (struct IPCache *cache)
+static char *
+extract_dns_server (const char* line,
+ size_t line_len)
{
-#if HAVE_GETNAMEINFO
- if (NULL == cache->addr)
- getnameinfo_resolve (cache);
-#endif
-#if HAVE_GETHOSTBYADDR
- if (NULL == cache->addr)
- gethostbyaddr_resolve (cache);
-#endif
+ if (0 == strncmp (line,
+ "nameserver ",
+ strlen ("nameserver ")))
+ return GNUNET_strndup (line + strlen ("nameserver "),
+ line_len - strlen ("nameserver "));
+ return NULL;
}
/**
- * Function called after the replies for the request have all
- * been transmitted to the client, and we can now read the next
- * request from the client.
+ * Find out if the configuration file line contains a string
+ * starting with "search ", and if so, return a copy of
+ * the machine's search domain.
*
- * @param cls the `struct GNUNET_SERVICE_Client` to continue with
+ * @param line line to parse
+ * @param line_len number of characters in @a line
+ * @return NULL if no nameserver is configured in this @a line
*/
-static void
-notify_service_client_done (void *cls)
+static char *
+extract_search_domain (const char* line,
+ size_t line_len)
{
- struct GNUNET_SERVICE_Client *client = cls;
+ if (0 == strncmp (line,
+ "search ",
+ strlen ("search ")))
+ return GNUNET_strndup (line + strlen ("search "),
+ line_len - strlen ("search "));
+ return NULL;
+}
- GNUNET_SERVICE_client_continue (client);
+
+/**
+ * Reads the list of nameservers from /etc/resolve.conf
+ *
+ * @param server_addrs[out] a list of null-terminated server address strings
+ * @return the number of server addresses in @server_addrs, -1 on error
+ */
+static int
+lookup_dns_servers (char ***server_addrs)
+{
+ struct GNUNET_DISK_FileHandle *fh;
+ struct GNUNET_DISK_MapHandle *mh;
+ off_t bytes_read;
+ const char *buf;
+ size_t read_offset;
+ unsigned int num_dns_servers;
+
+ fh = GNUNET_DISK_file_open ("/etc/resolv.conf",
+ GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_PERM_NONE);
+ if (NULL == fh)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not open /etc/resolv.conf. "
+ "DNS resolution will not be possible.\n");
+ return -1;
+ }
+ if (GNUNET_OK !=
+ GNUNET_DISK_file_handle_size (fh,
+ &bytes_read))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not determine size of /etc/resolv.conf. "
+ "DNS resolution will not be possible.\n");
+ GNUNET_DISK_file_close (fh);
+ return -1;
+ }
+ if ((size_t) bytes_read > SIZE_MAX)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "/etc/resolv.conf file too large to mmap. "
+ "DNS resolution will not be possible.\n");
+ GNUNET_DISK_file_close (fh);
+ return -1;
+ }
+ buf = GNUNET_DISK_file_map (fh,
+ &mh,
+ GNUNET_DISK_MAP_TYPE_READ,
+ (size_t) bytes_read);
+ *server_addrs = NULL;
+ read_offset = 0;
+ num_dns_servers = 0;
+ while (read_offset < (size_t) bytes_read)
+ {
+ const char *newline;
+ size_t line_len;
+ char *dns_server;
+
+ newline = strchr (buf + read_offset,
+ '\n');
+ if (NULL == newline)
+ break;
+ line_len = newline - buf - read_offset;
+ dns_server = extract_dns_server (buf + read_offset,
+ line_len);
+ if (NULL != dns_server)
+ {
+ GNUNET_array_append (*server_addrs,
+ num_dns_servers,
+ dns_server);
+ }
+ else if (NULL == my_domain)
+ {
+ my_domain = extract_search_domain (buf + read_offset,
+ line_len);
+ }
+ read_offset += line_len + 1;
+ }
+ GNUNET_DISK_file_unmap (mh);
+ GNUNET_DISK_file_close (fh);
+ return (int) num_dns_servers;
}
/**
- * Get an IP address as a string (works for both IPv4 and IPv6). Note
- * that the resolution happens asynchronously and that the first call
- * may not immediately result in the FQN (but instead in a
- * human-readable IP address).
+ * Compute name to use for DNS reverse lookups from @a ip.
*
- * @param client handle to the client making the request (for sending the reply)
- * @param af AF_INET or AF_INET6
- * @param ip `struct in_addr` or `struct in6_addr`
+ * @param ip IP address to resolve, in binary format, network byte order
+ * @param af address family of @a ip, AF_INET or AF_INET6
*/
-static void
-get_ip_as_string (struct GNUNET_SERVICE_Client *client,
- int af,
- const void *ip)
+static char *
+make_reverse_hostname (const void *ip,
+ int af)
{
- struct IPCache *pos;
- struct IPCache *next;
- struct GNUNET_TIME_Absolute now;
- struct GNUNET_MQ_Envelope *env;
- struct GNUNET_MQ_Handle *mq;
- struct GNUNET_MessageHeader *msg;
- size_t ip_len;
- struct in6_addr ix;
- size_t alen;
+ char *buf = GNUNET_new_array (80,
+ char);
+ int pos = 0;
- switch (af)
+ if (AF_INET == af)
{
- case AF_INET:
- ip_len = sizeof (struct in_addr);
- break;
- case AF_INET6:
- ip_len = sizeof (struct in6_addr);
- break;
- default:
- GNUNET_assert (0);
- }
- now = GNUNET_TIME_absolute_get ();
- next = cache_head;
- while ( (NULL != (pos = next)) &&
- ( (pos->af != af) ||
- (pos->ip_len != ip_len) ||
- (0 != memcmp (pos->ip, ip, ip_len))) )
- {
- next = pos->next;
- if (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value_us <
- 60 * 60 * 1000 * 1000LL)
+ struct in_addr *addr = (struct in_addr *)ip;
+ uint32_t ip_int = addr->s_addr;
+
+ for (int i = 3; i >= 0; i--)
{
- GNUNET_CONTAINER_DLL_remove (cache_head,
- cache_tail,
- pos);
- GNUNET_free_non_null (pos->addr);
- GNUNET_free (pos);
- continue;
+ int n = GNUNET_snprintf (buf + pos,
+ 80 - pos,
+ "%u.",
+ ((uint8_t *)&ip_int)[i]);
+ if (n < 0)
+ {
+ GNUNET_free (buf);
+ return NULL;
+ }
+ pos += n;
}
+ pos += GNUNET_snprintf (buf + pos,
+ 80 - pos,
+ "in-addr.arpa");
}
- if (NULL != pos)
+ else if (AF_INET6 == af)
{
- if ( (1 == inet_pton (af,
- pos->ip,
- &ix)) &&
- (GNUNET_TIME_absolute_get_duration (pos->last_request).rel_value_us >
- 120 * 1000 * 1000LL) )
+ struct in6_addr *addr = (struct in6_addr *)ip;
+ for (int i = 15; i >= 0; i--)
{
- /* try again if still numeric AND 2 minutes have expired */
- GNUNET_free_non_null (pos->addr);
- pos->addr = NULL;
- cache_resolve (pos);
- pos->last_request = now;
+ int n = GNUNET_snprintf (buf + pos,
+ 80 - pos,
+ "%x.",
+ addr->s6_addr[i] & 0xf);
+ if (n < 0)
+ {
+ GNUNET_free (buf);
+ return NULL;
+ }
+ pos += n;
+ n = GNUNET_snprintf (buf + pos,
+ 80 - pos,
+ "%x.",
+ addr->s6_addr[i] >> 4);
+ if (n < 0)
+ {
+ GNUNET_free (buf);
+ return NULL;
+ }
+ pos += n;
}
+ pos += GNUNET_snprintf (buf + pos,
+ 80 - pos,
+ "ip6.arpa");
}
- else
+ buf[pos] = '\0';
+ return buf;
+}
+
+
+/**
+ * Send DNS @a record back to our @a client.
+ *
+ * @param record information to transmit
+ * @param record_type requested record type from client
+ * @param client_request_id to which request are we responding
+ * @param client where to send @a record
+ * @return #GNUNET_YES if we sent a reply,
+ * #GNUNET_NO if the record type is not understood or
+ * does not match @a record_type
+ */
+static int
+send_reply (struct GNUNET_DNSPARSER_Record *record,
+ uint16_t record_type,
+ uint32_t client_request_id,
+ struct GNUNET_SERVICE_Client *client)
+{
+ struct GNUNET_RESOLVER_ResponseMessage *msg;
+ struct GNUNET_MQ_Envelope *env;
+ const void *payload;
+ size_t payload_len;
+
+ switch (record->type)
{
- pos = GNUNET_malloc (sizeof (struct IPCache) + ip_len);
- pos->ip = &pos[1];
- GNUNET_memcpy (&pos[1],
- ip,
- ip_len);
- pos->last_request = now;
- pos->last_refresh = now;
- pos->ip_len = ip_len;
- pos->af = af;
- GNUNET_CONTAINER_DLL_insert (cache_head,
- cache_tail,
- pos);
- cache_resolve (pos);
+ case GNUNET_DNSPARSER_TYPE_CNAME:
+ if (GNUNET_DNSPARSER_TYPE_CNAME != record_type)
+ return GNUNET_NO;
+ payload = record->data.hostname;
+ payload_len = strlen (record->data.hostname) + 1;
+ break;
+ case GNUNET_DNSPARSER_TYPE_PTR:
+ if (GNUNET_DNSPARSER_TYPE_PTR != record_type)
+ return GNUNET_NO;
+ payload = record->data.hostname;
+ payload_len = strlen (record->data.hostname) + 1;
+ break;
+ case GNUNET_DNSPARSER_TYPE_A:
+ if ( (GNUNET_DNSPARSER_TYPE_A != record_type) &&
+ (GNUNET_DNSPARSER_TYPE_ALL != record_type) )
+ return GNUNET_NO;
+ payload = record->data.raw.data;
+ payload_len = record->data.raw.data_len;
+ break;
+ case GNUNET_DNSPARSER_TYPE_AAAA:
+ if ( (GNUNET_DNSPARSER_TYPE_AAAA != record_type) &&
+ (GNUNET_DNSPARSER_TYPE_ALL != record_type) )
+ return GNUNET_NO;
+ payload = record->data.raw.data;
+ payload_len = record->data.raw.data_len;
+ break;
+ default:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Cannot handle DNS response type %u: not supported here\n",
+ record->type);
+ return GNUNET_NO;
}
- if (NULL != pos->addr)
- alen = strlen (pos->addr) + 1;
- else
- alen = 0;
- mq = GNUNET_SERVICE_client_get_mq (client);
env = GNUNET_MQ_msg_extra (msg,
- alen,
- GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+ payload_len,
+ GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+ msg->client_id = client_request_id;
GNUNET_memcpy (&msg[1],
- pos->addr,
- alen);
- GNUNET_MQ_send (mq,
- env);
- env = GNUNET_MQ_msg (msg,
- GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
- GNUNET_MQ_notify_sent (env,
- ¬ify_service_client_done,
- client);
- GNUNET_MQ_send (mq,
- env);
+ payload,
+ payload_len);
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
+ return GNUNET_YES;
}
-#if HAVE_GETADDRINFO
-static int
-getaddrinfo_resolve (struct GNUNET_MQ_Handle *mq,
- const char *hostname,
- int af)
+/**
+ * Send message to @a client that we transmitted all
+ * responses for @a client_request_id
+ *
+ * @param client_request_id to which request are we responding
+ * @param client where to send @a record
+ */
+static void
+send_end_msg (uint32_t client_request_id,
+ struct GNUNET_SERVICE_Client *client)
{
- int s;
- struct addrinfo hints;
- struct addrinfo *result;
- struct addrinfo *pos;
- struct GNUNET_MessageHeader *msg;
+ struct GNUNET_RESOLVER_ResponseMessage *msg;
struct GNUNET_MQ_Envelope *env;
-#ifdef WINDOWS
- /* Due to a bug, getaddrinfo will not return a mix of different families */
- if (AF_UNSPEC == af)
- {
- int ret1;
- int ret2;
- ret1 = getaddrinfo_resolve (mq,
- hostname,
- AF_INET);
- ret2 = getaddrinfo_resolve (mq,
- hostname,
- AF_INET6);
- if ( (ret1 == GNUNET_OK) ||
- (ret2 == GNUNET_OK) )
- return GNUNET_OK;
- if ( (ret1 == GNUNET_SYSERR) ||
- (ret2 == GNUNET_SYSERR) )
- return GNUNET_SYSERR;
- return GNUNET_NO;
- }
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending END message\n");
+ env = GNUNET_MQ_msg (msg,
+ GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
+ msg->client_id = client_request_id;
+ GNUNET_MQ_send (GNUNET_SERVICE_client_get_mq (client),
+ env);
+}
- memset (&hints,
- 0,
- sizeof (struct addrinfo));
- hints.ai_family = af;
- hints.ai_socktype = SOCK_STREAM; /* go for TCP */
- if (0 != (s = getaddrinfo (hostname,
- NULL,
- &hints,
- &result)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Could not resolve `%s' (%s): %s\n"),
- hostname,
- (af ==
- AF_INET) ? "IPv4" : ((af == AF_INET6) ? "IPv6" : "any"),
- gai_strerror (s));
- if ( (s == EAI_BADFLAGS) ||
-#ifndef WINDOWS
- (s == EAI_SYSTEM) ||
-#endif
- (s == EAI_MEMORY) )
- return GNUNET_NO; /* other function may still succeed */
- return GNUNET_SYSERR;
- }
- if (NULL == result)
- return GNUNET_SYSERR;
- for (pos = result; pos != NULL; pos = pos->ai_next)
+/**
+ * Remove expired entries from @a rc
+ *
+ * @param rc entry in resolver cache
+ * @return #GNUNET_YES if @a rc was completely expired
+ * #GNUNET_NO if some entries are left
+ */
+static int
+remove_expired (struct ResolveCache *rc)
+{
+ struct GNUNET_TIME_Absolute now = GNUNET_TIME_absolute_get ();
+ struct RecordListEntry *n;
+
+ for (struct RecordListEntry *pos = rc->records_head;
+ NULL != pos;
+ pos = n)
{
- switch (pos->ai_family)
+ n = pos->next;
+ if (now.abs_value_us > pos->record->expiration_time.abs_value_us)
{
- case AF_INET:
- env = GNUNET_MQ_msg_extra (msg,
- sizeof (struct in_addr),
- GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
- GNUNET_memcpy (&msg[1],
- &((struct sockaddr_in*) pos->ai_addr)->sin_addr,
- sizeof (struct in_addr));
- GNUNET_MQ_send (mq,
- env);
- break;
- case AF_INET6:
- env = GNUNET_MQ_msg_extra (msg,
- sizeof (struct in6_addr),
- GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
- GNUNET_memcpy (&msg[1],
- &((struct sockaddr_in6*) pos->ai_addr)->sin6_addr,
- sizeof (struct in6_addr));
- GNUNET_MQ_send (mq,
- env);
- break;
- default:
- /* unsupported, skip */
- break;
+ GNUNET_CONTAINER_DLL_remove (rc->records_head,
+ rc->records_tail,
+ pos);
+ GNUNET_DNSPARSER_free_record (pos->record);
+ GNUNET_free (pos->record);
+ GNUNET_free (pos);
}
}
- freeaddrinfo (result);
- return GNUNET_OK;
+ if (NULL == rc->records_head)
+ {
+ free_cache_entry (rc);
+ return GNUNET_YES;
+ }
+ return GNUNET_NO;
}
-#elif HAVE_GETHOSTBYNAME2
+/**
+ * Process DNS request for @a hostname with request ID @a request_id
+ * from @a client demanding records of type @a record_type.
+ *
+ * @param hostname DNS name to resolve
+ * @param record_type desired record type
+ * @param client_request_id client's request ID
+ * @param client who should get the result?
+ */
+static void
+process_get (const char *hostname,
+ uint16_t record_type,
+ uint32_t client_request_id,
+ struct GNUNET_SERVICE_Client *client);
+/**
+ * Get an IP address as a string (works for both IPv4 and IPv6). Note
+ * that the resolution happens asynchronously and that the first call
+ * may not immediately result in the FQN (but instead in a
+ * human-readable IP address).
+ *
+ * @param hostname what hostname was to be resolved
+ * @param record_type what type of record was requested
+ * @param client_request_id unique identification of the client's request
+ * @param client handle to the client making the request (for sending the reply)
+ */
static int
-gethostbyname2_resolve (struct GNUNET_MQ_Handle *mq,
- const char *hostname,
- int af)
+try_cache (const char *hostname,
+ uint16_t record_type,
+ uint32_t client_request_id,
+ struct GNUNET_SERVICE_Client *client)
{
- struct hostent *hp;
- int ret1;
- int ret2;
- struct GNUNET_MQ_Envelope *env;
- struct GNUNET_MessageHeader *msg;
-
-#ifdef WINDOWS
- /* gethostbyname2() in plibc is a compat dummy that calls gethostbyname(). */
- return GNUNET_NO;
-#endif
-
- if (af == AF_UNSPEC)
- {
- ret1 = gethostbyname2_resolve (mq,
- hostname,
- AF_INET);
- ret2 = gethostbyname2_resolve (mq,
- hostname,
- AF_INET6);
- if ( (ret1 == GNUNET_OK) ||
- (ret2 == GNUNET_OK) )
- return GNUNET_OK;
- if ( (ret1 == GNUNET_SYSERR) ||
- (ret2 == GNUNET_SYSERR) )
- return GNUNET_SYSERR;
+ struct ResolveCache *pos;
+ struct ResolveCache *next;
+ int found;
+ int in_hosts;
+
+ in_hosts = GNUNET_NO;
+ for (pos = hosts_head; NULL != pos; pos = pos->next)
+ if (0 == strcmp (pos->hostname,
+ hostname))
+ {
+ in_hosts = GNUNET_YES;
+ break;
+ }
+ if (NULL == pos)
+ {
+ next = cache_head;
+ for (pos = next; NULL != pos; pos = next)
+ {
+ next = pos->next;
+ if (GNUNET_YES == remove_expired (pos))
+ continue;
+ if (0 == strcmp (pos->hostname,
+ hostname))
+ break;
+ }
+ }
+ if (NULL == pos)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "No cache entry for '%s'\n",
+ hostname);
return GNUNET_NO;
}
- hp = gethostbyname2 (hostname,
- af);
- if (hp == NULL)
+ if ( (GNUNET_NO == in_hosts) &&
+ (cache_head != pos) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Could not find IP of host `%s': %s\n"),
- hostname,
- hstrerror (h_errno));
- return GNUNET_SYSERR;
+ /* move result to head to achieve LRU for cache eviction */
+ GNUNET_CONTAINER_DLL_remove (cache_head,
+ cache_tail,
+ pos);
+ GNUNET_CONTAINER_DLL_insert (cache_head,
+ cache_tail,
+ pos);
}
- GNUNET_assert (hp->h_addrtype == af);
- switch (af)
+ found = GNUNET_NO;
+ for (struct RecordListEntry *rle = pos->records_head;
+ NULL != rle;
+ rle = rle->next)
{
- case AF_INET:
- GNUNET_assert (hp->h_length == sizeof (struct in_addr));
- env = GNUNET_MQ_msg_extra (msg,
- hp->h_length,
- GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
- GNUNET_memcpy (&msg[1],
- hp->h_addr_list[0],
- hp->h_length);
- GNUNET_MQ_send (mq,
- env);
- break;
- case AF_INET6:
- GNUNET_assert (hp->h_length == sizeof (struct in6_addr));
- env = GNUNET_MQ_msg_extra (msg,
- hp->h_length,
- GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
- GNUNET_memcpy (&msg[1],
- hp->h_addr_list[0],
- hp->h_length);
- GNUNET_MQ_send (mq,
- env);
- break;
- default:
- GNUNET_break (0);
+ const struct GNUNET_DNSPARSER_Record *record = rle->record;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Found cache entry for '%s', record type '%u'\n",
+ hostname,
+ record_type);
+ if ( (GNUNET_DNSPARSER_TYPE_CNAME == record->type) &&
+ (GNUNET_DNSPARSER_TYPE_CNAME != record_type) &&
+ (GNUNET_NO == found) )
+ {
+ const char *hostname = record->data.hostname;
+
+ process_get (hostname,
+ record_type,
+ client_request_id,
+ client);
+ return GNUNET_YES; /* counts as a cache "hit" */
+ }
+ found |= send_reply (rle->record,
+ record_type,
+ client_request_id,
+ client);
+ }
+ if (GNUNET_NO == found)
+ return GNUNET_NO; /* had records, but none matched! */
+ send_end_msg (client_request_id,
+ client);
+ return GNUNET_YES;
+}
+
+
+/**
+ * Create DNS query for @a hostname of type @a type
+ * with DNS request ID @a dns_id.
+ *
+ * @param hostname DNS name to query
+ * @param type requested DNS record type
+ * @param dns_id what should be the DNS request ID
+ * @param packet_buf[out] where to write the request packet
+ * @param packet_size[out] set to size of @a packet_buf on success
+ * @return #GNUNET_OK on success
+ */
+static int
+pack (const char *hostname,
+ uint16_t type,
+ uint16_t dns_id,
+ char **packet_buf,
+ size_t *packet_size)
+{
+ struct GNUNET_DNSPARSER_Query query;
+ struct GNUNET_DNSPARSER_Packet packet;
+
+ query.name = (char *)hostname;
+ query.type = type;
+ query.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
+ memset (&packet,
+ 0,
+ sizeof (packet));
+ packet.num_queries = 1;
+ packet.queries = &query;
+ packet.id = htons (dns_id);
+ packet.flags.recursion_desired = 1;
+ if (GNUNET_OK !=
+ GNUNET_DNSPARSER_pack (&packet,
+ UINT16_MAX,
+ packet_buf,
+ packet_size))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to pack query for hostname `%s'\n",
+ hostname);
+ packet_buf = NULL;
return GNUNET_SYSERR;
}
return GNUNET_OK;
}
-#elif HAVE_GETHOSTBYNAME
+static void
+cache_answers(const char* name,
+ struct GNUNET_DNSPARSER_Record *records,
+ unsigned int num_records)
+{
+ struct ResolveCache *rc;
+ struct GNUNET_DNSPARSER_Record *record;
+ struct RecordListEntry *rle;
+ for (unsigned int i = 0; i != num_records; i++)
+ {
+ record = &records[i];
-static int
-gethostbyname_resolve (struct GNUNET_MQ_Handle *mq,
- const char *hostname)
+ for (rc = cache_head; NULL != rc; rc = rc->next)
+ if (0 == strcasecmp (rc->hostname,
+ name))
+ break;
+ if (NULL == rc)
+ {
+ rc = GNUNET_new (struct ResolveCache);
+ rc->hostname = GNUNET_strdup (name);
+ GNUNET_CONTAINER_DLL_insert (cache_head,
+ cache_tail,
+ rc);
+ cache_size++;
+ }
+ /* TODO: ought to check first if we have this exact record
+ already in the cache! */
+ rle = GNUNET_new (struct RecordListEntry);
+ rle->record = GNUNET_DNSPARSER_duplicate_record (record);
+ GNUNET_CONTAINER_DLL_insert (rc->records_head,
+ rc->records_tail,
+ rle);
+ }
+}
+
+/**
+ * We got a result from DNS. Add it to the cache and
+ * see if we can make our client happy...
+ *
+ * @param cls the `struct ActiveLookup`
+ * @param dns the DNS response
+ * @param dns_len number of bytes in @a dns
+ */
+static void
+handle_resolve_result (void *cls,
+ const struct GNUNET_TUN_DnsHeader *dns,
+ size_t dns_len)
{
- struct hostent *hp;
- struct GNUNET_MessageHeader *msg;
- struct GNUNET_MQ_Envelope *env;
+ struct ActiveLookup *al = cls;
+ struct GNUNET_DNSPARSER_Packet *parsed;
- hp = GETHOSTBYNAME (hostname);
- if (NULL == hp)
+ parsed = GNUNET_DNSPARSER_parse ((const char *)dns,
+ dns_len);
+ if (NULL == parsed)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Could not find IP of host `%s': %s\n"),
- hostname,
- hstrerror (h_errno));
- return GNUNET_SYSERR;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to parse DNS reply (hostname %s, request ID %u)\n",
+ al->hostname,
+ al->dns_id);
+ return;
}
- if (hp->h_addrtype != AF_INET)
+ if (al->dns_id != ntohs (parsed->id))
{
- GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Request ID in DNS reply does not match\n");
+ GNUNET_DNSPARSER_free_packet (parsed);
+ return;
+ }
+ if (0 == parsed->num_answers + parsed->num_authority_records + parsed->num_additional_records)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "DNS reply (hostname %s, request ID %u) contains no answers\n",
+ al->hostname,
+ (unsigned int) al->client_request_id);
+ /* resume by trying again from cache */
+ if (GNUNET_NO ==
+ try_cache (al->hostname,
+ al->record_type,
+ al->client_request_id,
+ al->client))
+ /* cache failed, tell client we could not get an answer */
+ {
+ send_end_msg (al->client_request_id,
+ al->client);
+ }
+ GNUNET_DNSPARSER_free_packet (parsed);
+ free_active_lookup (al);
+ return;
+ }
+ /* LRU-based cache eviction: we remove from tail */
+ while (cache_size > MAX_CACHE)
+ free_cache_entry (cache_tail);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Got reply for hostname %s and request ID %u\n",
+ al->hostname,
+ (unsigned int) al->client_request_id);
+ /* add to cache */
+ cache_answers(al->hostname,
+ parsed->answers, parsed->num_answers);
+ cache_answers(al->hostname,
+ parsed->authority_records, parsed->num_authority_records);
+ cache_answers(al->hostname,
+ parsed->additional_records, parsed->num_additional_records);
+
+ /* see if we need to do the 2nd request for AAAA records */
+ if ( (GNUNET_DNSPARSER_TYPE_ALL == al->record_type) &&
+ (GNUNET_NO == al->did_aaaa) )
+ {
+ char *packet_buf;
+ size_t packet_size;
+ uint16_t dns_id;
+
+ dns_id = (uint16_t) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
+ UINT16_MAX);
+ if (GNUNET_OK ==
+ pack (al->hostname,
+ GNUNET_DNSPARSER_TYPE_AAAA,
+ dns_id,
+ &packet_buf,
+ &packet_size))
+ {
+ al->did_aaaa = GNUNET_YES;
+ al->dns_id = dns_id;
+ GNUNET_DNSSTUB_resolve_cancel (al->resolve_handle);
+ al->resolve_handle =
+ GNUNET_DNSSTUB_resolve (dnsstub_ctx,
+ packet_buf,
+ packet_size,
+ &handle_resolve_result,
+ al);
+ GNUNET_free (packet_buf);
+ GNUNET_DNSPARSER_free_packet (parsed);
+ return;
+ }
+ }
+
+ /* resume by trying again from cache */
+ if (GNUNET_NO ==
+ try_cache (al->hostname,
+ al->record_type,
+ al->client_request_id,
+ al->client))
+ /* cache failed, tell client we could not get an answer */
+ {
+ send_end_msg (al->client_request_id,
+ al->client);
+ }
+ free_active_lookup (al);
+ GNUNET_DNSPARSER_free_packet (parsed);
+}
+
+
+/**
+ * We encountered a timeout trying to perform a
+ * DNS lookup.
+ *
+ * @param cls a `struct ActiveLookup`
+ */
+static void
+handle_resolve_timeout (void *cls)
+{
+ struct ActiveLookup *al = cls;
+
+ al->timeout_task = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "DNS lookup timeout!\n");
+ send_end_msg (al->client_request_id,
+ al->client);
+ free_active_lookup (al);
+}
+
+
+/**
+ * Initiate an active lookup, then cache the result and
+ * try to then complete the resolution.
+ *
+ * @param hostname DNS name to resolve
+ * @param record_type record type to locate
+ * @param client_request_id client request ID
+ * @param client handle to the client
+ * @return #GNUNET_OK if the DNS query is now pending
+ */
+static int
+resolve_and_cache (const char* hostname,
+ uint16_t record_type,
+ uint32_t client_request_id,
+ struct GNUNET_SERVICE_Client *client)
+{
+ char *packet_buf;
+ size_t packet_size;
+ struct ActiveLookup *al;
+ uint16_t dns_id;
+ uint16_t type;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "resolve_and_cache `%s'\n",
+ hostname);
+ dns_id = (uint16_t) GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE,
+ UINT16_MAX);
+
+ if (GNUNET_DNSPARSER_TYPE_ALL == record_type)
+ type = GNUNET_DNSPARSER_TYPE_A;
+ else
+ type = record_type;
+ if (GNUNET_OK !=
+ pack (hostname,
+ type,
+ dns_id,
+ &packet_buf,
+ &packet_size))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to pack query for hostname `%s'\n",
+ hostname);
return GNUNET_SYSERR;
}
- GNUNET_assert (hp->h_length == sizeof (struct in_addr));
- env = GNUNET_MQ_msg_extra (msg,
- hp->h_length,
- GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
- GNUNET_memcpy (&msg[1],
- hp->h_addr_list[0],
- hp->h_length);
- GNUNET_MQ_send (mq,
- env);
+
+ al = GNUNET_new (struct ActiveLookup);
+ al->hostname = GNUNET_strdup (hostname);
+ al->record_type = record_type;
+ al->client_request_id = client_request_id;
+ al->dns_id = dns_id;
+ al->client = client;
+ al->timeout_task = GNUNET_SCHEDULER_add_delayed (DNS_TIMEOUT,
+ &handle_resolve_timeout,
+ al);
+ al->resolve_handle =
+ GNUNET_DNSSTUB_resolve (dnsstub_ctx,
+ packet_buf,
+ packet_size,
+ &handle_resolve_result,
+ al);
+ GNUNET_free (packet_buf);
+ GNUNET_CONTAINER_DLL_insert (lookup_head,
+ lookup_tail,
+ al);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Resolving %s, client_request_id = %u, dns_id = %u\n",
+ hostname,
+ (unsigned int) client_request_id,
+ (unsigned int) dns_id);
return GNUNET_OK;
}
-#endif
/**
- * Convert a string to an IP address.
+ * Process DNS request for @a hostname with request ID @a client_request_id
+ * from @a client demanding records of type @a record_type.
*
- * @param client where to send the IP address
- * @param hostname the hostname to resolve
- * @param af AF_INET or AF_INET6; use AF_UNSPEC for "any"
+ * @param hostname DNS name to resolve
+ * @param record_type desired record type
+ * @param client_request_id client's request ID
+ * @param client who should get the result?
*/
static void
-get_ip_from_hostname (struct GNUNET_SERVICE_Client *client,
- const char *hostname,
- int af)
+process_get (const char *hostname,
+ uint16_t record_type,
+ uint32_t client_request_id,
+ struct GNUNET_SERVICE_Client *client)
{
- int ret;
- struct GNUNET_MQ_Handle *mq;
- struct GNUNET_MQ_Envelope *env;
- struct GNUNET_MessageHeader *msg;
-
- mq = GNUNET_SERVICE_client_get_mq (client);
- ret = GNUNET_NO;
-#if HAVE_GETADDRINFO
- if (ret == GNUNET_NO)
- ret = getaddrinfo_resolve (mq,
- hostname,
- af);
-#elif HAVE_GETHOSTBYNAME2
- if (ret == GNUNET_NO)
- ret = gethostbyname2_resolve (mq,
- hostname,
- af);
-#elif HAVE_GETHOSTBYNAME
- if ( (ret == GNUNET_NO) &&
- ( (af == AF_UNSPEC) ||
- (af == PF_INET) ) )
- gethostbyname_resolve (mq,
- hostname);
-#endif
- env = GNUNET_MQ_msg (msg,
- GNUNET_MESSAGE_TYPE_RESOLVER_RESPONSE);
- GNUNET_MQ_notify_sent (env,
- ¬ify_service_client_done,
- client);
- GNUNET_MQ_send (mq,
- env);
+ char fqdn[255];
+
+ if (GNUNET_NO !=
+ try_cache (hostname,
+ record_type,
+ client_request_id,
+ client))
+ return;
+ if ( (NULL != my_domain) &&
+ (NULL == strchr (hostname,
+ (unsigned char) '.')) &&
+ (strlen (hostname) + strlen (my_domain) <= 253) )
+ {
+ GNUNET_snprintf (fqdn,
+ sizeof (fqdn),
+ "%s.%s",
+ hostname,
+ my_domain);
+ }
+ else if (strlen (hostname) < 255)
+ {
+ GNUNET_snprintf (fqdn,
+ sizeof (fqdn),
+ "%s",
+ hostname);
+ }
+ else
+ {
+ GNUNET_break (0);
+ GNUNET_SERVICE_client_drop (client);
+ return;
+ }
+ if (GNUNET_NO ==
+ try_cache (fqdn,
+ record_type,
+ client_request_id,
+ client))
+ {
+ if (GNUNET_OK !=
+ resolve_and_cache (fqdn,
+ record_type,
+ client_request_id,
+ client))
+ {
+ send_end_msg (client_request_id,
+ client);
+ }
+ }
}
*/
static int
check_get (void *cls,
- const struct GNUNET_RESOLVER_GetMessage *get)
+ const struct GNUNET_RESOLVER_GetMessage *get)
{
uint16_t size;
int direction;
direction = ntohl (get->direction);
if (GNUNET_NO == direction)
{
- /* IP from hostname */
- const char *hostname;
-
- hostname = (const char *) &get[1];
- if (hostname[size - 1] != '\0')
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
+ GNUNET_MQ_check_zero_termination (get);
return GNUNET_OK;
}
af = ntohl (get->af);
switch (af)
{
- case AF_INET:
- if (size != sizeof (struct in_addr))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
- break;
- case AF_INET6:
- if (size != sizeof (struct in6_addr))
- {
+ case AF_INET:
+ if (size != sizeof (struct in_addr))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ break;
+ case AF_INET6:
+ if (size != sizeof (struct in6_addr))
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ break;
+ default:
GNUNET_break (0);
return GNUNET_SYSERR;
- }
- break;
- default:
- GNUNET_break (0);
- return GNUNET_SYSERR;
}
return GNUNET_OK;
}
*/
static void
handle_get (void *cls,
- const struct GNUNET_RESOLVER_GetMessage *msg)
+ const struct GNUNET_RESOLVER_GetMessage *msg)
{
struct GNUNET_SERVICE_Client *client = cls;
- const void *ip;
int direction;
int af;
+ uint32_t client_request_id;
+ char *hostname;
direction = ntohl (msg->direction);
af = ntohl (msg->af);
+ client_request_id = msg->client_id;
+ GNUNET_SERVICE_client_continue (client);
if (GNUNET_NO == direction)
{
/* IP from hostname */
- const char *hostname;
-
- hostname = (const char *) &msg[1];
+ hostname = GNUNET_strdup ((const char *) &msg[1]);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Resolver asked to look up `%s'.\n",
- hostname);
- get_ip_from_hostname (client,
- hostname,
- af);
+ "Client asks to resolve `%s'\n",
+ hostname);
+ switch (af)
+ {
+ case AF_UNSPEC:
+ {
+ process_get (hostname,
+ GNUNET_DNSPARSER_TYPE_ALL,
+ client_request_id,
+ client);
+ break;
+ }
+ case AF_INET:
+ {
+ process_get (hostname,
+ GNUNET_DNSPARSER_TYPE_A,
+ client_request_id,
+ client);
+ break;
+ }
+ case AF_INET6:
+ {
+ process_get (hostname,
+ GNUNET_DNSPARSER_TYPE_AAAA,
+ client_request_id,
+ client);
+ break;
+ }
+ default:
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "got invalid af: %d\n",
+ af);
+ GNUNET_assert (0);
+ }
+ }
+ }
+ else
+ {
+ /* hostname from IP */
+ hostname = make_reverse_hostname (&msg[1],
+ af);
+ process_get (hostname,
+ GNUNET_DNSPARSER_TYPE_PTR,
+ client_request_id,
+ client);
+ }
+ GNUNET_free_non_null (hostname);
+}
+
+
+/**
+ * Service is shutting down, clean up.
+ *
+ * @param cls NULL, unused
+ */
+static void
+shutdown_task (void *cls)
+{
+ (void) cls;
+
+ while (NULL != lookup_head)
+ free_active_lookup (lookup_head);
+ while (NULL != cache_head)
+ free_cache_entry (cache_head);
+ while (NULL != hosts_head)
+ free_hosts_entry (hosts_head);
+ GNUNET_DNSSTUB_stop (dnsstub_ctx);
+ GNUNET_free_non_null (my_domain);
+}
+
+
+/**
+ * Add information about a host from /etc/hosts
+ * to our cache.
+ *
+ * @param hostname the name of the host
+ * @param rec_type DNS record type to use
+ * @param data payload
+ * @param data_size number of bytes in @a data
+ */
+static void
+add_host (const char *hostname,
+ uint16_t rec_type,
+ const void *data,
+ size_t data_size)
+{
+ struct ResolveCache *rc;
+ struct RecordListEntry *rle;
+ struct GNUNET_DNSPARSER_Record *rec;
+
+ rec = GNUNET_malloc (sizeof (struct GNUNET_DNSPARSER_Record));
+ rec->expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS;
+ rec->type = rec_type;
+ rec->dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
+ rec->name = GNUNET_strdup (hostname);
+ rec->data.raw.data = GNUNET_memdup (data,
+ data_size);
+ rec->data.raw.data_len = data_size;
+ rle = GNUNET_new (struct RecordListEntry);
+ rle->record = rec;
+ rc = GNUNET_new (struct ResolveCache);
+ rc->hostname = GNUNET_strdup (hostname);
+ GNUNET_CONTAINER_DLL_insert (rc->records_head,
+ rc->records_tail,
+ rle);
+ GNUNET_CONTAINER_DLL_insert (hosts_head,
+ hosts_tail,
+ rc);
+}
+
+
+/**
+ * Extract host information from a line in /etc/hosts
+ *
+ * @param line the line to parse
+ * @param line_len number of bytes in @a line
+ */
+static void
+extract_hosts (const char *line,
+ size_t line_len)
+{
+ const char *c;
+ struct in_addr v4;
+ struct in6_addr v6;
+ char *tbuf;
+ char *tok;
+
+ /* ignore everything after '#' */
+ c = memrchr (line,
+ (unsigned char) '#',
+ line_len);
+ if (NULL != c)
+ line_len = c - line;
+ /* ignore leading whitespace */
+ while ( (0 < line_len) &&
+ isspace ((unsigned char) *line) )
+ {
+ line++;
+ line_len--;
+ }
+ tbuf = GNUNET_strndup (line,
+ line_len);
+ tok = strtok (tbuf, " \t");
+ if (NULL == tok)
+ {
+ GNUNET_free (tbuf);
return;
}
- ip = &msg[1];
+ if (1 == inet_pton (AF_INET,
+ tok,
+ &v4))
+ {
+ while (NULL != (tok = strtok (NULL, " \t")))
+ add_host (tok,
+ GNUNET_DNSPARSER_TYPE_A,
+ &v4,
+ sizeof (struct in_addr));
+ }
+ else if (1 == inet_pton (AF_INET6,
+ tok,
+ &v6))
+ {
+ while (NULL != (tok = strtok (NULL, " \t")))
+ add_host (tok,
+ GNUNET_DNSPARSER_TYPE_AAAA,
+ &v6,
+ sizeof (struct in6_addr));
+ }
+ GNUNET_free (tbuf);
+}
+
-#if !defined(GNUNET_CULL_LOGGING)
+/**
+ * Reads the list of hosts from /etc/hosts.
+ */
+static void
+load_etc_hosts (void)
+{
+ struct GNUNET_DISK_FileHandle *fh;
+ struct GNUNET_DISK_MapHandle *mh;
+ off_t bytes_read;
+ const char *buf;
+ size_t read_offset;
+
+ fh = GNUNET_DISK_file_open ("/etc/hosts",
+ GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_PERM_NONE);
+ if (NULL == fh)
{
- char buf[INET6_ADDRSTRLEN];
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Failed to open /etc/hosts");
+ return;
+ }
+ if (GNUNET_OK !=
+ GNUNET_DISK_file_handle_size (fh,
+ &bytes_read))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Could not determin size of /etc/hosts. "
+ "DNS resolution will not be possible.\n");
+ GNUNET_DISK_file_close (fh);
+ return;
+ }
+ if ((size_t) bytes_read > SIZE_MAX)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "/etc/hosts file too large to mmap. "
+ "DNS resolution will not be possible.\n");
+ GNUNET_DISK_file_close (fh);
+ return;
+ }
+ buf = GNUNET_DISK_file_map (fh,
+ &mh,
+ GNUNET_DISK_MAP_TYPE_READ,
+ (size_t) bytes_read);
+ read_offset = 0;
+ while (read_offset < (size_t) bytes_read)
+ {
+ const char *newline;
+ size_t line_len;
+
+ newline = strchr (buf + read_offset,
+ '\n');
+ if (NULL == newline)
+ break;
+ line_len = newline - buf - read_offset;
+ extract_hosts (buf + read_offset,
+ line_len);
+ read_offset += line_len + 1;
+ }
+ GNUNET_DISK_file_unmap (mh);
+ GNUNET_DISK_file_close (fh);
+}
+
+/**
+ * Service is starting, initialize everything.
+ *
+ * @param cls NULL, unused
+ * @param cfg our configuration
+ * @param sh service handle
+ */
+static void
+init_cb (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_SERVICE_Handle *sh)
+{
+ char **dns_servers;
+ int num_dns_servers;
+
+ (void) cfg;
+ (void) sh;
+ load_etc_hosts ();
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+ cls);
+ dnsstub_ctx = GNUNET_DNSSTUB_start (128);
+ dns_servers = NULL;
+ num_dns_servers = lookup_dns_servers (&dns_servers);
+ if (0 >= num_dns_servers)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("No DNS server available. DNS resolution will not be possible.\n"));
+ return;
+ }
+ for (int i = 0; i < num_dns_servers; i++)
+ {
+ int result = GNUNET_DNSSTUB_add_dns_ip (dnsstub_ctx, dns_servers[i]);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Resolver asked to look up IP address `%s'.\n",
- inet_ntop (af,
- ip,
- buf,
- sizeof (buf)));
+ "Adding DNS server '%s': %s\n",
+ dns_servers[i],
+ GNUNET_OK == result ? "success" : "failure");
+ GNUNET_free (dns_servers[i]);
}
-#endif
- get_ip_as_string (client,
- af,
- ip);
+ GNUNET_free_non_null (dns_servers);
}
*/
static void *
connect_cb (void *cls,
- struct GNUNET_SERVICE_Client *c,
- struct GNUNET_MQ_Handle *mq)
+ struct GNUNET_SERVICE_Client *c,
+ struct GNUNET_MQ_Handle *mq)
{
(void) cls;
(void) mq;
*/
static void
disconnect_cb (void *cls,
- struct GNUNET_SERVICE_Client *c,
- void *internal_cls)
+ struct GNUNET_SERVICE_Client *c,
+ void *internal_cls)
{
+ struct ActiveLookup *n;
(void) cls;
GNUNET_assert (c == internal_cls);
+ n = lookup_head;
+ for (struct ActiveLookup *al = n;
+ NULL != al;
+ al = n)
+ {
+ n = al->next;
+ if (al->client == c)
+ free_active_lookup (al);
+ }
}
GNUNET_SERVICE_MAIN
("resolver",
GNUNET_SERVICE_OPTION_NONE,
- NULL,
+ &init_cb,
&connect_cb,
&disconnect_cb,
NULL,
GNUNET_MQ_hd_var_size (get,
- GNUNET_MESSAGE_TYPE_RESOLVER_REQUEST,
- struct GNUNET_RESOLVER_GetMessage,
- NULL),
+ GNUNET_MESSAGE_TYPE_RESOLVER_REQUEST,
+ struct GNUNET_RESOLVER_GetMessage,
+ NULL),
GNUNET_MQ_handler_end ());
#endif
-/**
- * Free globals on exit.
- */
-void __attribute__ ((destructor))
-GNUNET_RESOLVER_memory_done ()
-{
- struct IPCache *pos;
-
- while (NULL != (pos = cache_head))
- {
- GNUNET_CONTAINER_DLL_remove (cache_head,
- cache_tail,
- pos);
- GNUNET_free_non_null (pos->addr);
- GNUNET_free (pos);
- }
-}
-
-
/* end of gnunet-service-resolver.c */