[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20913 - gnunet/src/gns
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20913 - gnunet/src/gns |
Date: |
Tue, 10 Apr 2012 14:10:43 +0200 |
Author: schanzen
Date: 2012-04-10 14:10:43 +0200 (Tue, 10 Apr 2012)
New Revision: 20913
Modified:
gnunet/src/gns/gnunet-service-gns_resolver.c
gnunet/src/gns/test_gns_defaults.conf
gnunet/src/gns/test_gns_pseu_shorten.c
gnunet/src/gns/test_gns_simple_lookup.conf
Log:
-fixes
Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c 2012-04-10 08:56:10 UTC
(rev 20912)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c 2012-04-10 12:10:43 UTC
(rev 20913)
@@ -1762,6 +1762,10 @@
{
struct RecordLookupHandle* rlh;
rlh = (struct RecordLookupHandle*) cls;
+
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Resolution status: %d.\n",
+ rh->id, rh->status);
if (strcmp(rh->name, "") == 0)
{
@@ -1791,7 +1795,7 @@
* and exists
* or we are authority
**/
- if (((rh->status & RSL_RECORD_EXISTS) && (rh->status & !RSL_RECORD_EXPIRED))
+ if (((rh->status & RSL_RECORD_EXISTS) && (!(rh->status &
RSL_RECORD_EXPIRED)))
|| !GNUNET_CRYPTO_short_hash_cmp(&rh->authority_chain_head->zone,
&local_zone))
{
@@ -1868,11 +1872,17 @@
if (name != NULL)
{
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Records with name %s exist.\n",
+ rh->id, name);
rh->status |= RSL_RECORD_EXISTS;
}
if (remaining_time.rel_value == 0)
{
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Record set %s expired.\n",
+ rh->id, name);
rh->status |= RSL_RECORD_EXPIRED;
}
@@ -1994,7 +2004,23 @@
*/
GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"GNS_PHASE_DELEGATE_NS-%llu: Authority lookup and no PKEY...\n", rh->id);
- rh->proc(rh->proc_cls, rh, 0, NULL);
+ /**
+ * If we have found some records for the LAST label
+ * we return the results. Else null.
+ */
+ if (strcmp(rh->name, "") == 0)
+ {
+ /* simply promote back */
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+ "GNS_PHASE_DELEGATE_NS-%llu: Promoting %s back to name\n",
+ rh->id, rh->authority_name);
+ strcpy(rh->name, rh->authority_name);
+ rh->proc(rh->proc_cls, rh, rd_count, rd);
+ }
+ else
+ {
+ rh->proc(rh->proc_cls, rh, 0, NULL);
+ }
}
@@ -2013,7 +2039,7 @@
GNUNET_NAMESTORE_lookup_record(namestore_handle,
&rh->authority,
rh->authority_name,
- GNUNET_GNS_RECORD_PKEY,
+ GNUNET_GNS_RECORD_ANY,
&process_delegation_result_ns,
rh);
Modified: gnunet/src/gns/test_gns_defaults.conf
===================================================================
--- gnunet/src/gns/test_gns_defaults.conf 2012-04-10 08:56:10 UTC (rev
20912)
+++ gnunet/src/gns/test_gns_defaults.conf 2012-04-10 12:10:43 UTC (rev
20913)
@@ -67,9 +67,3 @@
[vpn]
AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
\ No newline at end of file
Modified: gnunet/src/gns/test_gns_pseu_shorten.c
===================================================================
--- gnunet/src/gns/test_gns_pseu_shorten.c 2012-04-10 08:56:10 UTC (rev
20912)
+++ gnunet/src/gns/test_gns_pseu_shorten.c 2012-04-10 12:10:43 UTC (rev
20913)
@@ -103,6 +103,13 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "done(ret=%d)!\n", ok);
}
+static void
+disco_dht(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_DHT_disconnect(dht_handle);
+ dht_handle = NULL;
+}
+
/**
* Called when gns shorten finishes
*/
@@ -110,6 +117,7 @@
process_shorten_result(void* cls, const char* sname)
{
GNUNET_GNS_disconnect(gns_handle);
+ //GNUNET_SCHEDULER_add_now(disco_dht, NULL);
ok = 0;
if (sname == NULL)
@@ -196,7 +204,8 @@
static void
commence_testing (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- GNUNET_DHT_disconnect(dht_handle);
+ GNUNET_SCHEDULER_add_now(disco_dht, NULL);
+ //GNUNET_DHT_disconnect(dht_handle);
GNUNET_CRYPTO_rsa_key_free(our_key);
GNUNET_CRYPTO_rsa_key_free(bob_key);
@@ -595,7 +604,7 @@
if (ret != GNUNET_OK)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "`test-gns-dht-delegated-lookup': Failed with error code
%d\n", ret);
+ "`test-gns-pseu-shorten': Failed with error code %d\n", ret);
}
return ok;
}
@@ -605,7 +614,7 @@
{
int ret;
- GNUNET_log_setup ("test-gns-simple-lookup",
+ GNUNET_log_setup ("test-gns-pseu-shorten",
#if VERBOSE
"DEBUG",
#else
Modified: gnunet/src/gns/test_gns_simple_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.conf 2012-04-10 08:56:10 UTC (rev
20912)
+++ gnunet/src/gns/test_gns_simple_lookup.conf 2012-04-10 12:10:43 UTC (rev
20913)
@@ -16,7 +16,7 @@
BINARY = gnunet-service-dht
[block]
-plugins = dht test namestore gns
+plugins = dht test gns
[dhtcache]
QUOTA = 1 MB
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20913 - gnunet/src/gns,
gnunet <=