-new api

2 files changed, 67 insertions, 159 deletions

diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 02613dbb1..198e4c33b 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -317,7 +317,6 @@ process_authority_lookup(void* cls, const GNUNET_HashCode *zone,
                    const char *name, uint32_t record_type,
                    struct GNUNET_TIME_Absolute expiration,
                    enum GNUNET_NAMESTORE_RecordFlags flags,
-                   const struct GNUNET_NAMESTORE_SignatureLocation *sig_loc,
                    size_t size, const void *data)
 {
   struct GNUNET_GNS_PendingQuery *query;
@@ -344,7 +343,7 @@ process_authority_lookup(void* cls, const GNUNET_HashCode *zone,
      */
     if (GNUNET_CRYPTO_hash_cmp(zone, &zone_hash))
     {
-      GNUNET_log(GNUNET_ERROR_TYPE_INFO, "NX record\n");
+      GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Authority unknown\n");
       //FIXME return NX answer
       return;
     }
@@ -420,10 +419,10 @@ reply_to_dns(struct GNUNET_GNS_PendingQuery *answer)
   {
     GNUNET_log(GNUNET_ERROR_TYPE_INFO,
                "Answering DNS request\n");
-    //GNUNET_DNS_request_answer(answer->request_handle,
-    //                          len,
-     //                         buf);
-    GNUNET_free(answer);
+    GNUNET_DNS_request_answer(answer->request_handle,
+                              len,
+                              buf);
+    //GNUNET_free(answer);
     GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Answered DNS request\n");
     //FIXME return code, free datastructures
   }
@@ -454,7 +453,6 @@ process_authoritative_result(void* cls, const GNUNET_HashCode *zone,
                   const char *name, uint32_t record_type,
                   struct GNUNET_TIME_Absolute expiration,
                   enum GNUNET_NAMESTORE_RecordFlags flags,
-                  const struct GNUNET_NAMESTORE_SignatureLocation *sig_loc,
                   size_t size, const void *data)
 {
   struct GNUNET_GNS_PendingQuery *query;
@@ -621,7 +619,7 @@ resolve_name(struct GNUNET_GNS_PendingQuery *query, GNUNET_HashCode *zone)
   if (is_canonical(query->name))
   {
     //We only need to check this zone's ns
-    GNUNET_NAMESTORE_lookup_name(namestore_handle,
+    GNUNET_NAMESTORE_lookup_record(namestore_handle,
                                zone,
                                query->name,
                                query->type,
@@ -632,7 +630,7 @@ resolve_name(struct GNUNET_GNS_PendingQuery *query, GNUNET_HashCode *zone)
   {
     //We have to resolve the authoritative entity
     char *new_authority = move_up(query->name);
-    GNUNET_NAMESTORE_lookup_name(namestore_handle,
+    GNUNET_NAMESTORE_lookup_record(namestore_handle,
                                  zone,
                                  new_authority,
                                  GNUNET_GNS_RECORD_PKEY,
@@ -761,7 +759,6 @@ put_some_records(void)
                                GNUNET_GNS_RECORD_TYPE_A,
                                GNUNET_TIME_absolute_get_forever(),
                                GNUNET_NAMESTORE_RF_AUTHORITY,
-                               NULL, //sig loc
                                sizeof(struct in_addr),
                                alice,
                                NULL,
@@ -772,7 +769,6 @@ put_some_records(void)
                                GNUNET_GNS_RECORD_TYPE_A,
                                GNUNET_TIME_absolute_get_forever(),
                                GNUNET_NAMESTORE_RF_AUTHORITY,
-                               NULL, //sig loc
                                sizeof(struct in_addr),
                                bob,
                                NULL,
@@ -802,7 +798,6 @@ void
 put_gns_record(void *cls, const GNUNET_HashCode *zone, const char *name,
                uint32_t record_type, struct GNUNET_TIME_Absolute expiration,
                enum GNUNET_NAMESTORE_RecordFlags flags,
-               const struct GNUNET_NAMESTORE_SignatureLocation *sig_loc,
                size_t size, const void *record_data)
 {
   GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Putting a record into the DHT\n");
@@ -814,9 +809,6 @@ put_gns_record(void *cls, const GNUNET_HashCode *zone, const char *name,
   exp_nbo = GNUNET_TIME_absolute_hton (expiration);
   uint32_t namelen = htonl(strlen(name));
   uint16_t flags_nbo = htons(flags);
-  uint64_t offset = GNUNET_htonll(sig_loc->offset);
-  uint32_t depth = htonl(sig_loc->depth);
-  uint32_t revision = htonl(sig_loc->revision);
   GNUNET_HashCode name_hash;
   GNUNET_HashCode xor_hash;
 
@@ -826,7 +818,6 @@ put_gns_record(void *cls, const GNUNET_HashCode *zone, const char *name,
    */
   size_t record_len = sizeof(size_t) + sizeof(uint32_t) +
     sizeof(uint16_t) +
-    sizeof(struct GNUNET_NAMESTORE_SignatureLocation) +
     sizeof(uint32_t) + strlen(name) + size;
   
   record_type = htonl(record_type);
@@ -850,15 +841,6 @@ put_gns_record(void *cls, const GNUNET_HashCode *zone, const char *name,
   memcpy(data_ptr, &flags_nbo, sizeof(uint16_t));
   data_ptr += sizeof(uint16_t);
 
-  memcpy(data_ptr, &offset, sizeof(uint64_t));
-  data_ptr += sizeof(uint64_t);
-
-  memcpy(data_ptr, &depth, sizeof(uint32_t));
-  data_ptr += sizeof(uint32_t);
-  
-  memcpy(data_ptr, &revision, sizeof(uint32_t));
-  data_ptr += sizeof(uint32_t);
-
   memcpy(data_ptr, &size, sizeof(uint32_t));
   data_ptr += sizeof(uint32_t);
 
diff --git a/src/gns/namestore_stub_api.c b/src/gns/namestore_stub_api.c
index f829b8db9..29a785a8a 100644
--- a/src/gns/namestore_stub_api.c
+++ b/src/gns/namestore_stub_api.c
@@ -69,6 +69,11 @@ struct GNUNET_NAMESTORE_Handle
 
 };
 
+struct GNUNET_NAMESTORE_ZoneIterator
+{
+  struct GNUNET_NAMESTORE_Handle *handle;
+};
+
 struct GNUNET_NAMESTORE_SimpleRecord
 {
   /**
@@ -119,111 +124,6 @@ GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *handle, int drop)
 }
 
 /**
- * Sign a record.  This function is used by the authority of the zone
- * to add a record.
- *
- * @param h handle to the namestore
- * @param zone_privkey private key of the zone
- * @param record_hash hash of the record to be signed
- * @param cont continuation to call when done
- * @param cont_cls closure for cont
- * @return handle to abort the request
- */
-struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_stree_extend (struct GNUNET_NAMESTORE_Handle *h,
-             const struct GNUNET_CRYPTO_RsaPrivateKey *zone_privkey,
-             const GNUNET_HashCode *record_hash,
-             GNUNET_NAMESTORE_ContinuationWithSignature cont,
-             void *cont_cls)
-{
-  struct GNUNET_NAMESTORE_QueueEntry *qe;
-  qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
-  return qe;
-}
-
-/**
- * Rebalance the signature tree of our zone.  This function should
- * be called "rarely" to rebalance the tree.
- *
- * @param h handle to the namestore
- * @param zone_privkey private key for the zone to rebalance
- * @param cont continuation to call when done
- * @param cont_cls closure for cont
- * @return handle to abort the request
- */
-struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_stree_rebalance (struct GNUNET_NAMESTORE_Handle *h,
-          const struct GNUNET_CRYPTO_RsaPrivateKey *zone_privkey,
-          GNUNET_NAMESTORE_ContinuationWithStatus cont,
-          void *cont_cls)
-{
-  struct GNUNET_NAMESTORE_QueueEntry *qe;
-  qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
-  return qe;
-}
-
-/**
- * Provide the root of a signature tree.  This function is 
- * used by non-authorities as the first operation when 
- * adding a foreign zone.
- *
- * @param h handle to the namestore
- * @param zone_key public key of the zone
- * @param signature signature of the top-level entry of the zone
- * @param revision revision number of the zone
- * @param top_hash top-level hash of the zone
- * @param cont continuation to call when done
- * @param cont_cls closure for cont
- * @return handle to abort the request
- */
-struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_stree_start (struct GNUNET_NAMESTORE_Handle *h,
-                              const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
-                              const struct GNUNET_CRYPTO_RsaSignature *signature,
-                              uint32_t revision,
-                              const GNUNET_HashCode *top_hash,
-                              GNUNET_NAMESTORE_ContinuationWithSignature cont,
-                              void *cont_cls)
-{
-  struct GNUNET_NAMESTORE_QueueEntry *qe;
-  qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
-  return qe;
-}
-
-/**
- * Store part of a signature B-tree in the namestore.  This function
- * is used by non-authorities to cache parts of a zone's signature tree.
- * Note that the tree must be build top-down.  This function must check
- * that the nodes being added are valid, and if not refuse the operation.
- *
- * @param h handle to the namestore
- * @param zone_key public key of the zone
- * @param loc location in the B-tree
- * @param ploc parent's location in the B-tree (must have depth = loc.depth - 1), NULL for root
- * @param top_sig signature at the top, NULL if 'loc.depth > 0'
- * @param num_entries number of entries at this node in the B-tree
- * @param entries the 'num_entries' entries to store (hashes over the
- *                records)
- * @param cont continuation to call when done
- * @param cont_cls closure for cont
- * @return handle to abort the request
- */
-struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_stree_put (struct GNUNET_NAMESTORE_Handle *h,
-                            const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *zone_key,
-                            const struct GNUNET_NAMESTORE_SignatureLocation *loc,
-                            const struct GNUNET_NAMESTORE_SignatureLocation *ploc,
-                            unsigned int num_entries,
-                            const GNUNET_HashCode *entries,
-                            GNUNET_NAMESTORE_ContinuationWithStatus cont,
-                            void *cont_cls)
-{
-  struct GNUNET_NAMESTORE_QueueEntry *qe;
-  qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
-  return qe;
-}
-
-/**
  * Store an item in the namestore.  If the item is already present,
  * the expiration time is updated to the max of the existing time and
  * the new time.  The operation must fail if there is no matching
@@ -235,7 +135,6 @@ GNUNET_NAMESTORE_stree_put (struct GNUNET_NAMESTORE_Handle *h,
  * @param record_type type of the record (A, AAAA, PKEY, etc.)
  * @param expiration expiration time for the content
  * @param flags flags for the content
- * @param sig_loc where is the information about the signature for this record stored?
  * @param data_size number of bytes in data
  * @param data value, semantics depend on 'record_type' (see RFCs for DNS and 
  *             GNS specification for GNS extensions)
@@ -250,7 +149,6 @@ GNUNET_NAMESTORE_record_put (struct GNUNET_NAMESTORE_Handle *h,
                              uint32_t record_type,
                              struct GNUNET_TIME_Absolute expiration,
                              enum GNUNET_NAMESTORE_RecordFlags flags,
-                             const struct GNUNET_NAMESTORE_SignatureLocation *sig_loc,
                              size_t data_size,
                              const void *data, 
                              GNUNET_NAMESTORE_ContinuationWithStatus cont,
@@ -272,6 +170,36 @@ GNUNET_NAMESTORE_record_put (struct GNUNET_NAMESTORE_Handle *h,
 }
 
 /**
+ * Store a signature in the namestore. 
+ *
+ * @param h handle to the namestore
+ * @param zone hash of the public key of the zone
+ * @param name name that is being mapped (at most 255 characters long)
+ * @param record_type type of the record (A, AAAA, PKEY, etc.)
+ * @param expiration expiration time for the content
+ * @param flags flags for the content
+ * @param data_size number of bytes in data
+ * @param data value, semantics depend on 'record_type' (see RFCs for DNS and 
+ *             GNS specification for GNS extensions)
+ * @param cont continuation to call when done
+ * @param cont_cls closure for cont
+ * @return handle to abort the request
+ */
+struct GNUNET_NAMESTORE_QueueEntry *
+GNUNET_NAMESTORE_signature_put (struct GNUNET_NAMESTORE_Handle *h,
+                             const GNUNET_HashCode *zone,
+                             const char *name,
+           struct GNUNET_CRYPTO_RsaSignature sig,
+                             GNUNET_NAMESTORE_ContinuationWithStatus cont,
+                             void *cont_cls)
+{
+  struct GNUNET_NAMESTORE_QueueEntry *qe;
+  qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
+
+  return qe;
+}
+
+/**
  * Explicitly remove some content from the database.  The
  * "cont"inuation will be called with status "GNUNET_OK" if content
  * was removed, "GNUNET_NO" if no matching entry was found and
@@ -331,7 +259,7 @@ GNUNET_NAMESTORE_record_remove (struct GNUNET_NAMESTORE_Handle *h,
  *         cancel
  */
 struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_lookup_name (struct GNUNET_NAMESTORE_Handle *h, 
+GNUNET_NAMESTORE_lookup_record (struct GNUNET_NAMESTORE_Handle *h, 
                               const GNUNET_HashCode *zone,
                               const char *name,
                               uint32_t record_type,
@@ -352,16 +280,25 @@ GNUNET_NAMESTORE_lookup_name (struct GNUNET_NAMESTORE_Handle *h,
     proc(proc_cls, iter->zone, iter->name, iter->record_type,
        iter->expiration,
        iter->flags,
-       NULL /*sig loc*/,
        iter->data_size /*size*/,
        iter->data /* data */);
   }
   proc(proc_cls, zone, name, record_type,
-       GNUNET_TIME_absolute_get_forever(), 0, NULL, 0, NULL); /*TERMINATE*/
+       GNUNET_TIME_absolute_get_forever(), 0, 0, NULL); /*TERMINATE*/
 
   return qe;
 }
 
+struct GNUNET_NAMESTORE_QueueEntry *
+GNUNET_NAMESTORE_lookup_signature (struct GNUNET_NAMESTORE_Handle *h,
+                                   const GNUNET_HashCode *zone,
+                                   const char* name,
+                                   GNUNET_NAMESTORE_SignatureProcessor proc,
+                                   void *proc_cls)
+{
+  return NULL;
+}
+
 
 /**
  * Get the hash of a record (what will be signed in the Stree for
@@ -392,30 +329,6 @@ GNUNET_NAMESTORE_record_hash (struct GNUNET_NAMESTORE_Handle *h,
   GNUNET_CRYPTO_hash(teststring, strlen(teststring), record_hash);
 }
 
-/**
- * Obtain part of a signature B-tree.  The processor
- * will only be called once.
- *
- * @param h handle to the namestore
- * @param zone zone to look up a record from
- * @param sig_loc location to look up
- * @param proc function to call on each matching value;
- *        will be called once with a NULL value at the end
- * @param proc_cls closure for proc
- * @return a handle that can be used to
- *         cancel
- */
-struct GNUNET_NAMESTORE_QueueEntry *
-GNUNET_NAMESTORE_lookup_stree (struct GNUNET_NAMESTORE_Handle *h,
-                      const GNUNET_HashCode *zone,
-                      const struct GNUNET_NAMESTORE_SignatureLocation *sig_loc,
-                      GNUNET_NAMESTORE_StreeProcessor proc, void *proc_cls)
-{
-  struct GNUNET_NAMESTORE_QueueEntry *qe;
-  qe = GNUNET_malloc(sizeof (struct GNUNET_NAMESTORE_QueueEntry));
-  return qe;
-}
-
 
 /**
  * Get all records of a zone.
@@ -440,7 +353,20 @@ GNUNET_NAMESTORE_zone_transfer (struct GNUNET_NAMESTORE_Handle *h,
   return qe;
 }
 
+struct GNUNET_NAMESTORE_ZoneIterator *
+GNUNET_NAMESTORE_zone_iteration_start(struct GNUNET_NAMESTORE_Handle *h,
+                                      const GNUNET_HashCode *zone,
+                                      GNUNET_NAMESTORE_RecordProcessor proc,
+                                      void *proc_cls);
+
+int
+GNUNET_NAMESTORE_zone_iterator_next(struct GNUNET_NAMESTORE_ZoneIterator *it);
 
+void
+GNUNET_NAMESTORE_zone_iteration_stop(struct GNUNET_NAMESTORE_ZoneIterator *it);
+
+void
+GNUNET_NAMESTORE_cancel (struct GNUNET_NAMESTORE_QueueEntry *qe);
 
 
 /**