#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
- * @param ignore_pending ignore records that still require user confirmation
- * on lookup
- * @returns GNUNET_OK on success
*/
-int
-GNS_resolver_init (struct GNUNET_NAMESTORE_Handle *nh,
+void
+GNS_resolver_init (struct GNUNET_NAMECACHE_Handle *nc,
struct GNUNET_DHT_Handle *dht,
const struct GNUNET_CONFIGURATION_Handle *c,
- unsigned long long max_bg_queries,
- int ignore_pending);
+ unsigned long long max_bg_queries);
/**
*/
typedef void (*GNS_ResultProcessor)(void *cls,
uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd);
+ const struct GNUNET_GNSRECORD_Data *rd);
/**
* @param only_cached GNUNET_NO to only check locally not DHT for performance
* @param proc the processor to call
* @param proc_cls the closure to pass to @a proc
+ * @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);
/**
* 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);
* @return #GNUNET_YES or #GNUNET_NO
*/
int
-is_tld (const char *name,
+is_tld (const char *name,
const char *tld);
/**
* 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)