-working on new, simplified GNS API

4 files changed, 17 insertions, 160 deletions

diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index bdf752382..63f7c3bb5 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -13,7 +13,6 @@ EXTRA_DIST = \
   gauger.h \
   block_fs.h \
   block_dns.h \
-  block_gns.h \
   block_mesh.h \
   block_regex.h
 
diff --git a/src/include/block_gns.h b/src/include/block_gns.h
deleted file mode 100644
index 21f0b097c..000000000
--- a/src/include/block_gns.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2012 Christian Grothoff (and other contributing authors)
-
-     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
-
-     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file include/block_gns.h
- * @brief fs block formats (shared between fs and block)
- * @author Martin Schanzenbach
- */
-#ifndef BLOCK_GNS_H
-#define BLOCK_GNS_H
-
-#include "gnunet_util_lib.h"
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * @brief a record block for a given name of a single authority
- */
-struct GNSNameRecordBlock
-{
-
-  /**
-   * The public key of the authority
-   */
-  struct GNUNET_CRYPTO_EccPublicKey public_key;
-
-  /**
-   * GNUNET_RSA_Signature using RSA-key generated from the records.
-   */
-  struct GNUNET_CRYPTO_EccSignature signature;
-
-  /**
-   * number of records that follow 
-   */
-  uint32_t rd_count GNUNET_PACKED;
-
-  /* 0-terminated name here */
-
-  /* variable-size serialized namestore record data */
-
-};
-
-GNUNET_NETWORK_STRUCT_END
-#endif
diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index 34af525c8..47d02ac7c 100644
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -154,7 +154,6 @@ enum GNUNET_GNS_RecordType
  * Initialize the connection with the GNS service.
  *
  * @param cfg configuration to use
- *
  * @return handle to the GNS service, or NULL on error
  */
 struct GNUNET_GNS_Handle *
