X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fgns%2Fgnunet-service-gns_resolver.h;h=7728c397db35bd0469524d7c4ee691dd260f7e42;hb=4871fb1f27887f7957fab11ca13bb154c48202fe;hp=7ee545e2baee902476d216e653a126a7fe401652;hpb=9b87e5d8f6b762cc8fd4625b7dd369e36722978c;p=oweals%2Fgnunet.git

diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/gns/gnunet-service-gns_resolver.h
index 7ee545e2b..7728c397d 100644
--- a/src/gns/gnunet-service-gns_resolver.h
+++ b/src/gns/gnunet-service-gns_resolver.h
@@ -26,19 +26,21 @@
 #define GNS_RESOLVER_H
 #include "gns.h"
 #include "gnunet_dht_service.h"
-
+#include "gnunet_namecache_service.h"
 
 /**
  * Initialize the resolver subsystem.
  * MUST be called before #GNS_resolver_lookup.
  *
  * @param nh handle to the namestore
+ * @param nc the namecache handle
  * @param dht handle to the dht
  * @param c configuration handle
  * @param max_bg_queries maximum amount of background queries
  */
 void
 GNS_resolver_init (struct GNUNET_NAMESTORE_Handle *nh,
+                   struct GNUNET_NAMECACHE_Handle *nc,
 		   struct GNUNET_DHT_Handle *dht,
 		   const struct GNUNET_CONFIGURATION_Handle *c,
 		   unsigned long long max_bg_queries);
@@ -66,7 +68,7 @@ struct GNS_ResolverHandle;
  */
 typedef void (*GNS_ResultProcessor)(void *cls,
 				    uint32_t rd_count,
-				    const struct GNUNET_NAMESTORE_RecordData *rd);
+				    const struct GNUNET_GNSRECORD_Data *rd);
 
 
 /**
@@ -83,10 +85,10 @@ typedef void (*GNS_ResultProcessor)(void *cls,
  * @return handle to cancel operation
  */
 struct GNS_ResolverHandle *
-GNS_resolver_lookup (const struct GNUNET_CRYPTO_EccPublicKey *zone,
+GNS_resolver_lookup (const struct GNUNET_CRYPTO_EcdsaPublicKey *zone,
 		     uint32_t record_type,
 		     const char *name,
-		     const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key,
+		     const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_key,
 		     int only_cached,
 		     GNS_ResultProcessor proc,
 		     void *proc_cls);
@@ -95,11 +97,10 @@ GNS_resolver_lookup (const struct GNUNET_CRYPTO_EccPublicKey *zone,
 /**
  * Cancel active resolution (i.e. client disconnected).
  *
- * @param h resolution to abort
+ * @param rh resolution to abort
  */
 void
-GNS_resolver_lookup_cancel (struct GNS_ResolverHandle *h);
-
+GNS_resolver_lookup_cancel (struct GNS_ResolverHandle *rh);
 
 
 
@@ -112,7 +113,7 @@ GNS_resolver_lookup_cancel (struct GNS_ResolverHandle *h);
  * @return #GNUNET_YES or #GNUNET_NO
  */
 int
-is_tld (const char *name, 
+is_tld (const char *name,
 	const char *tld);
 
 
@@ -120,7 +121,7 @@ is_tld (const char *name,
 /**
  * Checks for gnu/zkey
  */
-#define is_gads_tld(name) is_tld(name, GNUNET_GNS_TLD)
+#define is_gnu_tld(name) is_tld(name, GNUNET_GNS_TLD)
 #define is_zkey_tld(name) is_tld(name, GNUNET_GNS_TLD_ZKEY)