[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27234 - gnunet/src/gns
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r27234 - gnunet/src/gns |
|
Date: |
Tue, 21 May 2013 20:55:17 +0200 |
Author: grothoff
Date: 2013-05-21 20:55:17 +0200 (Tue, 21 May 2013)
New Revision: 27234
Modified:
gnunet/src/gns/gnunet-service-gns.c
gnunet/src/gns/gnunet-service-gns_resolver.c
gnunet/src/gns/gnunet-service-gns_resolver.h
gnunet/src/gns/test_gns_ns_lookup.c
Log:
-fix CNAME handling after GADS to DNS delegation, need to repack query packet
Modified: gnunet/src/gns/gnunet-service-gns.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns.c 2013-05-21 15:30:28 UTC (rev 27233)
+++ gnunet/src/gns/gnunet-service-gns.c 2013-05-21 18:55:17 UTC (rev 27234)
@@ -306,7 +306,7 @@
struct ClientShortenHandle *csh_tmp;
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "Shutting down!");
+ "Shutting down!\n");
while (NULL != (csh_tmp = csh_head))
{
GNUNET_CONTAINER_DLL_remove (csh_head, csh_tail, csh_tmp);
Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c 2013-05-21 15:30:28 UTC
(rev 27233)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c 2013-05-21 18:55:17 UTC
(rev 27234)
@@ -1445,7 +1445,7 @@
/**
- * Read DNS udp packet from socket
+ * Read DNS packet from UDP socket and process the reply.
*
* @param cls the resolver handle
* @param tc task context
@@ -1505,14 +1505,47 @@
packet->answers[i].type,
rlh->record_type);
/* http://tools.ietf.org/html/rfc1034#section-3.6.2 */
- if (packet->answers[i].type == GNUNET_GNS_RECORD_CNAME)
+ if (GNUNET_GNS_RECORD_CNAME == packet->answers[i].type)
{
+ struct GNUNET_DNSPARSER_Query query;
+ struct GNUNET_DNSPARSER_Packet npacket;
+ struct GNUNET_DNSPARSER_Flags flags;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "CNAME... restarting query with %s\n",
- packet->answers[i].data.hostname
- );
- strcpy (rh->dns_name, packet->answers[i].data.hostname);
+ "CNAME record, restarting query with `%s'\n",
+ packet->answers[i].data.hostname);
+ strcpy (rh->dns_name,
+ packet->answers[i].data.hostname);
found_cname = GNUNET_YES;
+ query.name = rh->dns_name;
+ query.type = rlh->record_type;
+ query.class = GNUNET_DNSPARSER_CLASS_INTERNET;
+ memset (&flags, 0, sizeof (flags));
+ flags.recursion_desired = 1;
+ flags.checking_disabled = 1;
+ npacket.queries = &query;
+ npacket.answers = NULL;
+ npacket.authority_records = NULL;
+ npacket.num_queries = 1;
+ npacket.num_answers = 0;
+ npacket.num_authority_records = 0;
+ npacket.num_additional_records = 0;
+ npacket.flags = flags;
+ npacket.id = rh->id;
+ GNUNET_free_non_null (rh->dns_raw_packet);
+ rh->dns_raw_packet = NULL;
+ if (GNUNET_OK != GNUNET_DNSPARSER_pack (&npacket,
+ UINT16_MAX,
+ &rh->dns_raw_packet,
+ &rh->dns_raw_packet_size))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_REC_DNS-%llu: Creating raw dns packet!\n",
+ rh->id);
+ GNUNET_NETWORK_socket_close (rh->dns_sock);
+ finish_lookup (rh, rlh, 0, NULL);
+ return;
+ }
continue;
}
@@ -1534,22 +1567,23 @@
if (GNUNET_YES == found_cname)
{
- zone_offset = strlen (rh->dns_name) - strlen (rh->dns_zone) - 1;
-
+ zone_offset = strlen (rh->dns_name) - strlen (rh->dns_zone) - 1;
if (0 > zone_offset)
zone_offset = 0;
/* restart query with CNAME */
- if (0 == strcmp (rh->dns_name+zone_offset, rh->dns_zone))
+ if (0 == strcmp (rh->dns_name + zone_offset, rh->dns_zone))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Asking same server for %s\n", rh->dns_name);
+ "Asking DNS server for `%s'\n",
+ rh->dns_name);
+
send_dns_packet (rh);
}
else
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Trying system resolver for %s\n", rh->dns_name);
+ "Trying system resolver for `%s'\n", rh->dns_name);
resolve_dns_name (rh);
}
@@ -1687,12 +1721,12 @@
}
/* The glue */
if (GNUNET_GNS_RECORD_A == rd[i].record_type)
- /* need to use memcpy as .data may be unaligned */
- memcpy (&dnsip, rd[i].data, sizeof (dnsip));
+ /* need to use memcpy as .data may be unaligned */
+ memcpy (&dnsip, rd[i].data, sizeof (dnsip));
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_DNS-%llu: Looking up %s from %s\n",
+ "GNS_PHASE_REC_DNS-%llu: Looking up `%s' from `%s'\n",
rh->id,
rh->dns_name,
inet_ntoa (dnsip));
@@ -1714,7 +1748,7 @@
sizeof (struct sockaddr_in)))
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_REC_DNS-%llu: Error binding udp socket for dns!\n",
+ "GNS_PHASE_REC_DNS-%llu: Error binding UDP socket for DNS
lookup!\n",
rh->id);
finish_lookup (rh, rlh, 0, NULL);
return;
@@ -2652,10 +2686,8 @@
//Was canonical?
if (0 == len)
return;
-
name[len] = '\0';
-
- strcpy(dest, (name+len+1));
+ strcpy (dest, (name+len+1));
}
@@ -2781,7 +2813,7 @@
/**
- * Checks if name is in tld
+ * Checks if "name" ends in ".tld"
*
* @param name the name to check
* @param tld the TLD to check for
@@ -2794,14 +2826,9 @@
if (strlen (name) <= strlen (tld))
return GNUNET_NO;
-
offset = strlen (name) - strlen (tld);
if (0 != strcmp (name + offset, tld))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "%s is not in .%s TLD\n", name, tld);
return GNUNET_NO;
- }
return GNUNET_YES;
}
@@ -2823,9 +2850,9 @@
int check_dht;
size_t s_len;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Resolution status: %d.\n",
- rh->id, rh->status);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Resolution status: %d.\n",
+ rh->id, rh->status);
if (rh->status & RSL_PKEY_REVOKED)
{
@@ -2908,16 +2935,15 @@
{
if (GNUNET_GNS_RECORD_NS == rlh->record_type)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Resolved queried NSRR in
NS.\n",
- rh->id);
- finish_lookup(rh, rlh, rd_count, rd);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Resolved queried NSRR in
NS.\n",
+ rh->id);
+ finish_lookup (rh, rlh, rd_count, rd);
return;
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: NS delegation starting.\n",
- rh->id);
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: NS delegation starting.\n",
+ rh->id);
GNUNET_assert (NULL != rd);
rh->proc = &handle_record_ns;
resolve_record_dns (rh, rd_count, rd);
@@ -3049,27 +3075,31 @@
char new_name[GNUNET_DNSPARSER_MAX_NAME_LENGTH];
unsigned int i;
struct GNUNET_TIME_Absolute et;
+ struct AuthorityChain *auth;
rh->namestore_task = NULL;
+ GNUNET_CRYPTO_short_hash (key,
+ sizeof (struct
GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ &zone);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Got %d records from authority
lookup\n",
- rh->id, rd_count);
+ "GNS_PHASE_DELEGATE_NS-%llu: Got %d records from authority lookup
for `%s' in zone %s\n",
+ rh->id, rd_count,
+ name,
+ GNUNET_short_h2s (&zone));
- GNUNET_CRYPTO_short_hash (key,
- sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &zone);
remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
rh->status = 0;
- if (name != NULL)
+ if (NULL != name)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Records with name %s exist.\n",
- rh->id, name);
+ "GNS_PHASE_DELEGATE_NS-%llu: Records with name `%s' exist in
zone %s.\n",
+ rh->id, name,
+ GNUNET_short_h2s (&zone));
rh->status |= RSL_RECORD_EXISTS;
- if (remaining_time.rel_value == 0)
+ if (0 == remaining_time.rel_value)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: Record set %s expired.\n",
@@ -3081,7 +3111,7 @@
/**
* No authority found in namestore.
*/
- if (rd_count == 0)
+ if (0 == rd_count)
{
/**
* We did not find an authority in the namestore
@@ -3125,125 +3155,104 @@
*/
for (i=0; i < rd_count;i++)
{
-
- /**
- * A CNAME. Like regular DNS this means the is no other record for this
- * name.
- */
- if (rd[i].record_type == GNUNET_GNS_RECORD_CNAME)
+ switch (rd[i].record_type)
{
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: CNAME found.\n",
- rh->id);
+ case GNUNET_GNS_RECORD_CNAME:
+ /* Like in regular DNS this should mean that there is no other
+ * record for this name. */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: CNAME `%.*s' found.\n",
+ rh->id,
+ (int) rd[i].data_size,
+ rd[i].data);
rh->status |= RSL_CNAME_FOUND;
rh->proc (rh->proc_cls, rh, rd_count, rd);
return;
- }
-
- /**
- * Redirect via VPN
- */
- if (rd[i].record_type == GNUNET_GNS_RECORD_VPN)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: VPN found.\n",
- rh->id);
+ case GNUNET_GNS_RECORD_VPN:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: VPN found.\n",
+ rh->id);
rh->status |= RSL_DELEGATE_VPN;
rh->proc (rh->proc_cls, rh, rd_count, rd);
return;
- }
-
- /**
- * Redirect via NS
- * FIXME make optional
- */
- if (rd[i].record_type == GNUNET_GNS_RECORD_NS)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: NS found.\n",
- rh->id);
+ case GNUNET_GNS_RECORD_NS:
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: NS `%.*s' found.\n",
+ rh->id,
+ (int) rd[i].data_size,
+ rd[i].data);
rh->status |= RSL_DELEGATE_NS;
rh->proc (rh->proc_cls, rh, rd_count, rd);
return;
- }
-
- if (rd[i].record_type != GNUNET_GNS_RECORD_PKEY)
- continue;
-
- rh->status |= RSL_DELEGATE_PKEY;
-
- if ((ignore_pending_records != 0) &&
- (rd[i].flags & GNUNET_NAMESTORE_RF_PENDING))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: PKEY for %s is pending user confirmation.\n",
- rh->id,
- name);
- continue;
- }
-
- GNUNET_break (0 == (rd[i].flags &
GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
- et.abs_value = rd[i].expiration_time;
- if ((GNUNET_TIME_absolute_get_remaining (et)).rel_value
- == 0)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: This pkey is expired.\n",
- rh->id);
- if (remaining_time.rel_value == 0)
+ case GNUNET_GNS_RECORD_PKEY:
+ rh->status |= RSL_DELEGATE_PKEY;
+ if ((ignore_pending_records != 0) &&
+ (rd[i].flags & GNUNET_NAMESTORE_RF_PENDING))
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: This dht entry is expired.\n",
- rh->id);
- rh->authority_chain_head->fresh = 0;
- rh->proc (rh->proc_cls, rh, 0, NULL);
- return;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: PKEY for %s is pending user
confirmation.\n",
+ rh->id,
+ name);
+ continue;
+ }
+ GNUNET_break (0 == (rd[i].flags &
GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION));
+ et.abs_value = rd[i].expiration_time;
+ if (0 == (GNUNET_TIME_absolute_get_remaining (et)).rel_value)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: This pkey is expired.\n",
+ rh->id);
+ if (remaining_time.rel_value == 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: This dht entry is
expired.\n",
+ rh->id);
+ rh->authority_chain_head->fresh = 0;
+ rh->proc (rh->proc_cls, rh, 0, NULL);
+ return;
+ }
+ continue;
}
-
- continue;
+ /* Resolve rest of query with new authority */
+ memcpy (&rh->authority, rd[i].data,
+ sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+ auth = GNUNET_malloc(sizeof (struct AuthorityChain));
+ auth->zone = rh->authority;
+ memset (auth->name, 0, strlen (rh->authority_name)+1);
+ strcpy (auth->name, rh->authority_name);
+ GNUNET_CONTAINER_DLL_insert (rh->authority_chain_head,
+ rh->authority_chain_tail,
+ auth);
+ if (NULL != rh->rd.data)
+ GNUNET_free ((void*)(rh->rd.data));
+ memcpy (&rh->rd, &rd[i], sizeof (struct GNUNET_NAMESTORE_RecordData));
+ rh->rd.data = GNUNET_malloc (rd[i].data_size);
+ memcpy ((void*)rh->rd.data, rd[i].data, rd[i].data_size);
+ rh->rd_count = 1;
+ /* Check for key revocation and delegate */
+ rh->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
+ &rh->authority,
+
GNUNET_GNS_MASTERZONE_STR,
+
GNUNET_GNS_RECORD_REV,
+
&process_pkey_revocation_result_ns,
+ rh);
+ return;
+ default:
+ /* ignore, move to next result */
+ break;
}
-
- /**
- * Resolve rest of query with new authority
- */
- GNUNET_assert (rd[i].record_type == GNUNET_GNS_RECORD_PKEY);
- memcpy (&rh->authority, rd[i].data,
- sizeof (struct GNUNET_CRYPTO_ShortHashCode));
- struct AuthorityChain *auth = GNUNET_malloc(sizeof (struct
AuthorityChain));
- auth->zone = rh->authority;
- memset (auth->name, 0, strlen (rh->authority_name)+1);
- strcpy (auth->name, rh->authority_name);
- GNUNET_CONTAINER_DLL_insert (rh->authority_chain_head,
- rh->authority_chain_tail,
- auth);
- if (NULL != rh->rd.data)
- GNUNET_free ((void*)(rh->rd.data));
-
- memcpy (&rh->rd, &rd[i], sizeof (struct GNUNET_NAMESTORE_RecordData));
- rh->rd.data = GNUNET_malloc (rd[i].data_size);
- memcpy ((void*)rh->rd.data, rd[i].data, rd[i].data_size);
- rh->rd_count = 1;
- /* Check for key revocation and delegate */
- rh->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
- &rh->authority,
-
GNUNET_GNS_MASTERZONE_STR,
- GNUNET_GNS_RECORD_REV,
-
&process_pkey_revocation_result_ns,
- rh);
- return;
}
- /**
- * no answers found
- */
+ /* no answers that would cause delegation were found */
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Authority lookup and no PKEY...\n", rh->id);
+ "GNS_PHASE_DELEGATE_NS-%llu: Authority lookup failed (no PKEY
record)\n",
+ rh->id);
/**
* If we have found some records for the LAST label
- * we return the results. Else null.
+ * we return the results. Else NULL.
*/
- if (strcmp (rh->name, "") == 0)
+ if (0 == strcmp (rh->name, ""))
{
/* Start shortening */
if ((rh->priv_key != NULL) &&
@@ -3274,6 +3283,7 @@
/**
* Resolve the delegation chain for the request in our namestore
+ * (as in, find the respective authority for the leftmost label).
*
* @param rh the resolver handle
*/
@@ -3282,9 +3292,11 @@
{
pop_tld (rh->name, rh->authority_name);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "GNS_PHASE_DELEGATE_NS-%llu: Resolving delegation for %s by
looking up %s\n",
- rh->id, rh->name,
- rh->authority_name);
+ "GNS_PHASE_DELEGATE_NS-%llu: Finding authority for `%s' by
looking up `%s' in GADS zone `%s'\n",
+ rh->id,
+ rh->name,
+ rh->authority_name,
+ GNUNET_short_h2s (&rh->authority));
rh->namestore_task = GNUNET_NAMESTORE_lookup_record (namestore_handle,
&rh->authority,
rh->authority_name,
@@ -3326,7 +3338,7 @@
char* nzkey_ptr = nzkey;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting resolution for %s (type=%d) with timeout %s!\n",
+ "Starting resolution for `%s' (type=%d) with timeout %s!\n",
name, record_type,
GNUNET_STRINGS_relative_time_to_string (timeout, GNUNET_YES));
@@ -3379,14 +3391,12 @@
if (strcmp(GNUNET_GNS_TLD, name) == 0)
{
/**
- * Only 'gnunet' given
+ * Only '.gads' given
*/
- strcpy(rh->name, "\0");
+ strcpy (rh->name, "\0");
}
else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Checking for TLD...\n");
if (is_zkey_tld(name) == GNUNET_YES)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -3399,7 +3409,7 @@
strlen(name)-strlen(GNUNET_GNS_TLD_ZKEY));
memcpy(rh->name, name,
strlen(name)-strlen(GNUNET_GNS_TLD_ZKEY) - 1);
- pop_tld(rh->name, string_hash);
+ pop_tld (rh->name, string_hash);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"ZKEY is %s!\n", string_hash);
@@ -3466,7 +3476,7 @@
rlh->proc_cls = cls;
rh->proc = &handle_delegation_ns;
- resolve_delegation_ns(rh);
+ resolve_delegation_ns (rh);
}
/******** END Record Resolver ***********/
Modified: gnunet/src/gns/gnunet-service-gns_resolver.h
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.h 2013-05-21 15:30:28 UTC
(rev 27233)
+++ gnunet/src/gns/gnunet-service-gns_resolver.h 2013-05-21 18:55:17 UTC
(rev 27234)
@@ -624,8 +624,9 @@
GetAuthorityResultProcessor proc,
void* proc_cls);
+
/**
- * Generic function to check for TLDs
+ * Generic function to check for TLDs. Checks if "name" ends in ".tld"
*
* @param name the name to check
* @param tld the tld to check
@@ -636,6 +637,7 @@
const char* tld);
+
/**
* Checks for gads/zkey
*/
Modified: gnunet/src/gns/test_gns_ns_lookup.c
===================================================================
--- gnunet/src/gns/test_gns_ns_lookup.c 2013-05-21 15:30:28 UTC (rev 27233)
+++ gnunet/src/gns/test_gns_ns_lookup.c 2013-05-21 18:55:17 UTC (rev 27234)
@@ -1,6 +1,6 @@
/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ (C) 2012, 2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@ -32,39 +32,112 @@
#include "gnunet_dnsparser_lib.h"
#include "gnunet_gns_service.h"
-/* Timeout for entire testcase */
+/**
+ * Timeout for entire testcase
+ */
#define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
-/* test records to resolve */
+/**
+ * Name to resolve for testing. NS record on 'homepage.gads' redirects to
+ * DNS 'TEST_RECORD_NS' domain and thus names should be resolved within
+ * that target domain.
+ */
#define TEST_DOMAIN "www.homepage.gads"
+
+/**
+ * Name to resolve for testing. NS record on 'homepage.gads' redirects to
+ * DNS 'TEST_RECORD_NS' domain and thus names should be resolved within
+ * that target domain.
+ */
#define TEST_DOMAIN_ALT "homepage.gads"
+
+/**
+ * Name to resolve for testing. NS record on 'homepage.gads' redirects to
+ * DNS 'TEST_RECORD_NS' domain and thus names should be resolved within
+ * that target domain.
+ */
#define TEST_DOMAIN_ALT2 "uk.homepage.gads"
-#define TEST_IP_ALT2 "81.187.252.184" // uk.gnunet.org / stat.wensley.org.uk
-#define TEST_IP "131.159.74.67" // gnunet.org
-#define TEST_IP_NS "216.69.185.1" //ns01.domaincontrol.com
-#define TEST_RECORD_NAME "homepage"
+
+/**
+ * Expected test value (matching TEST_DOMAIN_ALT2).
+ * Currently 'uk.gnunet.org' / 'stat.wensley.org.uk'.
+ */
+#define TEST_IP_ALT2 "81.187.252.184"
+
+/**
+ * Must be the IP address for TEST_RECORD_NS in DNS and TEST_DOMAIN in GADS;
+ * used to check that DNS is working as expected. We use the IPv4
+ * address of gnunet.org.
+ */
+#define TEST_IP "131.159.74.67"
+
+/**
+ * DNS domain name used for testing.
+ */
#define TEST_RECORD_NS "gnunet.org"
-/* Task handle to use to schedule test failure */
+/**
+ * Nameserver for 'TEST_RECORD_NS', currently 'a.ns.joker.com'.
+ */
+#define TEST_IP_NS "184.172.157.218"
+
+/**
+ * Name we use within our GADS zone.
+ */
+#define TEST_RECORD_NAME "homepage"
+
+/**
+ * Task handle to use to schedule test failure
+ */
static GNUNET_SCHEDULER_TaskIdentifier die_task;
-/* Global return value (0 for success, anything else for failure) */
+/**
+ * Global return value (0 for success, anything else for failure)
+ */
static int ok;
+/**
+ * Flag we set if the DNS resolver seems to be working.
+ */
static int resolver_working;
+/**
+ * Handle to namestore.
+ */
static struct GNUNET_NAMESTORE_Handle *namestore_handle;
+/**
+ * Handle to GNS resolver.
+ */
static struct GNUNET_GNS_Handle *gns_handle;
+/**
+ * Handle for DNS request.
+ */
static struct GNUNET_RESOLVER_RequestHandle *resolver_handle;
+/**
+ * Our configuration.
+ */
static const struct GNUNET_CONFIGURATION_Handle *cfg;
+/**
+ * Handle for active GNS lookup.
+ */
static struct GNUNET_GNS_LookupRequest *lr;
+/**
+ * Queue for storing records in namestore.
+ */
+static struct GNUNET_NAMESTORE_QueueEntry *qe;
/**
+ * Our private key for signing records.
+ */
+static struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
+
+
+/**
* Check if the get_handle is being used, if so stop the request. Either
* way, schedule the end_badly_cont function which actually shuts down the
* test.
@@ -84,6 +157,11 @@
GNUNET_RESOLVER_request_cancel (resolver_handle);
resolver_handle = NULL;
}
+ if (NULL != qe)
+ {
+ GNUNET_NAMESTORE_cancel (qe);
+ qe = NULL;
+ }
if (NULL != gns_handle)
{
GNUNET_GNS_disconnect(gns_handle);
@@ -94,12 +172,20 @@
GNUNET_NAMESTORE_disconnect (namestore_handle);
namestore_handle = NULL;
}
+ if (NULL != alice_key)
+ {
+ GNUNET_CRYPTO_rsa_key_free (alice_key);
+ alice_key = NULL;
+ }
GNUNET_break (0);
GNUNET_SCHEDULER_shutdown ();
ok = 1;
}
+/**
+ * We hit a hard failure, shutdown now.
+ */
static void
end_badly_now ()
{
@@ -108,6 +194,9 @@
}
+/**
+ * Testcase is finished, terminate everything.
+ */
static void
end_now (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
@@ -118,6 +207,11 @@
GNUNET_SCHEDULER_cancel (die_task);
die_task = GNUNET_SCHEDULER_NO_TASK;
}
+ if (NULL != qe)
+ {
+ GNUNET_NAMESTORE_cancel (qe);
+ qe = NULL;
+ }
if (NULL != resolver_handle)
{
GNUNET_RESOLVER_request_cancel (resolver_handle);
@@ -133,11 +227,24 @@
GNUNET_NAMESTORE_disconnect (namestore_handle);
namestore_handle = NULL;
}
+ if (NULL != alice_key)
+ {
+ GNUNET_CRYPTO_rsa_key_free (alice_key);
+ alice_key = NULL;
+ }
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer!\n");
GNUNET_SCHEDULER_shutdown ();
}
+/**
+ * We got resolution result for 'TEST_DOMAIN_ALT2', check if
+ * they match our expectations, then finish the test with success.
+ *
+ * @param cls unused
+ * @param rd_count number of records in rd
+ * @param rd records returned from naming system for the name
+ */
static void
on_lookup_result_alt2 (void *cls, uint32_t rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -148,41 +255,60 @@
lr = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received alternative results 2\n");
- if (rd_count == 0)
+ if (0 == rd_count)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Lookup failed\n");
+ "Lookup for `%s' failed\n",
+ TEST_DOMAIN_ALT2);
ok = 2;
+ GNUNET_SCHEDULER_add_now (&end_now, NULL);
+ return;
}
- else
+ ok = 1;
+ for (i=0; i<rd_count; i++)
{
- ok = 1;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
- for (i=0; i<rd_count; i++)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_A)
+ memcpy(&a, rd[i].data, sizeof(a));
+ addr = inet_ntoa(a);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
+ if (0 == strcmp(addr, TEST_IP_ALT2))
{
- memcpy(&a, rd[i].data, sizeof(a));
- addr = inet_ntoa(a);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
- if (0 == strcmp(addr, TEST_IP_ALT2))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "%s correctly resolved to %s!\n", TEST_DOMAIN, addr);
- ok = 0;
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "%s correctly resolved to %s!\n",
+ TEST_DOMAIN_ALT2, addr);
+ ok = 0;
}
else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Got unexpected address %s for %s\n",
+ addr,
+ TEST_DOMAIN);
}
}
+ if (1 == ok)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "None of the results matched the expected value %s for %s\n",
+ TEST_IP,
+ TEST_DOMAIN);
+ GNUNET_SCHEDULER_add_now (&end_now, NULL);
+ return;
+ }
+
GNUNET_SCHEDULER_add_now (&end_now, NULL);
}
+/**
+ * We got resolution result for 'TEST_DOMAIN_ALT', check if
+ * they match our expectations, then move on to the next
+ * resolution.
+ *
+ * @param cls unused
+ * @param rd_count number of records in rd
+ * @param rd records returned from naming system for the name
+ */
static void
on_lookup_result_alt (void *cls, uint32_t rd_count,
const struct GNUNET_NAMESTORE_RecordData *rd)
@@ -192,101 +318,139 @@
char* addr;
lr = NULL;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received alternative results\n");
- if (rd_count == 0)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received alternative results\n");
+ if (0 == rd_count)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Lookup failed\n");
+ "Lookup for `%s' failed\n",
+ TEST_DOMAIN_ALT);
ok = 2;
+ GNUNET_SCHEDULER_add_now (&end_now, NULL);
+ return;
}
- else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received %u results for %s\n",
+ (unsigned int) rd_count,
+ TEST_DOMAIN_ALT);
+ ok = 1;
+ for (i=0; i<rd_count; i++)
{
- ok = 1;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
- for (i=0; i<rd_count; i++)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_A)
+ memcpy (&a, rd[i].data, sizeof(a));
+ addr = inet_ntoa (a);
+ if (0 == strcmp(addr, TEST_IP))
{
- memcpy(&a, rd[i].data, sizeof(a));
- addr = inet_ntoa(a);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
- if (0 == strcmp(addr, TEST_IP))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "%s correctly resolved to %s!\n", TEST_DOMAIN, addr);
- ok = 0;
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "%s correctly resolved to %s!\n", TEST_DOMAIN, addr);
+ ok = 0;
}
else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Got unexpected address %s for %s\n",
+ addr,
+ TEST_DOMAIN_ALT);
}
}
+ if (1 == ok)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "None of the results matched the expected value %s for %s\n",
+ TEST_IP,
+ TEST_DOMAIN_ALT);
+ GNUNET_SCHEDULER_add_now (&end_now, NULL);
+ return;
+ }
- lr = GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_ALT2, GNUNET_GNS_RECORD_A,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting lookup for `%s'\n",
+ TEST_DOMAIN_ALT2);
+ lr = GNUNET_GNS_lookup (gns_handle,
+ TEST_DOMAIN_ALT2, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
- &on_lookup_result_alt2, TEST_DOMAIN_ALT2);
+ &on_lookup_result_alt2, NULL);
}
+/**
+ * We got resolution result for 'TEST_DOMAIN', check if
+ * they match our expectations, then move on to the next
+ * resolution.
+ *
+ * @param cls unused
+ * @param rd_count number of records in rd
+ * @param rd records returned from naming system for the name
+ */
static void
-on_lookup_result(void *cls, uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+on_lookup_result (void *cls, uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
struct in_addr a;
uint32_t i;
char* addr;
lr = NULL;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received results\n");
- if (rd_count == 0)
+ if (0 == rd_count)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Lookup failed\n");
+ "Lookup for `%s' failed\n",
+ TEST_DOMAIN);
ok = 2;
+ GNUNET_SCHEDULER_add_now (&end_now, NULL);
+ return;
}
- else
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received %u results for %s\n",
+ (unsigned int) rd_count,
+ TEST_DOMAIN);
+ ok = 1;
+ for (i=0; i<rd_count; i++)
{
- ok = 1;
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "name: %s\n", (char*)cls);
- for (i=0; i<rd_count; i++)
+ if (rd[i].record_type == GNUNET_GNS_RECORD_A)
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "type: %d\n", rd[i].record_type);
- if (rd[i].record_type == GNUNET_GNS_RECORD_A)
+ memcpy (&a, rd[i].data, sizeof(a));
+ addr = inet_ntoa(a);
+ if (0 == strcmp (addr, TEST_IP))
{
- memcpy(&a, rd[i].data, sizeof(a));
- addr = inet_ntoa(a);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "address: %s\n", addr);
- if (0 == strcmp(addr, TEST_IP))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "%s correctly resolved to %s!\n", TEST_DOMAIN, addr);
- ok = 0;
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "%s correctly resolved to %s!\n",
+ TEST_DOMAIN, addr);
+ ok = 0;
}
else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "No resolution!\n");
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Got unexpected address %s for %s\n",
+ addr,
+ TEST_DOMAIN);
}
}
+ if (1 == ok)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "None of the results matched the expected value %s for %s\n",
+ TEST_IP,
+ TEST_DOMAIN);
+ GNUNET_SCHEDULER_add_now (&end_now, NULL);
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting lookup for `%s'\n",
+ TEST_DOMAIN_ALT);
lr = GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN_ALT, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
- &on_lookup_result_alt, TEST_DOMAIN_ALT);
+ &on_lookup_result_alt, NULL);
}
+/**
+ * Start the actual NS-based lookup.
+ */
static void
start_lookup ()
{
- GNUNET_NAMESTORE_disconnect (namestore_handle);
- namestore_handle = NULL;
-
gns_handle = GNUNET_GNS_connect (cfg);
if (NULL == gns_handle)
{
@@ -295,14 +459,25 @@
end_badly_now ();
return;
}
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Records ready, starting lookup for `%s'\n",
+ TEST_DOMAIN);
lr = GNUNET_GNS_lookup (gns_handle, TEST_DOMAIN, GNUNET_GNS_RECORD_A,
GNUNET_YES,
NULL,
- &on_lookup_result, TEST_DOMAIN);
+ &on_lookup_result, NULL);
}
+/**
+ * Function called with the result of resolving the "NS" record
+ * for TEST_RECORD_NS. Check if the NS record is set as expected,
+ * and if so, continue with the test.
+ *
+ * @param cls closure, unused
+ * @param addr NULL for last address,
+ * @param addrlen number of bytes in addr
+ */
static void
handle_dns_test (void *cls,
const struct sockaddr *addr,
@@ -318,17 +493,16 @@
{
ok = 0;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "System resolver not working. Test inconclusive!\n");
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down peer1!\n");
+ "System resolver not working as expected. Test
inconclusive!\n");
GNUNET_SCHEDULER_add_now (&end_now, NULL);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Starting lookup \n");
+ /* done preparing records, start lookup */
+ GNUNET_NAMESTORE_disconnect (namestore_handle);
+ namestore_handle = NULL;
start_lookup ();
return;
}
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received DNS response\n");
if (addrlen == sizeof (struct sockaddr_in))
@@ -338,7 +512,9 @@
{
resolver_working = GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Resolver is working\n");
+ "Resolver is working (returned expected A record %s for
%s)\n",
+ TEST_IP,
+ TEST_RECORD_NS);
}
}
}
@@ -347,13 +523,22 @@
/**
* Function scheduled to be run on the successful start of services
* tries to look up the dns record for TEST_DOMAIN
+ *
+ * @param cls closure, unused
+ * @param success GNUNET_OK on success
+ * @param emsg error message, NULL on success
*/
static void
commence_testing (void *cls, int32_t success, const char *emsg)
{
+ qe = NULL;
+ if (NULL != emsg)
+ FPRINTF (stderr, "Failed to create record: %s\n", emsg);
+ GNUNET_assert (GNUNET_YES == success);
resolver_working = GNUNET_NO;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Resolving NS record\n");
+ "Resolving NS record for %s\n",
+ TEST_RECORD_NS);
GNUNET_RESOLVER_connect (cfg);
resolver_handle = GNUNET_RESOLVER_ip_get (TEST_RECORD_NS,
AF_INET,
@@ -363,23 +548,60 @@
}
+/**
+ * Function called once we've created the first NS record,
+ * create the second one.
+ *
+ * @param cls closure, unused
+ * @param success GNUNET_OK on success
+ * @param emsg error message, NULL on success
+ */
static void
+create_next_record (void *cls,
+ int32_t success,
+ const char *emsg)
+{
+ struct GNUNET_NAMESTORE_RecordData rd;
+
+ qe = NULL;
+ if (NULL != emsg)
+ FPRINTF (stderr, "Failed to create record: %s\n", emsg);
+ GNUNET_assert (GNUNET_YES == success);
+ rd.data_size = strlen (TEST_RECORD_NS);
+ rd.data = TEST_RECORD_NS;
+ rd.record_type = GNUNET_GNS_RECORD_NS;
+ qe = GNUNET_NAMESTORE_record_create (namestore_handle,
+ alice_key,
+ TEST_RECORD_NAME,
+ &rd,
+ &commence_testing,
+ NULL);
+}
+
+
+/**
+ * Peer is ready, run the actual test. Begins by storing
+ * a record in the namestore.
+ *
+ * @param cls closure, NULL
+ * @param ccfg our configuration
+ * @param peer handle to the peer
+ */
+static void
do_check (void *cls,
const struct GNUNET_CONFIGURATION_Handle *ccfg,
struct GNUNET_TESTING_Peer *peer)
{
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded alice_pkey;
- struct GNUNET_CRYPTO_RsaPrivateKey *alice_key;
char* alice_keyfile;
struct GNUNET_NAMESTORE_RecordData rd;
- const char* ip = TEST_IP_NS;
struct in_addr ns;
cfg = ccfg;
die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL);
/* put records into namestore */
- namestore_handle = GNUNET_NAMESTORE_connect(cfg);
+ namestore_handle = GNUNET_NAMESTORE_connect (cfg);
if (NULL == namestore_handle)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -401,33 +623,23 @@
alice_key = GNUNET_CRYPTO_rsa_key_create_from_file (alice_keyfile);
GNUNET_CRYPTO_rsa_key_get_public (alice_key, &alice_pkey);
- GNUNET_free(alice_keyfile);
+ GNUNET_free (alice_keyfile);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Creating NS records\n");
rd.expiration_time = UINT64_MAX;
- GNUNET_assert(1 == inet_pton (AF_INET, ip, &ns));
- rd.data_size = sizeof(struct in_addr);
+ GNUNET_assert(1 == inet_pton (AF_INET, TEST_IP_NS, &ns));
+ rd.data_size = sizeof (struct in_addr);
rd.data = &ns;
rd.record_type = GNUNET_DNSPARSER_TYPE_A;
rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Creating records\n");
- GNUNET_NAMESTORE_record_create (namestore_handle,
- alice_key,
- TEST_RECORD_NAME,
- &rd,
- NULL,
- NULL);
- rd.data_size = strlen (TEST_RECORD_NS);
- rd.data = TEST_RECORD_NS;
- rd.record_type = GNUNET_GNS_RECORD_NS;
- GNUNET_NAMESTORE_record_create (namestore_handle,
- alice_key,
- TEST_RECORD_NAME,
- &rd,
- &commence_testing,
- NULL);
- GNUNET_CRYPTO_rsa_key_free(alice_key);
+ qe = GNUNET_NAMESTORE_record_create (namestore_handle,
+ alice_key,
+ TEST_RECORD_NAME,
+ &rd,
+ &create_next_record,
+ NULL);
}
@@ -435,9 +647,6 @@
main (int argc, char *argv[])
{
ok = 1;
- GNUNET_log_setup ("test-gns-simple-ns-lookup",
- "WARNING",
- NULL);
GNUNET_TESTING_peer_run ("test-gns-simple-ns-lookup",
"test_gns_simple_lookup.conf",
&do_check, NULL);
return ok;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27234 - gnunet/src/gns,
gnunet <=