[GNUnet-SVN] r20794 - in gnunet/src: gns gns/testdb include

[gnunet]

Author: schanzen
Date: 2012-03-28 11:32:20 +0200 (Wed, 28 Mar 2012)
New Revision: 20794

Modified:
   gnunet/src/gns/gnunet-service-gns_resolver.c
   gnunet/src/gns/testdb/sqlite-alice.db
   gnunet/src/gns/testdb/sqlite-bob.db
   gnunet/src/gns/testdb/sqlite-dave.db
   gnunet/src/include/gnunet_namestore_service.h
Log:
-add record type any, pending flag


Modified: gnunet/src/gns/gnunet-service-gns_resolver.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_resolver.c        2012-03-28 08:09:39 UTC 
(rev 20793)
+++ gnunet/src/gns/gnunet-service-gns_resolver.c        2012-03-28 09:32:20 UTC 
(rev 20794)
@@ -69,6 +69,11 @@
  */
 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 @@
   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 @@
   
     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)

Modified: gnunet/src/gns/testdb/sqlite-alice.db
===================================================================
(Binary files differ)

Modified: gnunet/src/gns/testdb/sqlite-bob.db
===================================================================
(Binary files differ)

Modified: gnunet/src/gns/testdb/sqlite-dave.db
===================================================================
(Binary files differ)

Modified: gnunet/src/include/gnunet_namestore_service.h
===================================================================
--- gnunet/src/include/gnunet_namestore_service.h       2012-03-28 08:09:39 UTC 
(rev 20793)
+++ gnunet/src/include/gnunet_namestore_service.h       2012-03-28 09:32:20 UTC 
(rev 20794)
@@ -43,6 +43,10 @@
 #endif
 #endif
 
+/**
+ * Record type indicating any record/'*'
+ */
+#define GNUNET_NAMESTORE_TYPE_ANY 0
 
 /**
  * Record type for GNS zone transfer ("PKEY").
@@ -139,8 +143,14 @@
    * 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
+
 };