/*
This file is part of GNUnet.
- (C) 2009-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009-2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
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.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file gns/gnunet-service-gns_resolver.h
#define GNS_RESOLVER_H
#include "gns.h"
#include "gnunet_dht_service.h"
-
+#include "gnunet_gns_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,
+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);
*/
typedef void (*GNS_ResultProcessor)(void *cls,
uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd);
+ const struct GNUNET_GNSRECORD_Data *rd);
/**
* @param record_type the record type to look up
* @param name the name to look up
* @param shorten_key optional private key for authority caching, can be NULL
- * @param only_cached GNUNET_NO to only check locally not DHT for performance
+ * @param options options set to control local lookup
* @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,
- int only_cached,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_key,
+ enum GNUNET_GNS_LocalOptions options,
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)