From c6207ae14cf9ff6a428f1c6d962eb5f8a6b9f6a8 Mon Sep 17 00:00:00 2001
From: Martin Schanzenbach <mschanzenbach@posteo.de>
Date: Wed, 28 Mar 2012 09:32:20 +0000
Subject: [PATCH] -add record type any, pending flag

---
 src/gns/gnunet-service-gns_resolver.c  |  16 +++++++++++++++-
 src/gns/testdb/sqlite-alice.db         | Bin 13312 -> 17408 bytes
 src/gns/testdb/sqlite-bob.db           | Bin 14336 -> 14336 bytes
 src/gns/testdb/sqlite-dave.db          | Bin 17408 -> 17408 bytes
 src/include/gnunet_namestore_service.h |  12 +++++++++++-
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index d1cc4ccd3..7d3a518b5 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -69,6 +69,11 @@ static unsigned long long max_allowed_background_queries;
  */
 static struct GNUNET_CRYPTO_ShortHashCode local_zone;
 
+/**
+ * a resolution identifier pool variable
+ * FIXME overflow?
+ * This is a non critical identifier useful for debugging
+ */
 static unsigned long long rid = 0;
 
 /**
@@ -164,7 +169,7 @@ process_pseu_result(struct GetPseuAuthorityHandle* gph, char* name)
   GNUNET_NAMESTORE_lookup_record(namestore_handle,
                                  &gph->zone,
                                  gph->new_name,
-                                 GNUNET_GNS_RECORD_PSEU,
+                                 GNUNET_NAMESTORE_TYPE_ANY,
                                  &process_pseu_lookup_ns,
                                  gph);
 }
@@ -1904,6 +1909,15 @@ process_delegation_result_ns(void* cls,
   
     if (rd[i].record_type != GNUNET_GNS_RECORD_PKEY)
       continue;
+
+    if (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",
+        name,
+        rh->id);
+      continue;
+    }
     
     if ((GNUNET_TIME_absolute_get_remaining (rd[i].expiration)).rel_value
          == 0)
diff --git a/src/gns/testdb/sqlite-alice.db b/src/gns/testdb/sqlite-alice.db
index 3a428a8819831d902c86fea777dc0dcd7f6d89ab..efc27b9a30238beaa3840b076e07654c13c32350 100644
GIT binary patch
delta 2727
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
aGKBEargHBUqxOGL%r2%^*tw0qu>S>Vq-iez

delta 183
zcmZqZU~I^kAkE6gz`(#eQNf;(ZDYc9=FQ$LTbU<L5Shfm!okS=8z{%XyRo1TD3rp-
z!^FkBiGhh(gn>DkS!81)2lM0`ylRuJ_)l>#G3zrh>ob>bY*c2REH0!vIYf8^P_UeV
zc`0-G#>Q;s$@|4rC(jYj018fGVBXF=X>%Y;8}sCUQYw?TN&BHIWu06j-vJc7#lZZW
T`PODdj*~zKux`GktR?^eFu^l+

diff --git a/src/gns/testdb/sqlite-bob.db b/src/gns/testdb/sqlite-bob.db
index 14749db379b57377fae311d1079d2feccdb87a4c..884d58035848a74b81c469dc12ea6afd4fc223d6 100644
GIT binary patch
delta 17
YcmZoDXegK<&1f`H#+lJ*W5NP+05$Ce$^ZZW

delta 17
YcmZoDXegK<&8Rm~#+gxXW5NP+05!1%!T<mO

diff --git a/src/gns/testdb/sqlite-dave.db b/src/gns/testdb/sqlite-dave.db
index 10b9d82c62b174d7e7060af8a3cb44d055bde229..c071b5d08872a8f11a3a9787465fe57edd59e163 100644
GIT binary patch
delta 19
acmZqZU~K4MoFL6;IZ?)$(Q;$L0%rg`YX%ko

delta 19
acmZqZU~K4MoFL6;I#I@%(R5?N0%rg`F9r?(

diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index e66062772..232702592 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -43,6 +43,10 @@ extern "C"
 #endif
 #endif
 
+/**
+ * Record type indicating any record/'*'
+ */
+#define GNUNET_NAMESTORE_TYPE_ANY 0
 
 /**
  * Record type for GNS zone transfer ("PKEY").
@@ -139,7 +143,13 @@ enum GNUNET_NAMESTORE_RecordFlags
    * This is a private record of this peer and it should
    * thus not be handed out to other peers.
    */
-  GNUNET_NAMESTORE_RF_PRIVATE = 2
+  GNUNET_NAMESTORE_RF_PRIVATE = 2,
+
+  /**
+   * This record was added by the system
+   * and is pending user confimation
+   */
+  GNUNET_NAMESTORE_RF_PENDING = 4
 
 };
 
-- 
2.25.1