This file is part of GNUnet.
Copyright (C) 2011-2013 GNUnet e.V.
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ 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
*/
/**
/**
* DHT replication level
*/
-#define DHT_GNS_REPLICATION_LEVEL 5
+#define DHT_GNS_REPLICATION_LEVEL 10
/**
* How deep do we allow recursions to go before we abort?
#define MAX_RECURSION 256
+/**
+ * DLL to hold the authority chain we had to pass in the resolution
+ * process.
+ */
+struct AuthorityChain;
+
+
+/**
+ * Element of a resolution process for looking up the
+ * responsible DNS server hostname in a GNS2DNS recursive
+ * resolution.
+ */
+struct Gns2DnsPending
+{
+
+ /**
+ * Kept in a DLL.
+ */
+ struct Gns2DnsPending *next;
+
+ /**
+ * Kept in a DLL.
+ */
+ struct Gns2DnsPending *prev;
+
+ /**
+ * Context this activity belongs with.
+ */
+ struct AuthorityChain *ac;
+
+ /**
+ * Handle for the resolution of the IP part of the
+ * GNS2DNS record. Will return to us the addresses
+ * of the DNS resolver to use.
+ */
+ struct GNS_ResolverHandle *rh;
+
+ /**
+ * Handle for DNS resolution of the DNS nameserver.
+ */
+ struct GNUNET_RESOLVER_RequestHandle *dns_rh;
+
+ /**
+ * How many results did we get?
+ */
+ unsigned int num_results;
+};
+
+
+/**
+ * Handle to a currenty pending resolution. On result (positive or
+ * negative) the #GNS_ResultProcessor is called.
+ */
+struct GNS_ResolverHandle;
+
+
/**
* DLL to hold the authority chain we had to pass in the resolution
* process.
*/
char *label;
- /**
- * label/name suggested for shortening to the authority
- */
- char *suggested_shortening_label;
-
- /**
- * Do we already try to shorten this authority?
- */
- int shortening_started;
-
/**
* #GNUNET_YES if the authority was a GNS authority,
* #GNUNET_NO if the authority was a DNS authority.
char name[GNUNET_DNSPARSER_MAX_NAME_LENGTH + 1];
/**
- * IP address of the DNS resolver that is authoritative.
- * (this implementation currently only supports one
- * IP at a time).
+ * List of resolutions of the 'ip' of the name server that
+ * are still pending.
+ */
+ struct Gns2DnsPending *gp_head;
+
+ /**
+ * Tail of list of resolutions of the 'ip' of the name server that
+ * are still pending.
+ */
+ struct Gns2DnsPending *gp_tail;
+
+ /**
+ * Handle to perform DNS lookups with this authority (in GNS2DNS handling).
+ */
+ struct GNUNET_DNSSTUB_Context *dns_handle;
+
+ /**
+ * Did we succeed in getting an IP address for *any* of the DNS servers listed?
+ * Once we do, we can start with DNS queries.
+ */
+ int found;
+
+ /**
+ * Did we start the recursive resolution via DNS?
*/
- struct sockaddr_storage dns_ip;
+ int launched;
} dns_authority;
/**
* Number of bytes in @e rd_data.
*/
- size_t rd_data_size;
-};
-
-
-/**
- * Information we keep during the resolution of an
- * IP address for a DNS server while handling a
- * GNS2DNS record.
- */
-struct Gns2DnsContext
-{
-
- /**
- * DNS domain in which the resolution will continue
- * (first part of the GNS2DNS record).
- */
- char *ns;
-
- /**
- * Handle for the resolution of the IP part of the
- * GNS2DNS record. Will return to us the addresses
- * of the DNS resolver to use.
- */
- struct GNS_ResolverHandle *rh;
-
- /**
- * Handle for DNS resolution of the DNS nameserver.
- */
- struct GNUNET_RESOLVER_RequestHandle *dns_rh;
+ ssize_t rd_data_size;
};
*/
void* proc_cls;
- /**
- * Handle used during GNS2DNS resolution for looking up the
- * IP address of the DNS server.
- */
- struct Gns2DnsContext *g2dc;
-
/**
* Handle for DHT lookups. should be NULL if no lookups are in progress
*/
*/
char *name;
+ /**
+ * Legacy Hostname to use if we encountered GNS2DNS record
+ * and thus can deduct the LEHO from that transition.
+ */
+ char *leho;
+
/**
* DLL of results we got from DNS.
*/
*/
unsigned int loop_limiter;
+ /**
+ * 16 bit random ID we used in the @e dns_request.
+ */
+ uint16_t original_dns_id;
+
};
*/
static struct GNUNET_DHT_Handle *dht_handle;
-/**
- * Handle to perform DNS lookups.
- */
-static struct GNUNET_DNSSTUB_Context *dns_handle;
-
/**
* Heap for limiting parallel DHT lookups
*/
/**
* Use namecache
*/
-static int use_cache;
+static int disable_cache;
/**
* Global configuration.
/**
- * Task scheduled to asynchronously fail a resolution.
+ * Wrapper around #GNS_resolver_lookup_cancel() as a task.
+ * Used for delayed cleanup so we can unwind the stack first.
*
- * @param cls the 'struct GNS_ResolverHandle' of the resolution to fail
+ * @param cls the `struct GNS_ResolverHandle`
*/
static void
-fail_resolution (void *cls)
+GNS_resolver_lookup_cancel_ (void *cls)
{
struct GNS_ResolverHandle *rh = cls;
rh->task_id = NULL;
- rh->proc (rh->proc_cls, 0, NULL);
GNS_resolver_lookup_cancel (rh);
}
-#if (defined WINDOWS) || (defined DARWIN)
-/* Don't have this on W32, here's a naive implementation
- * Was somehow removed on OS X ... */
-static void *
-memrchr (const void *s,
- int c,
- size_t n)
+/**
+ * Function called to asynchronously fail a resolution.
+ *
+ * @param rh the resolution to fail
+ */
+static void
+fail_resolution (struct GNS_ResolverHandle *rh)
+{
+ rh->proc (rh->proc_cls,
+ 0,
+ NULL);
+ GNUNET_assert (NULL == rh->task_id);
+ rh->task_id = GNUNET_SCHEDULER_add_now (&GNS_resolver_lookup_cancel_,
+ rh);
+}
+
+
+/**
+ * Function called when a resolution times out.
+ *
+ * @param cls the `struct GNS_ResolverHandle`
+ */
+static void
+timeout_resolution (void *cls)
{
- const unsigned char *ucs = s;
- ssize_t i;
+ struct GNS_ResolverHandle *rh = cls;
- for (i = n - 1; i >= 0; i--)
- if (c == (int) ucs[i])
- return (void *) &ucs[i];
- return NULL;
+ rh->task_id = NULL;
+ fail_resolution (rh);
}
-#endif
/**
res->data_size = data_size;
res->record_type = record_type;
res->data = &res[1];
- GNUNET_memcpy (&res[1], data, data_size);
+ GNUNET_memcpy (&res[1],
+ data,
+ data_size);
GNUNET_CONTAINER_DLL_insert (rh->dns_result_head,
rh->dns_result_tail,
res);
*
* @param cls the request handle of the resolution that
* we were attempting to make
- * @param rs socket that received the response
* @param dns dns response, never NULL
* @param dns_len number of bytes in @a dns
*/
static void
dns_result_parser (void *cls,
- struct GNUNET_DNSSTUB_RequestSocket *rs,
const struct GNUNET_TUN_DnsHeader *dns,
size_t dns_len)
{
struct GNUNET_DNSPARSER_Packet *p;
const struct GNUNET_DNSPARSER_Record *rec;
unsigned int rd_count;
- unsigned int i;
- (void) rs;
- rh->dns_request = NULL;
- GNUNET_SCHEDULER_cancel (rh->task_id);
- rh->task_id = NULL;
+ if (NULL == dns)
+ {
+ rh->dns_request = NULL;
+ GNUNET_SCHEDULER_cancel (rh->task_id);
+ rh->task_id = NULL;
+ fail_resolution (rh);
+ return;
+ }
+ if (rh->original_dns_id != dns->id)
+ {
+ /* DNS answer, but for another query */
+ return;
+ }
p = GNUNET_DNSPARSER_parse ((const char *) dns,
dns_len);
if (NULL == p)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Failed to parse DNS response\n"));
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
return;
}
+
+ /* We got a result from DNS */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received DNS response for `%s' with %u answers\n",
rh->ac_tail->label,
if ( (p->num_answers > 0) &&
(GNUNET_DNSPARSER_TYPE_CNAME == p->answers[0].type) &&
(GNUNET_DNSPARSER_TYPE_CNAME != rh->record_type) )
- {
- int af;
+ {
+ int af;
- GNUNET_free (rh->name);
- rh->name = GNUNET_strdup (p->answers[0].data.hostname);
- rh->name_resolution_pos = strlen (rh->name);
- switch (rh->record_type)
- {
- case GNUNET_DNSPARSER_TYPE_A:
- af = AF_INET;
- break;
- case GNUNET_DNSPARSER_TYPE_AAAA:
- af = AF_INET6;
- break;
- default:
- af = AF_UNSPEC;
- break;
- }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Doing standard DNS lookup for `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Got CNAME `%s' from DNS for `%s'\n",
+ p->answers[0].data.hostname,
+ rh->name);
+ if (NULL != rh->std_resolve)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Multiple CNAME results from DNS resolving `%s'! Not really allowed...\n",
rh->name);
- rh->std_resolve = GNUNET_RESOLVER_ip_get (rh->name,
- af,
- DNS_LOOKUP_TIMEOUT,
- &handle_dns_result,
- rh);
- GNUNET_DNSPARSER_free_packet (p);
- return;
+ GNUNET_RESOLVER_request_cancel (rh->std_resolve);
}
+ GNUNET_free (rh->name);
+ rh->name = GNUNET_strdup (p->answers[0].data.hostname);
+ rh->name_resolution_pos = strlen (rh->name);
+ switch (rh->record_type)
+ {
+ case GNUNET_DNSPARSER_TYPE_A:
+ af = AF_INET;
+ break;
+ case GNUNET_DNSPARSER_TYPE_AAAA:
+ af = AF_INET6;
+ break;
+ default:
+ af = AF_UNSPEC;
+ break;
+ }
+ if (NULL != rh->leho)
+ add_dns_result (rh,
+ GNUNET_TIME_UNIT_HOURS.rel_value_us,
+ GNUNET_GNSRECORD_TYPE_LEHO,
+ strlen (rh->leho),
+ rh->leho);
+ rh->std_resolve = GNUNET_RESOLVER_ip_get (rh->name,
+ af,
+ DNS_LOOKUP_TIMEOUT,
+ &handle_dns_result,
+ rh);
+ GNUNET_DNSPARSER_free_packet (p);
+ GNUNET_DNSSTUB_resolve_cancel (rh->dns_request);
+ rh->dns_request = NULL;
+ return;
+ }
/* convert from (parsed) DNS to (binary) GNS format! */
rd_count = p->num_answers + p->num_authority_records + p->num_additional_records;
{
- struct GNUNET_GNSRECORD_Data rd[rd_count];
- unsigned int skip;
+ struct GNUNET_GNSRECORD_Data rd[rd_count + 1]; /* +1 for LEHO */
+ int skip;
char buf[UINT16_MAX];
size_t buf_off;
size_t buf_start;
buf_off = 0;
skip = 0;
- memset (rd, 0, sizeof (rd));
- for (i=0;i<rd_count;i++)
+ memset (rd,
+ 0,
+ sizeof (rd));
+ for (unsigned int i=0;i<rd_count;i++)
{
if (i < p->num_answers)
rec = &p->answers[i];
skip++;
continue;
}
+ } /* end of for all records in answer */
+ if (NULL != rh->leho)
+ {
+ rd[rd_count - skip].record_type = GNUNET_GNSRECORD_TYPE_LEHO;
+ rd[rd_count - skip].flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
+ rd[rd_count - skip].expiration_time = GNUNET_TIME_UNIT_HOURS.rel_value_us;
+ rd[rd_count - skip].data = rh->leho;
+ rd[rd_count - skip].data_size = strlen (rh->leho);
+ skip--; /* skip one LESS */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding LEHO %s\n",
+ rh->leho);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Returning DNS response for `%s' with %u answers\n",
rh->ac_tail->label,
- (unsigned int) p->num_answers);
+ (unsigned int) (rd_count - skip));
rh->proc (rh->proc_cls,
rd_count - skip,
rd);
- GNS_resolver_lookup_cancel (rh);
+ GNUNET_DNSSTUB_resolve_cancel (rh->dns_request);
+ rh->dns_request = NULL;
}
GNUNET_DNSPARSER_free_packet (p);
+ if (NULL != rh->task_id)
+ GNUNET_SCHEDULER_cancel (rh->task_id); /* should be timeout task */
+ rh->task_id = GNUNET_SCHEDULER_add_now (&GNS_resolver_lookup_cancel_,
+ rh);
}
recursive_dns_resolution (struct GNS_ResolverHandle *rh)
{
struct AuthorityChain *ac;
- socklen_t sa_len;
struct GNUNET_DNSPARSER_Query *query;
struct GNUNET_DNSPARSER_Packet *p;
char *dns_request;
"Starting DNS lookup for `%s'\n",
ac->label);
GNUNET_assert (GNUNET_NO == ac->gns_authority);
- switch (((const struct sockaddr *) &ac->authority_info.dns_authority.dns_ip)->sa_family)
- {
- case AF_INET:
- sa_len = sizeof (struct sockaddr_in);
- break;
- case AF_INET6:
- sa_len = sizeof (struct sockaddr_in6);
- break;
- default:
- GNUNET_break (0);
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
- return;
- }
query = GNUNET_new (struct GNUNET_DNSPARSER_Query);
query->name = GNUNET_strdup (ac->label);
query->type = rh->record_type;
rh->proc (rh->proc_cls,
0,
NULL);
- GNS_resolver_lookup_cancel (rh);
+ GNUNET_assert (NULL == rh->task_id);
+ rh->task_id = GNUNET_SCHEDULER_add_now (&GNS_resolver_lookup_cancel_,
+ rh);
}
else
{
- rh->dns_request = GNUNET_DNSSTUB_resolve (dns_handle,
- (const struct sockaddr *) &ac->authority_info.dns_authority.dns_ip,
- sa_len,
+ rh->original_dns_id = p->id;
+ GNUNET_assert (NULL != ac->authority_info.dns_authority.dns_handle);
+ GNUNET_assert (NULL == rh->dns_request);
+ rh->leho = GNUNET_strdup (ac->label);
+ rh->dns_request = GNUNET_DNSSTUB_resolve (ac->authority_info.dns_authority.dns_handle,
dns_request,
dns_request_length,
&dns_result_parser,
rh);
rh->task_id = GNUNET_SCHEDULER_add_delayed (DNS_LOOKUP_TIMEOUT,
- &fail_resolution,
+ &timeout_resolution,
rh);
}
if (GNUNET_SYSERR != ret)
ac->gns_authority = GNUNET_YES;
ac->authority_info.gns_authority = rh->ac_tail->authority_info.gns_authority;
ac->label = resolver_lookup_get_next_label (rh);
- ac->suggested_shortening_label = NULL;
- ac->shortening_started = GNUNET_NO;
/* add AC to tail */
GNUNET_CONTAINER_DLL_insert_tail (rh->ac_head,
rh->ac_tail,
rh);
return;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Got CNAME `%s' from GNS for `%s'\n",
+ cname,
+ rh->name);
+ if (NULL != rh->std_resolve)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Multiple CNAME results from GNS resolving `%s'! Not really allowed...\n",
+ rh->name);
+ GNUNET_RESOLVER_request_cancel (rh->std_resolve);
+ }
/* name is absolute, go to DNS */
GNUNET_free (rh->name);
rh->name = GNUNET_strdup (cname);
vpn_ctx->vpn_request = NULL;
rh->vpn_ctx = NULL;
GNUNET_assert (GNUNET_OK ==
- GNUNET_GNSRECORD_records_deserialize (vpn_ctx->rd_data_size,
+ GNUNET_GNSRECORD_records_deserialize ((size_t) vpn_ctx->rd_data_size,
vpn_ctx->rd_data,
vpn_ctx->rd_count,
rd));
}
}
GNUNET_assert (i < vpn_ctx->rd_count);
+ if (0 == vpn_ctx->rd_count)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("VPN returned empty result for `%s'\n"),
+ rh->name);
handle_gns_resolution_result (rh,
vpn_ctx->rd_count,
rd);
}
+/**
+ * We have resolved one or more of the nameservers for a
+ * GNS2DNS lookup. Once we have some of them, begin using
+ * the DNSSTUB resolver.
+ *
+ * @param ac context for GNS2DNS resolution
+ */
+static void
+continue_with_gns2dns (struct AuthorityChain *ac)
+{
+ struct GNS_ResolverHandle *rh = ac->rh;
+
+ if ( (NULL != ac->authority_info.dns_authority.gp_head) &&
+ (GNUNET_NO == ac->authority_info.dns_authority.found) )
+ return; /* more pending and none found yet */
+ if (GNUNET_NO == ac->authority_info.dns_authority.found)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Failed to resolve DNS server for `%s' in GNS2DNS resolution\n",
+ ac->authority_info.dns_authority.name);
+ fail_resolution (rh);
+ return;
+ }
+ if (GNUNET_NO != ac->authority_info.dns_authority.launched)
+ return; /* already running, do not launch again! */
+ /* recurse */
+ ac->authority_info.dns_authority.launched = GNUNET_YES;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Will continue resolution using DNS to resolve `%s'\n",
+ ac->label);
+ GNUNET_assert (NULL == rh->task_id);
+ rh->task_id = GNUNET_SCHEDULER_add_now (&recursive_resolution,
+ rh);
+
+}
+
+
/**
* We've resolved the IP address for the DNS resolver to use
* after encountering a GNS2DNS record.
*
- * TODO: Right now we only foward the request to ONE DNS resolver,
- * even if we get multiple IP addresses back; a correct implementation
- * should try all DNS resolvers.
- *
- * @param cls the `struct GNS_ResolverHandle` where we encountered
- * the GNS2DNS record
+ * @param cls the `struct Gns2DnsPending` used for this request
* @param rd_count number of records in @a rd
* @param rd addresses for the DNS resolver (presumably)
*/
unsigned int rd_count,
const struct GNUNET_GNSRECORD_Data *rd)
{
- struct GNS_ResolverHandle *rh = cls;
- struct AuthorityChain *ac;
- struct sockaddr *sa;
- struct sockaddr_in v4;
- struct sockaddr_in6 v6;
- size_t sa_len;
-
- /* find suitable A/AAAA record */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received %u results for IP address of DNS server for GNS2DNS transition\n",
- rd_count);
- /* enable cleanup of 'rh' handle that comes next... */
- if (NULL != rh->g2dc->rh)
+ struct Gns2DnsPending *gp = cls;
+ struct AuthorityChain *ac = gp->ac;
+
+ GNUNET_CONTAINER_DLL_remove (ac->authority_info.dns_authority.gp_head,
+ ac->authority_info.dns_authority.gp_tail,
+ gp);
+ /* enable cleanup of 'rh' handle that automatically comes after we return,
+ and which expects 'rh' to be in the #rlh_head DLL. */
+ if (NULL != gp->rh)
{
GNUNET_CONTAINER_DLL_insert (rlh_head,
rlh_tail,
- rh->g2dc->rh);
- rh->g2dc->rh = NULL;
+ gp->rh);
+ gp->rh = NULL;
}
- sa = NULL;
- sa_len = 0;
+ GNUNET_free (gp);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received %u results for IP address of DNS server for GNS2DNS transition\n",
+ rd_count);
+ /* find suitable A/AAAA record */
for (unsigned int j=0;j<rd_count;j++)
{
switch (rd[j].record_type)
{
case GNUNET_DNSPARSER_TYPE_A:
- if (sizeof (struct in_addr) != rd[j].data_size)
{
- GNUNET_break_op (0);
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
- return;
- }
- /* FIXME: might want to check if we support IPv4 here,
- and otherwise skip this one and hope we find another */
- memset (&v4, 0, sizeof (v4));
- sa_len = sizeof (v4);
- v4.sin_family = AF_INET;
- v4.sin_port = htons (53);
+ struct sockaddr_in v4;
+
+ if (sizeof (struct in_addr) != rd[j].data_size)
+ {
+ GNUNET_break_op (0);
+ continue;
+ }
+ memset (&v4,
+ 0,
+ sizeof (v4));
+ v4.sin_family = AF_INET;
+ v4.sin_port = htons (53);
#if HAVE_SOCKADDR_IN_SIN_LEN
- v4.sin_len = (u_char) sa_len;
+ v4.sin_len = (u_char) sizeof (v4);
#endif
- GNUNET_memcpy (&v4.sin_addr,
- rd[j].data,
- sizeof (struct in_addr));
- sa = (struct sockaddr *) &v4;
- break;
+ GNUNET_memcpy (&v4.sin_addr,
+ rd[j].data,
+ sizeof (struct in_addr));
+ if (GNUNET_OK ==
+ GNUNET_DNSSTUB_add_dns_sa (ac->authority_info.dns_authority.dns_handle,
+ (const struct sockaddr *) &v4))
+ ac->authority_info.dns_authority.found = GNUNET_YES;
+ break;
+ }
case GNUNET_DNSPARSER_TYPE_AAAA:
- if (sizeof (struct in6_addr) != rd[j].data_size)
{
- GNUNET_break_op (0);
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
- return;
- }
- /* FIXME: might want to check if we support IPv6 here,
- and otherwise skip this one and hope we find another */
- memset (&v6, 0, sizeof (v6));
- sa_len = sizeof (v6);
- v6.sin6_family = AF_INET6;
- v6.sin6_port = htons (53);
+ struct sockaddr_in6 v6;
+
+ if (sizeof (struct in6_addr) != rd[j].data_size)
+ {
+ GNUNET_break_op (0);
+ continue;
+ }
+ /* FIXME: might want to check if we support IPv6 here,
+ and otherwise skip this one and hope we find another */
+ memset (&v6,
+ 0,
+ sizeof (v6));
+ v6.sin6_family = AF_INET6;
+ v6.sin6_port = htons (53);
#if HAVE_SOCKADDR_IN_SIN_LEN
- v6.sin6_len = (u_char) sa_len;
+ v6.sin6_len = (u_char) sizeof (v6);
#endif
- GNUNET_memcpy (&v6.sin6_addr,
- rd[j].data,
- sizeof (struct in6_addr));
- sa = (struct sockaddr *) &v6;
- break;
+ GNUNET_memcpy (&v6.sin6_addr,
+ rd[j].data,
+ sizeof (struct in6_addr));
+ if (GNUNET_OK ==
+ GNUNET_DNSSTUB_add_dns_sa (ac->authority_info.dns_authority.dns_handle,
+ (const struct sockaddr *) &v6))
+ ac->authority_info.dns_authority.found = GNUNET_YES;
+ break;
+ }
default:
break;
}
- if (NULL != sa)
- break;
}
- if (NULL == sa)
- {
- /* we cannot continue; NS without A/AAAA */
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
- return;
- }
- /* expand authority chain */
- ac = GNUNET_new (struct AuthorityChain);
- ac->rh = rh;
- GNUNET_assert (strlen (rh->g2dc->ns) <= GNUNET_DNSPARSER_MAX_NAME_LENGTH);
- strcpy (ac->authority_info.dns_authority.name,
- rh->g2dc->ns);
- GNUNET_memcpy (&ac->authority_info.dns_authority.dns_ip,
- sa,
- sa_len);
- /* for DNS recursion, the label is the full DNS name,
- created from the remainder of the GNS name and the
- name in the NS record */
- GNUNET_asprintf (&ac->label,
- "%.*s%s%s",
- (int) rh->name_resolution_pos,
- rh->name,
- (0 != rh->name_resolution_pos) ? "." : "",
- rh->g2dc->ns);
- GNUNET_free (rh->g2dc->ns);
- GNUNET_free (rh->g2dc);
- rh->g2dc = NULL;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Will continue resolution using DNS server `%s' to resolve `%s'\n",
- GNUNET_a2s (sa,
- sa_len),
- ac->label);
- GNUNET_CONTAINER_DLL_insert_tail (rh->ac_head,
- rh->ac_tail,
- ac);
- if (strlen (ac->label) > GNUNET_DNSPARSER_MAX_NAME_LENGTH)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("GNS lookup resulted in DNS name that is too long (`%s')\n"),
- ac->label);
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
- return;
- }
- /* recurse */
- rh->task_id = GNUNET_SCHEDULER_add_now (&recursive_resolution,
- rh);
+ continue_with_gns2dns (ac);
}
/**
* Function called by the resolver for each address obtained from DNS.
*
- * @param cls closure, a `struct Gns2DnsContext *`
+ * @param cls closure, a `struct Gns2DnsPending *`
* @param addr one of the addresses of the host, NULL for the last address
* @param addrlen length of @a addr
*/
const struct sockaddr *addr,
socklen_t addrlen)
{
- struct Gns2DnsContext *g2dc = cls;
- struct GNUNET_GNSRECORD_Data rd;
+ struct Gns2DnsPending *gp = cls;
+ struct AuthorityChain *ac = gp->ac;
+ struct sockaddr_storage ss;
+ struct sockaddr_in *v4;
+ struct sockaddr_in6 *v6;
if (NULL == addr)
{
- /* DNS resolution failed */
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Failed to use DNS to resolve name of DNS resolver\n");
- g2dc->rh->g2dc = NULL;
- fail_resolution (g2dc->rh);
- GNUNET_free (g2dc);
+ /* DNS resolution finished */
+ if (0 == gp->num_results)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to use DNS to resolve name of DNS resolver\n");
+ GNUNET_CONTAINER_DLL_remove (ac->authority_info.dns_authority.gp_head,
+ ac->authority_info.dns_authority.gp_tail,
+ gp);
+ GNUNET_free (gp);
+ continue_with_gns2dns (ac);
+ return;
}
- switch (addr->sa_family)
+ GNUNET_memcpy (&ss,
+ addr,
+ addrlen);
+ switch (ss.ss_family)
{
case AF_INET:
- {
- const struct sockaddr_in *v4 = (const struct sockaddr_in *) addr;
-
- GNUNET_assert (sizeof (*v4) == addrlen);
- rd.data = v4;
- rd.data_size = sizeof (*v4);
- rd.expiration_time = UINT64_MAX;
- rd.record_type = GNUNET_DNSPARSER_TYPE_A;
- rd.flags = 0;
- break;
- }
+ v4 = (struct sockaddr_in *) &ss;
+ v4->sin_port = htons (53);
+ gp->num_results++;
+ break;
case AF_INET6:
- {
- const struct sockaddr_in6 *v6 = (const struct sockaddr_in6 *) addr;
-
- GNUNET_assert (sizeof (*v6) == addrlen);
- rd.data = v6;
- rd.data_size = sizeof (v6);
- rd.expiration_time = UINT64_MAX;
- rd.record_type = GNUNET_DNSPARSER_TYPE_AAAA;
- rd.flags = 0;
- break;
- }
+ v6 = (struct sockaddr_in6 *) &ss;
+ v6->sin6_port = htons (53);
+ gp->num_results++;
+ break;
default:
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Unsupported AF %d\n",
+ ss.ss_family);
return;
}
- GNUNET_RESOLVER_request_cancel (g2dc->dns_rh);
- g2dc->dns_rh = NULL;
- handle_gns2dns_result (g2dc->rh,
- 1,
- &rd);
+ if (GNUNET_OK ==
+ GNUNET_DNSSTUB_add_dns_sa (ac->authority_info.dns_authority.dns_handle,
+ (struct sockaddr *) &ss))
+ ac->authority_info.dns_authority.found = GNUNET_YES;
+}
+
+
+/**
+ * We found a CNAME record, perform recursive resolution on it.
+ *
+ * @param rh resolution handle
+ * @param rd record with CNAME to resolve recursively
+ */
+static void
+recursive_cname_resolution (struct GNS_ResolverHandle *rh,
+ const struct GNUNET_GNSRECORD_Data *rd)
+{
+ char *cname;
+ size_t off;
+ off = 0;
+ cname = GNUNET_DNSPARSER_parse_name (rd->data,
+ rd->data_size,
+ &off);
+ if ( (NULL == cname) ||
+ (off != rd->data_size) )
+ {
+ GNUNET_break_op (0); /* record not well-formed */
+ GNUNET_free_non_null (cname);
+ fail_resolution (rh);
+ return;
+ }
+ handle_gns_cname_result (rh,
+ cname);
+ GNUNET_free (cname);
}
+/**
+ * We found a PKEY record, perform recursive resolution on it.
+ *
+ * @param rh resolution handle
+ * @param rd record with PKEY to resolve recursively
+ */
+static void
+recursive_pkey_resolution (struct GNS_ResolverHandle *rh,
+ const struct GNUNET_GNSRECORD_Data *rd)
+{
+ struct AuthorityChain *ac;
+
+ /* delegation to another zone */
+ if (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) !=
+ rd->data_size)
+ {
+ GNUNET_break_op (0);
+ fail_resolution (rh);
+ return;
+ }
+ /* expand authority chain */
+ ac = GNUNET_new (struct AuthorityChain);
+ ac->rh = rh;
+ ac->gns_authority = GNUNET_YES;
+ GNUNET_memcpy (&ac->authority_info.gns_authority,
+ rd->data,
+ sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey));
+ ac->label = resolver_lookup_get_next_label (rh);
+ /* add AC to tail */
+ GNUNET_CONTAINER_DLL_insert_tail (rh->ac_head,
+ rh->ac_tail,
+ ac);
+ /* recurse */
+ rh->task_id = GNUNET_SCHEDULER_add_now (&recursive_resolution,
+ rh);
+}
+
+
+/**
+ * We found one or more GNS2DNS records, perform recursive resolution on it.
+ * (to be precise, one or more records in @a rd is GNS2DNS, there may be others,
+ * so this function still needs to check which ones are GNS2DNS).
+ *
+ * @param rh resolution handle
+ * @param rd_count length of the @a rd array
+ * @param rd record with PKEY to resolve recursively
+ * @return #GNUNET_OK if this worked, #GNUNET_SYSERR if no GNS2DNS records were in @a rd
+ */
+static int
+recursive_gns2dns_resolution (struct GNS_ResolverHandle *rh,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
+{
+ struct AuthorityChain *ac;
+ const char *tld;
+ char *ns;
+
+ ns = NULL;
+ /* expand authority chain */
+ ac = GNUNET_new (struct AuthorityChain);
+ ac->rh = rh;
+ ac->authority_info.dns_authority.dns_handle = GNUNET_DNSSTUB_start (4);
+
+ for (unsigned int i=0;i<rd_count;i++)
+ {
+ char *ip;
+ char *n;
+ size_t off;
+ struct Gns2DnsPending *gp;
+ struct GNUNET_CRYPTO_EcdsaPublicKey zone;
+ struct sockaddr_in v4;
+ struct sockaddr_in6 v6;
+
+ if (GNUNET_GNSRECORD_TYPE_GNS2DNS != rd[i].record_type)
+ continue;
+ off = 0;
+ n = GNUNET_DNSPARSER_parse_name (rd[i].data,
+ rd[i].data_size,
+ &off);
+ ip = GNUNET_DNSPARSER_parse_name (rd[i].data,
+ rd[i].data_size,
+ &off);
+ if ( (NULL == n) ||
+ (NULL == ip) ||
+ (off != rd[i].data_size) )
+ {
+ GNUNET_break_op (0);
+ GNUNET_free_non_null (n);
+ GNUNET_free_non_null (ip);
+ continue;
+ }
+ /* resolve 'ip' to determine the IP(s) of the DNS
+ resolver to use for lookup of 'ns' */
+ if (NULL != ns)
+ {
+ if (0 != strcasecmp (ns,
+ n))
+ {
+ /* NS values must all be the same for all GNS2DNS records,
+ anything else leads to insanity */
+ GNUNET_break_op (0);
+ GNUNET_free (n);
+ GNUNET_free (ip);
+ continue;
+ }
+ GNUNET_free (n);
+ }
+ else
+ {
+ ns = n;
+ }
+
+ /* check if 'ip' is already an IPv4/IPv6 address */
+ if ( (1 == inet_pton (AF_INET,
+ ip,
+ &v4)) ||
+ (1 == inet_pton (AF_INET6,
+ ip,
+ &v6)) )
+ {
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_DNSSTUB_add_dns_ip (ac->authority_info.dns_authority.dns_handle,
+ ip));
+ ac->authority_info.dns_authority.found = GNUNET_YES;
+ GNUNET_free (ip);
+ continue;
+ }
+ tld = GNS_get_tld (ip);
+ if (0 != strcmp (tld,
+ "+"))
+ {
+ /* 'ip' is a DNS name */
+ gp = GNUNET_new (struct Gns2DnsPending);
+ gp->ac = ac;
+ GNUNET_CONTAINER_DLL_insert (ac->authority_info.dns_authority.gp_head,
+ ac->authority_info.dns_authority.gp_tail,
+ gp);
+ gp->dns_rh = GNUNET_RESOLVER_ip_get (ip,
+ AF_UNSPEC,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &handle_gns2dns_ip,
+ gp);
+ GNUNET_free (ip);
+ continue;
+ }
+ /* 'ip' should be a GNS name */
+ gp = GNUNET_new (struct Gns2DnsPending);
+ gp->ac = ac;
+ GNUNET_CONTAINER_DLL_insert (ac->authority_info.dns_authority.gp_head,
+ ac->authority_info.dns_authority.gp_tail,
+ gp);
+ gp->rh = GNUNET_new (struct GNS_ResolverHandle);
+ ip = translate_dot_plus (rh,
+ ip);
+ tld = GNS_get_tld (ip);
+ if (GNUNET_OK !=
+ GNUNET_GNSRECORD_zkey_to_pkey (tld,
+ &zone))
+ {
+ GNUNET_break_op (0);
+ GNUNET_free (ip);
+ continue;
+ }
+ gp->rh->authority_zone = zone;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Resolving `%s' to determine IP address of DNS server for GNS2DNS transition for `%s'\n",
+ ip,
+ ns);
+ gp->rh->name = ip;
+ gp->rh->name_resolution_pos = strlen (ip) - strlen (tld) - 1;
+ gp->rh->proc = &handle_gns2dns_result;
+ gp->rh->proc_cls = gp;
+ gp->rh->record_type = GNUNET_GNSRECORD_TYPE_ANY;
+ gp->rh->options = GNUNET_GNS_LO_DEFAULT;
+ gp->rh->loop_limiter = rh->loop_limiter + 1;
+ gp->rh->task_id
+ = GNUNET_SCHEDULER_add_now (&start_resolver_lookup,
+ gp->rh);
+ } /* end 'for all records' */
+
+ if (NULL == ns)
+ {
+ /* not a single GNS2DNS record found */
+ GNUNET_free (ac);
+ return GNUNET_SYSERR;
+ }
+ GNUNET_assert (strlen (ns) <= GNUNET_DNSPARSER_MAX_NAME_LENGTH);
+ strcpy (ac->authority_info.dns_authority.name,
+ ns);
+ /* for DNS recursion, the label is the full DNS name,
+ created from the remainder of the GNS name and the
+ name in the NS record */
+ GNUNET_asprintf (&ac->label,
+ "%.*s%s%s",
+ (int) rh->name_resolution_pos,
+ rh->name,
+ (0 != rh->name_resolution_pos) ? "." : "",
+ ns);
+ GNUNET_free (ns);
+ GNUNET_CONTAINER_DLL_insert_tail (rh->ac_head,
+ rh->ac_tail,
+ ac);
+ if (strlen (ac->label) > GNUNET_DNSPARSER_MAX_NAME_LENGTH)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("GNS lookup resulted in DNS name that is too long (`%s')\n"),
+ ac->label);
+ return GNUNET_SYSERR;
+ }
+ continue_with_gns2dns (ac);
+ return GNUNET_OK;
+}
+
/**
* Process a records that were decrypted from a block.
const struct GNUNET_GNSRECORD_Data *rd)
{
struct GNS_ResolverHandle *rh = cls;
- struct AuthorityChain *ac;
- struct AuthorityChain *shorten_ac;
char *cname;
struct VpnContext *vpn_ctx;
const struct GNUNET_TUN_GnsVpnRecord *vpn;
rh->ac_tail->label,
GNUNET_GNSRECORD_z2s (&rh->ac_tail->authority_info.gns_authority),
rd_count);
+ if (0 == rd_count)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("GNS lookup failed (zero records found for `%s')\n"),
+ rh->name);
+ fail_resolution (rh);
+ return;
+ }
+
if (0 == rh->name_resolution_pos)
{
/* top-level match, are we done yet? */
(off != rd[0].data_size) )
{
GNUNET_break_op (0);
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
GNUNET_free_non_null (cname);
+ fail_resolution (rh);
return;
}
handle_gns_cname_result (rh,
rd[i].data_size)
{
GNUNET_break_op (0);
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
+ fail_resolution (rh);
return;
}
vpn = (const struct GNUNET_TUN_GnsVpnRecord *) rd[i].data;
if ('\0' != vname[rd[i].data_size - 1 - sizeof (struct GNUNET_TUN_GnsVpnRecord)])
{
GNUNET_break_op (0);
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
+ fail_resolution (rh);
return;
}
GNUNET_TUN_service_name_to_hash (vname,
vpn_ctx->rh = rh;
vpn_ctx->rd_data_size = GNUNET_GNSRECORD_records_get_size (rd_count,
rd);
- vpn_ctx->rd_data = GNUNET_malloc (vpn_ctx->rd_data_size);
+ if (vpn_ctx->rd_data_size < 0)
+ {
+ GNUNET_break_op (0);
+ GNUNET_free (vpn_ctx);
+ fail_resolution (rh);
+ return;
+ }
+ vpn_ctx->rd_data = GNUNET_malloc ((size_t) vpn_ctx->rd_data_size);
vpn_ctx->rd_count = rd_count;
GNUNET_assert (vpn_ctx->rd_data_size ==
- (size_t) GNUNET_GNSRECORD_records_serialize (rd_count,
- rd,
- vpn_ctx->rd_data_size,
- vpn_ctx->rd_data));
+ GNUNET_GNSRECORD_records_serialize (rd_count,
+ rd,
+ (size_t) vpn_ctx->rd_data_size,
+ vpn_ctx->rd_data));
vpn_ctx->vpn_request = GNUNET_VPN_redirect_to_peer (vpn_handle,
af,
ntohs (vpn->proto),
/* delegation to DNS */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Found GNS2DNS record, delegating to DNS!\n");
- goto do_recurse;
+ if (GNUNET_OK ==
+ recursive_gns2dns_resolution (rh,
+ rd_count,
+ rd))
+ return;
+ else
+ goto fail;
}
default:
break;
using 'scratch' array for memory allocations */
scratch_off = 0;
rd_off = 0;
- shorten_ac = rh->ac_tail;
for (unsigned int i=0;i<rd_count;i++)
{
GNUNET_assert (rd_off <= i);
GNUNET_break_op (0);
break;
}
- if (NULL == shorten_ac->suggested_shortening_label)
- shorten_ac->suggested_shortening_label = GNUNET_strdup (nick);
break;
}
case GNUNET_GNSRECORD_TYPE_PKEY:
GNUNET_break_op (0);
break;
}
- GNUNET_memcpy (&pub, rd[i].data, rd[i].data_size);
+ GNUNET_memcpy (&pub,
+ rd[i].data,
+ rd[i].data_size);
rd_off++;
if (GNUNET_GNSRECORD_TYPE_PKEY != rh->record_type)
{
- /* try to resolve "+" */
+ /* try to resolve "@" */
struct AuthorityChain *ac;
ac = GNUNET_new (struct AuthorityChain);
ac->rh = rh;
ac->gns_authority = GNUNET_YES;
ac->authority_info.gns_authority = pub;
- ac->label = GNUNET_strdup (GNUNET_GNS_MASTERZONE_STR);
- ac->suggested_shortening_label = NULL;
- ac->shortening_started = GNUNET_NO;
+ ac->label = GNUNET_strdup (GNUNET_GNS_EMPTY_LABEL_AT);
GNUNET_CONTAINER_DLL_insert_tail (rh->ac_head,
rh->ac_tail,
ac);
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Found GNS2DNS record, delegating to DNS!\n");
- goto do_recurse;
+ if (GNUNET_OK ==
+ recursive_gns2dns_resolution (rh,
+ rd_count,
+ rd))
+ return;
+ else
+ goto fail;
}
case GNUNET_GNSRECORD_TYPE_BOX:
{
rh->proc (rh->proc_cls,
rd_off,
rd_new);
- GNS_resolver_lookup_cancel (rh);
+ rh->task_id = GNUNET_SCHEDULER_add_now (&GNS_resolver_lookup_cancel_,
+ rh);
return;
}
- do_recurse:
- /* need to recurse, check if we can */
- for (unsigned int i=0;i<rd_count;i++)
+
+ switch (rd[0].record_type)
{
- switch (rd[i].record_type)
- {
- case GNUNET_GNSRECORD_TYPE_PKEY:
- /* delegation to another zone */
- if (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) !=
- rd[i].data_size)
- {
- GNUNET_break_op (0);
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
- return;
- }
- /* expand authority chain */
- ac = GNUNET_new (struct AuthorityChain);
- ac->rh = rh;
- ac->gns_authority = GNUNET_YES;
- ac->suggested_shortening_label = NULL;
- ac->shortening_started = GNUNET_NO;
- GNUNET_memcpy (&ac->authority_info.gns_authority,
- rd[i].data,
- sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey));
- ac->label = resolver_lookup_get_next_label (rh);
- /* add AC to tail */
- GNUNET_CONTAINER_DLL_insert_tail (rh->ac_head,
- rh->ac_tail,
- ac);
- /* recurse */
- rh->task_id = GNUNET_SCHEDULER_add_now (&recursive_resolution,
- rh);
+ case GNUNET_DNSPARSER_TYPE_CNAME:
+ GNUNET_break_op (1 == rd_count); /* CNAME should be unique */
+ recursive_cname_resolution (rh,
+ &rd[0]);
+ return;
+ case GNUNET_GNSRECORD_TYPE_PKEY:
+ GNUNET_break_op (1 == rd_count); /* PKEY should be unique */
+ recursive_pkey_resolution (rh,
+ &rd[0]);
+ return;
+ default:
+ if (GNUNET_OK ==
+ recursive_gns2dns_resolution (rh,
+ rd_count,
+ rd))
return;
- case GNUNET_GNSRECORD_TYPE_GNS2DNS:
- {
- /* resolution continues within DNS */
- struct Gns2DnsContext *g2dc;
- char *ip;
- char *ns;
- const char *tld;
- struct GNUNET_CRYPTO_EcdsaPublicKey zone;
- struct in_addr v4;
- struct in6_addr v6;
-
- off = 0;
- ns = GNUNET_DNSPARSER_parse_name (rd[i].data,
- rd[i].data_size,
- &off);
- ip = GNUNET_DNSPARSER_parse_name (rd[i].data,
- rd[i].data_size,
- &off);
- if ( (NULL == ns) ||
- (NULL == ip) ||
- (off != rd[i].data_size) )
- {
- GNUNET_break_op (0);
- GNUNET_free_non_null (ns);
- GNUNET_free_non_null (ip);
- fail_resolution (rh);
- return;
- }
- /* resolve 'ip' to determine the IP(s) of the DNS
- resolver to use for lookup of 'ns' */
- g2dc = GNUNET_new (struct Gns2DnsContext);
- g2dc->ns = ns;
- rh->g2dc = g2dc;
-
- /* check if 'ip' is already an IPv4/IPv6 address */
- if (1 == inet_pton (AF_INET,
- ip,
- &v4))
- {
- /* name is IPv4 address, pretend it's an A record */
- struct GNUNET_GNSRECORD_Data rd;
-
- GNUNET_free (ip);
- rd.data = &v4;
- rd.data_size = sizeof (v4);
- rd.expiration_time = UINT64_MAX;
- rd.record_type = GNUNET_DNSPARSER_TYPE_A;
- rd.flags = 0;
- handle_gns2dns_result (rh,
- 1,
- &rd);
- return;
- }
- if (1 == inet_pton (AF_INET6,
- ip,
- &v6))
- {
- /* name is IPv6 address, pretend it's an AAAA record */
- struct GNUNET_GNSRECORD_Data rd;
-
- GNUNET_free (ip);
- rd.data = &v6;
- rd.data_size = sizeof (v6);
- rd.expiration_time = UINT64_MAX;
- rd.record_type = GNUNET_DNSPARSER_TYPE_AAAA;
- rd.flags = 0;
- handle_gns2dns_result (rh,
- 1,
- &rd);
- return;
- }
-
- tld = GNS_get_tld (ip);
- if (0 != strcmp (tld,
- "+"))
- {
- /* 'ip' is a DNS name */
- g2dc->dns_rh = GNUNET_RESOLVER_ip_get (ip,
- AF_UNSPEC,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &handle_gns2dns_ip,
- g2dc);
- GNUNET_free (ip);
- return;
- }
-
- /* 'ip' should be a GNS name */
- g2dc->rh = GNUNET_new (struct GNS_ResolverHandle);
-
- ip = translate_dot_plus (rh,
- ip);
- tld = GNS_get_tld (ip);
- if (GNUNET_OK !=
- GNUNET_GNSRECORD_zkey_to_pkey (tld,
- &zone))
- {
- GNUNET_break_op (0);
- GNUNET_free_non_null (ns);
- GNUNET_free_non_null (ip);
- GNUNET_free (g2dc);
- fail_resolution (rh);
- return;
- }
- g2dc->rh->authority_zone = zone;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Resolving `%s' to determine IP address of DNS server for GNS2DNS transition for `%s'\n",
- ip,
- ns);
- g2dc->rh->name = ip;
- g2dc->rh->name_resolution_pos = strlen (ip) - strlen (tld) - 1;
- g2dc->rh->proc = &handle_gns2dns_result;
- g2dc->rh->proc_cls = rh;
- g2dc->rh->record_type = GNUNET_GNSRECORD_TYPE_ANY;
- g2dc->rh->options = GNUNET_GNS_LO_DEFAULT;
- g2dc->rh->loop_limiter = rh->loop_limiter + 1;
- g2dc->rh->task_id
- = GNUNET_SCHEDULER_add_now (&start_resolver_lookup,
- g2dc->rh);
- return;
- }
- case GNUNET_DNSPARSER_TYPE_CNAME:
- {
- char *cname;
-
- off = 0;
- cname = GNUNET_DNSPARSER_parse_name (rd[i].data,
- rd[i].data_size,
- &off);
- if ( (NULL == cname) ||
- (off != rd[i].data_size) )
- {
- GNUNET_break_op (0); /* record not well-formed */
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
- GNUNET_free_non_null (cname);
- return;
- }
- handle_gns_cname_result (rh,
- cname);
- GNUNET_free (cname);
- return;
- }
- /* FIXME: handle DNAME */
- default:
- /* skip */
- break;
- }
+ break;
}
+ fail:
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("GNS lookup recursion failed (no delegation record found)\n"));
- rh->proc (rh->proc_cls,
- 0,
- NULL);
- GNS_resolver_lookup_cancel (rh);
+ fail_resolution (rh);
}
{
/* how did this pass DHT block validation!? */
GNUNET_break (0);
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
+ fail_resolution (rh);
return;
}
block = data;
{
/* how did this pass DHT block validation!? */
GNUNET_break (0);
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
+ fail_resolution (rh);
return;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Decrypting DHT block of size %u for `%s', expires %s\n",
+ ntohl (block->purpose.size),
+ rh->name,
+ GNUNET_STRINGS_absolute_time_to_string (exp));
if (GNUNET_OK !=
GNUNET_GNSRECORD_block_decrypt (block,
&ac->authority_info.gns_authority,
rh))
{
GNUNET_break_op (0); /* block was ill-formed */
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
+ fail_resolution (rh);
return;
}
if (0 == GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_ntoh (block->expiration_time)).rel_value_us)
"Received expired block from the DHT, will not cache it.\n");
return;
}
+ if (GNUNET_YES == disable_cache)
+ return;
/* Cache well-formed blocks */
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Caching response from the DHT in namecache\n");
if (GNUNET_CONTAINER_heap_get_size (dht_lookup_heap) > max_allowed_background_queries)
{
/* fail longest-standing DHT request */
- rx = GNUNET_CONTAINER_heap_peek (dht_lookup_heap);
+ rx = GNUNET_CONTAINER_heap_remove_root (dht_lookup_heap);
+ rx->dht_heap_node = NULL;
GNUNET_assert (NULL != rx);
- rx->proc (rx->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rx);
+ fail_resolution (rx);
}
}
{
struct GNS_ResolverHandle *rh = cls;
+ if (0 == rd_count)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("GNS namecache returned empty result for `%s'\n"),
+ rh->name);
handle_gns_resolution_result (rh,
rd_count,
rd);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received result from namecache for label `%s'\n",
- ac->label);
-
if ( (NULL == block) ||
(0 == GNUNET_TIME_absolute_get_remaining (GNUNET_TIME_absolute_ntoh (block->expiration_time)).rel_value_us) )
{
"Resolution failed for `%s' in zone %s (DHT lookup not permitted by configuration)\n",
ac->label,
GNUNET_GNSRECORD_z2s (&ac->authority_info.gns_authority));
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
+ fail_resolution (rh);
return;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received result from namecache for label `%s'\n",
+ ac->label);
+
if (GNUNET_OK !=
GNUNET_GNSRECORD_block_decrypt (block,
auth,
GNUNET_GNSRECORD_query_from_public_key (&ac->authority_info.gns_authority,
ac->label,
&query);
- if (GNUNET_YES == use_cache)
+ if (GNUNET_YES != disable_cache)
{
rh->namecache_qe
= GNUNET_NAMECACHE_lookup_block (namecache_handle,
}
else
{
- start_dht_request (rh, &query);
+ start_dht_request (rh,
+ &query);
}
}
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("Zone %s was revoked, resolution fails\n"),
GNUNET_GNSRECORD_z2s (&ac->authority_info.gns_authority));
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
+ fail_resolution (rh);
return;
}
recursive_gns_resolution_namecache (rh);
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Encountered unbounded recursion resolving `%s'\n",
rh->name);
- rh->proc (rh->proc_cls, 0, NULL);
- GNS_resolver_lookup_cancel (rh);
+ fail_resolution (rh);
return;
}
if (GNUNET_YES == rh->ac_tail->gns_authority)
rd.expiration_time = UINT64_MAX;
rd.record_type = GNUNET_DNSPARSER_TYPE_A;
rd.flags = 0;
- rh->proc (rh->proc_cls, 1, &rd);
- GNS_resolver_lookup_cancel (rh);
+ rh->proc (rh->proc_cls,
+ 1,
+ &rd);
+ GNUNET_assert (NULL == rh->task_id);
+ rh->task_id = GNUNET_SCHEDULER_add_now (&GNS_resolver_lookup_cancel_,
+ rh);
return;
}
if (1 == inet_pton (AF_INET6,
rd.expiration_time = UINT64_MAX;
rd.record_type = GNUNET_DNSPARSER_TYPE_AAAA;
rd.flags = 0;
- rh->proc (rh->proc_cls, 1, &rd);
- GNS_resolver_lookup_cancel (rh);
+ rh->proc (rh->proc_cls,
+ 1,
+ &rd);
+ GNUNET_assert (NULL == rh->task_id);
+ rh->task_id = GNUNET_SCHEDULER_add_now (&GNS_resolver_lookup_cancel_,
+ rh);
return;
}
ac = GNUNET_new (struct AuthorityChain);
ac->rh = rh;
ac->label = resolver_lookup_get_next_label (rh);
- ac->suggested_shortening_label = NULL;
if (NULL == ac->label)
/* name was just the "TLD", so we default to label
- #GNUNET_GNS_MASTERZONE_STR */
- ac->label = GNUNET_strdup (GNUNET_GNS_MASTERZONE_STR);
+ #GNUNET_GNS_EMPTY_LABEL_AT */
+ ac->label = GNUNET_strdup (GNUNET_GNS_EMPTY_LABEL_AT);
ac->gns_authority = GNUNET_YES;
ac->authority_info.gns_authority = rh->authority_zone;
GNUNET_CONTAINER_DLL_insert_tail (rh->ac_head,
GNUNET_CONTAINER_DLL_remove (rlh_head,
rlh_tail,
rh);
+ if (NULL != rh->dns_request)
+ {
+ GNUNET_DNSSTUB_resolve_cancel (rh->dns_request);
+ rh->dns_request = NULL;
+ }
while (NULL != (ac = rh->ac_head))
{
GNUNET_CONTAINER_DLL_remove (rh->ac_head,
rh->ac_tail,
ac);
- GNUNET_free (ac->label);
- GNUNET_free_non_null (ac->suggested_shortening_label);
- GNUNET_free (ac);
- }
- if (NULL != rh->g2dc)
- {
- /* rh->g2dc->rh is NOT in the DLL yet, so to enable us
- using GNS_resolver_lookup_cancel here, we need to
- add it first... */
- if (NULL != rh->g2dc->rh)
- {
- GNUNET_CONTAINER_DLL_insert (rlh_head,
- rlh_tail,
- rh->g2dc->rh);
- GNS_resolver_lookup_cancel (rh->g2dc->rh);
- rh->g2dc->rh = NULL;
- }
- if (NULL != rh->g2dc->dns_rh)
+ if (GNUNET_NO == ac->gns_authority)
{
- GNUNET_RESOLVER_request_cancel (rh->g2dc->dns_rh);
- rh->g2dc->rh = NULL;
+ struct Gns2DnsPending *gp;
+
+ while (NULL != (gp = ac->authority_info.dns_authority.gp_head))
+ {
+ GNUNET_CONTAINER_DLL_remove (ac->authority_info.dns_authority.gp_head,
+ ac->authority_info.dns_authority.gp_tail,
+ gp);
+ if (NULL != gp->rh)
+ {
+ /* rh->g2dc->rh is NOT in the DLL yet, so to enable us
+ using GNS_resolver_lookup_cancel here, we need to
+ add it first... */
+ GNUNET_CONTAINER_DLL_insert (rlh_head,
+ rlh_tail,
+ gp->rh);
+ GNUNET_assert (NULL == gp->rh->task_id);
+ gp->rh->task_id = GNUNET_SCHEDULER_add_now (&GNS_resolver_lookup_cancel_,
+ gp->rh);
+ gp->rh = NULL;
+ }
+ if (NULL != gp->dns_rh)
+ {
+ GNUNET_RESOLVER_request_cancel (gp->dns_rh);
+ gp->dns_rh = NULL;
+ }
+ GNUNET_free (gp);
+ }
+ GNUNET_DNSSTUB_stop (ac->authority_info.dns_authority.dns_handle);
}
- GNUNET_free (rh->g2dc->ns);
- GNUNET_free (rh->g2dc);
- rh->g2dc = NULL;
+ GNUNET_free (ac->label);
+ GNUNET_free (ac);
}
if (NULL != rh->task_id)
{
GNUNET_free (vpn_ctx->rd_data);
GNUNET_free (vpn_ctx);
}
- if (NULL != rh->dns_request)
- {
- GNUNET_DNSSTUB_resolve_cancel (rh->dns_request);
- rh->dns_request = NULL;
- }
if (NULL != rh->namecache_qe)
{
GNUNET_NAMECACHE_cancel (rh->namecache_qe);
dr);
GNUNET_free (dr);
}
+ GNUNET_free_non_null (rh->leho);
GNUNET_free (rh->name);
GNUNET_free (rh);
}
const struct GNUNET_CONFIGURATION_Handle *c,
unsigned long long max_bg_queries)
{
- char *dns_ip;
-
cfg = c;
namecache_handle = nc;
dht_handle = dht;
dht_lookup_heap =
GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
max_allowed_background_queries = max_bg_queries;
- if (GNUNET_SYSERR == (use_cache =
- GNUNET_CONFIGURATION_get_value_yesno (c,
- "gns",
- "USE_CACHE")))
- use_cache = GNUNET_YES;
- if (GNUNET_NO == use_cache)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ disable_cache = GNUNET_CONFIGURATION_get_value_yesno (cfg,
+ "namecache",
+ "DISABLE");
+ if (GNUNET_YES == disable_cache)
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Namecache disabled\n");
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_string (c,
- "gns",
- "DNS_RESOLVER",
- &dns_ip))
- {
- /* user did not specify DNS resolver, use 8.8.8.8 */
- dns_ip = GNUNET_strdup ("8.8.8.8");
- }
- dns_handle = GNUNET_DNSSTUB_start (dns_ip);
- GNUNET_free (dns_ip);
vpn_handle = GNUNET_VPN_connect (cfg);
}
/* abort active resolutions */
while (NULL != (rh = rlh_head))
{
- rh->proc (rh->proc_cls, 0, NULL);
+ rh->proc (rh->proc_cls,
+ 0,
+ NULL);
GNS_resolver_lookup_cancel (rh);
}
while (NULL != (co = co_head))
}
GNUNET_CONTAINER_heap_destroy (dht_lookup_heap);
dht_lookup_heap = NULL;
- GNUNET_DNSSTUB_stop (dns_handle);
- dns_handle = NULL;
GNUNET_VPN_disconnect (vpn_handle);
vpn_handle = NULL;
dht_handle = NULL;
projects / oweals / gnunet.git / blobdiff