@@ -187,56 +186,34 @@ typedef void (*GNUNET_GNS_LookupResultProcessor) (void *cls,
 
 
 /**
- * Perform an asynchronous lookup operation on the GNS
- * in the default zone.
+ * Perform an asynchronous lookup operation on the GNS.
  *
  * @param handle handle to the GNS service
  * @param name the name to look up
- * @param type the GNUNET_GNS_RecordType to look for
- * @param only_cached GNUNET_NO to only check locally not DHT for performance
- * @param shorten_key the private key of the shorten zone (can be NULL)
+ * @param zone zone to look in
+ * @param type the record type to look for
+ * @param only_cached #GNUNET_NO to only check locally (not in the DHT)
+ * @param shorten_zone_key the private key of the shorten zone (can be NULL);
+ *                    specify to enable automatic shortening (given a PSEU
+ *                    record, if a given pseudonym is not yet used in the
+ *                    shorten zone, we automatically add the respective zone
+ *                    under that name)
  * @param proc function to call on result
  * @param proc_cls closure for processor
- *
  * @return handle to the queued request
  */
 struct GNUNET_GNS_LookupRequest*
 GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
-                   const char * name,
+                   const char *name,
+                   const struct GNUNET_CRYPTO_EccPublicKey *zone,
                    enum GNUNET_GNS_RecordType type,
                    int only_cached,
-                   struct GNUNET_CRYPTO_EccPrivateKey *shorten_key,
+                   struct GNUNET_CRYPTO_EccPrivateKey *shorten_zone_key,
                    GNUNET_GNS_LookupResultProcessor proc,
                    void *proc_cls);
 
 
 /**
- * Perform an asynchronous lookup operation on the GNS
- * in the zone specified by 'zone'.
- *
- * @param handle handle to the GNS service
- * @param name the name to look up
- * @param zone the zone to start the resolution in
- * @param type the GNUNET_GNS_RecordType to look for
- * @param only_cached GNUNET_YES to only check locally not DHT for performance
- * @param shorten_key the private key of the shorten zone (can be NULL)
- * @param proc function to call on result
- * @param proc_cls closure for processor
- *
- * @return handle to the queued request
- */
-struct GNUNET_GNS_LookupRequest*
-GNUNET_GNS_lookup_zone (struct GNUNET_GNS_Handle *handle,
-                        const char * name,
-                        struct GNUNET_CRYPTO_ShortHashCode *zone,
-                        enum GNUNET_GNS_RecordType type,
-                        int only_cached,
-                        struct GNUNET_CRYPTO_EccPrivateKey *shorten_key,
-                        GNUNET_GNS_LookupResultProcessor proc,
-                        void *proc_cls);
-
-
-/**
  * Cancel pending lookup request
  *
  * @param lr the lookup request to cancel
@@ -244,69 +221,6 @@ GNUNET_GNS_lookup_zone (struct GNUNET_GNS_Handle *handle,
 void
 GNUNET_GNS_cancel_lookup_request (struct GNUNET_GNS_LookupRequest *lr);
 
-/* *************** Standard API: shorten ******************* */
-
-
-/**
- * Processor called on for a name shortening result
- * called only once
- *
- * @param cls closure
- * @param short_name the shortened name or NULL if no result / error
- */
-typedef void (*GNUNET_GNS_ShortenResultProcessor) (void *cls,
-                                                   const char* short_name);
-
-
-/**
- * Perform a name shortening operation on the GNS.
- *
- * @param handle handle to the GNS service
- * @param name the name to look up
- * @param private_zone the public zone of the private zone
- * @param shorten_zone the public zone of the shorten zone
- * @param proc function to call on result
- * @param proc_cls closure for processor
- * @return handle to the operation
- */
-struct GNUNET_GNS_ShortenRequest*
-GNUNET_GNS_shorten (struct GNUNET_GNS_Handle *handle,
-                    const char * name,
-                    struct GNUNET_CRYPTO_ShortHashCode *private_zone,
-                    struct GNUNET_CRYPTO_ShortHashCode *shorten_zone,
-                    GNUNET_GNS_ShortenResultProcessor proc,
-                    void *proc_cls);
-
-
-/**
- * Perform a name shortening operation on the GNS.
- *
- * @param handle handle to the GNS service
- * @param name the name to look up
- * @param private_zone the public zone of the private zone
- * @param shorten_zone the public zone of the shorten zone
- * @param zone the zone to start the resolution in
- * @param proc function to call on result
- * @param proc_cls closure for processor
- * @return handle to the operation
- */
-struct GNUNET_GNS_ShortenRequest*
-GNUNET_GNS_shorten_zone (struct GNUNET_GNS_Handle *handle,
-                         const char * name,
-                         struct GNUNET_CRYPTO_ShortHashCode *private_zone,
-                         struct GNUNET_CRYPTO_ShortHashCode *shorten_zone,
-                         struct GNUNET_CRYPTO_ShortHashCode *zone,
-                         GNUNET_GNS_ShortenResultProcessor proc,
-                         void *proc_cls);
-
-
-/**
- * Cancel pending shorten request
- *
- * @param sr the lookup request to cancel
- */
-void
-GNUNET_GNS_cancel_shorten_request (struct GNUNET_GNS_ShortenRequest *sr);
 
 
 /* *************** Standard API: get authority ******************* */
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index e47b1ee3d..c9eb004e1 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -226,6 +226,10 @@ struct GNUNET_NAMESTORE_RecordData
 };
 
 
+
+GNUNET_NETWORK_STRUCT_BEGIN
+
+
 /**
  * Information we have in an encrypted block with record data (i.e. in the DHT).
  */
@@ -256,6 +260,7 @@ struct GNUNET_NAMESTORE_Block
   /* followed by encrypted data */
 };
 
+GNUNET_NETWORK_STRUCT_END
 
 /**
  * Store an item in the namestore.  If the item is already present,