[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20718 - gnunet/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20718 - gnunet/src/gns |
Date: |
Fri, 23 Mar 2012 14:02:57 +0100 |
Author: schanzen
Date: 2012-03-23 14:02:57 +0100 (Fri, 23 Mar 2012)
New Revision: 20718
Modified:
gnunet/src/gns/gnunet-service-gns_resolver.c
gnunet/src/gns/test_gns_pseu_shorten.c
gnunet/src/gns/test_gns_simple_lookup.conf
Log:
-fix
Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c 2012-03-23 12:41:52 UTC
(rev 20717)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c 2012-03-23 13:02:57 UTC
(rev 20718)
@@ -325,8 +325,8 @@
"starting dht lookup for %s with key: %s\n",
"+", (char*)&lookup_key_string);
- //gph->timeout = GNUNET_SCHEDULER_add_delayed(DHT_LOOKUP_TIMEOUT,
- // &handle_auth_discovery_timeout,
gph);
+ gph->timeout = GNUNET_SCHEDULER_add_delayed(DHT_LOOKUP_TIMEOUT,
+ &handle_auth_discovery_timeout, gph);
xquery = htonl(GNUNET_GNS_RECORD_PSEU);
@@ -814,7 +814,10 @@
remaining_time = GNUNET_TIME_absolute_get_remaining (expiration);
if (rh->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ {
GNUNET_SCHEDULER_cancel(rh->timeout_task);
+ rh->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+ }
rh->status = 0;
@@ -986,6 +989,9 @@
/* Prototype */
static void resolve_delegation_dht(struct ResolverHandle *rh);
+/* Prototype */
+static void resolve_delegation_ns(struct ResolverHandle *rh);
+
/**
* Function called when we get a result from the dht
* for our query. Recursively tries to resolve authorities
@@ -1132,7 +1138,7 @@
if (strcmp(rh->name, "") == 0)
rh->proc(rh->proc_cls, rh, 0, NULL);
else
- resolve_delegation_dht(rh);
+ resolve_delegation_ns(rh);
return;
}
@@ -1203,12 +1209,15 @@
char* pos;
unsigned int offset;
+ if (rh->timeout_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel(rh->timeout_task);
+
if (rd_count > 0)
memcpy(p_rd, rd, rd_count*sizeof(struct GNUNET_NAMESTORE_RecordData));
for (i = 0; i < rd_count; i++)
{
-
+
if (rd[i].record_type != GNUNET_GNS_RECORD_TYPE_NS &&
rd[i].record_type != GNUNET_GNS_RECORD_TYPE_CNAME &&
rd[i].record_type != GNUNET_GNS_RECORD_MX &&
@@ -1254,8 +1263,8 @@
expand_plus(&pos, (char*)rd[i].data+offset, repl_string);
offset += strlen(new_soa_data+offset)+1;
/* cpy the 4 numbers serial refresh retry and expire */
- memcpy(new_soa_data+offset, (char*)rd[i].data+offset,
sizeof(uint32_t)*4);
- offset += sizeof(uint32_t)*4;
+ memcpy(new_soa_data+offset, (char*)rd[i].data+offset,
sizeof(uint32_t)*5);
+ offset += sizeof(uint32_t)*5;
p_rd[i].data_size = offset;
p_rd[i].data = new_soa_data;
}
@@ -1585,6 +1594,7 @@
{
if ((rlh->record_type == GNUNET_GNS_RECORD_PKEY))
{
+ GNUNET_assert(rd_count == 1);
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Resolved queried PKEY in NS.\n");
finish_lookup(rh, rlh, rd_count, rd);
@@ -1635,8 +1645,6 @@
resolve_delegation_dht(rh);
}
-/* Prototype */
-static void resolve_delegation_ns(struct ResolverHandle *rh);
/**
@@ -1773,7 +1781,7 @@
* else resolve again with new authority
*/
if (strcmp(rh->name, "") == 0)
- rh->proc(rh->proc_cls, rh, 0, NULL);
+ rh->proc(rh->proc_cls, rh, rd_count, rd);
else
resolve_delegation_ns(rh);
return;
Modified: gnunet/src/gns/test_gns_pseu_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_pseu_shorten.c 2012-03-23 12:41:52 UTC (rev
20717)
+++ gnunet/src/gns/test_gns_pseu_shorten.c 2012-03-23 13:02:57 UTC (rev
20718)
@@ -576,7 +576,7 @@
int ret;
/* Arguments for GNUNET_PROGRAM_run */
- char *const argv[] = { "test-gns-dht-delegated-lookup", /* Name to give
running binary */
+ char *const argv[] = { "test-gns-pseu-shorten", /* Name to give running
binary */
"-c",
"test_gns_simple_lookup.conf", /* Config file to use */
#if VERBOSE
@@ -590,7 +590,7 @@
/* Run the run function as a new program */
ret =
GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
- "test-gns-dht-delegated-lookup", "nohelp", options,
&run,
+ "test-gns-pseu-shorten", "nohelp", options, &run,
&ok);
if (ret != GNUNET_OK)
{
Modified: gnunet/src/gns/test_gns_simple_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.conf 2012-03-23 12:41:52 UTC (rev
20717)
+++ gnunet/src/gns/test_gns_simple_lookup.conf 2012-03-23 13:02:57 UTC (rev
20718)
@@ -81,9 +81,10 @@
CONFIG = $DEFAULTCONFIG
AUTO_IMPORT_PKEY = YES
MAX_PARALLEL_BACKGROUND_QUERIES = 10
-DEFAULT_LOOKUP_TIMEOUT = 5
+DEFAULT_LOOKUP_TIMEOUT = 30
[nse]
AUTOSTART = NO
-
+[statistics]
+AUTOSTART = NO
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20718 - gnunet/src/gns,
gnunet <=