summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gns/gnunet-service-gns.c3
-rw-r--r--src/gns/gnunet-service-gns_resolver.c11
-rw-r--r--src/gns/gnunet-service-gns_resolver.h4
3 files changed, 3 insertions, 15 deletions
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 61287c079..53f065037 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -753,8 +753,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
753 return; 753 return;
754 } 754 }
755 } 755 }
756 GNS_resolver_init (namestore_handle, 756 GNS_resolver_init (namecache_handle,
757 namecache_handle,
758 dht_handle, 757 dht_handle,
759 c, 758 c,
760 max_parallel_bg_queries); 759 max_parallel_bg_queries);
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 925277857..e4f5be6f0 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -360,11 +360,6 @@ struct CacheOps
360 360
361 361
362/** 362/**
363 * Our handle to the namestore service
364 */
365static struct GNUNET_NAMESTORE_Handle *namestore_handle;
366
367/**
368 * Our handle to the namecache service 363 * Our handle to the namecache service
369 */ 364 */
370static struct GNUNET_NAMECACHE_Handle *namecache_handle; 365static struct GNUNET_NAMECACHE_Handle *namecache_handle;
@@ -2143,15 +2138,13 @@ GNS_resolver_lookup_cancel (struct GNS_ResolverHandle *rh)
2143/** 2138/**
2144 * Initialize the resolver 2139 * Initialize the resolver
2145 * 2140 *
2146 * @param nh the namestore handle
2147 * @param nc the namecache handle 2141 * @param nc the namecache handle
2148 * @param dht the dht handle 2142 * @param dht the dht handle
2149 * @param c configuration handle 2143 * @param c configuration handle
2150 * @param max_bg_queries maximum number of parallel background queries in dht 2144 * @param max_bg_queries maximum number of parallel background queries in dht
2151 */ 2145 */
2152void 2146void
2153GNS_resolver_init (struct GNUNET_NAMESTORE_Handle *nh, 2147GNS_resolver_init (struct GNUNET_NAMECACHE_Handle *nc,
2154 struct GNUNET_NAMECACHE_Handle *nc,
2155 struct GNUNET_DHT_Handle *dht, 2148 struct GNUNET_DHT_Handle *dht,
2156 const struct GNUNET_CONFIGURATION_Handle *c, 2149 const struct GNUNET_CONFIGURATION_Handle *c,
2157 unsigned long long max_bg_queries) 2150 unsigned long long max_bg_queries)
@@ -2160,7 +2153,6 @@ GNS_resolver_init (struct GNUNET_NAMESTORE_Handle *nh,
2160 2153
2161 cfg = c; 2154 cfg = c;
2162 namecache_handle = nc; 2155 namecache_handle = nc;
2163 namestore_handle = nh;
2164 dht_handle = dht; 2156 dht_handle = dht;
2165 dht_lookup_heap = 2157 dht_lookup_heap =
2166 GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN); 2158 GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
@@ -2211,7 +2203,6 @@ GNS_resolver_done ()
2211 vpn_handle = NULL; 2203 vpn_handle = NULL;
2212 dht_handle = NULL; 2204 dht_handle = NULL;
2213 namecache_handle = NULL; 2205 namecache_handle = NULL;
2214 namestore_handle = NULL;
2215} 2206}
2216 2207
2217 2208
diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/gns/gnunet-service-gns_resolver.h
index 7728c397d..ffb7142a7 100644
--- a/src/gns/gnunet-service-gns_resolver.h
+++ b/src/gns/gnunet-service-gns_resolver.h
@@ -32,15 +32,13 @@
32 * Initialize the resolver subsystem. 32 * Initialize the resolver subsystem.
33 * MUST be called before #GNS_resolver_lookup. 33 * MUST be called before #GNS_resolver_lookup.
34 * 34 *
35 * @param nh handle to the namestore
36 * @param nc the namecache handle 35 * @param nc the namecache handle
37 * @param dht handle to the dht 36 * @param dht handle to the dht
38 * @param c configuration handle 37 * @param c configuration handle
39 * @param max_bg_queries maximum amount of background queries 38 * @param max_bg_queries maximum amount of background queries
40 */ 39 */
41void 40void
42GNS_resolver_init (struct GNUNET_NAMESTORE_Handle *nh, 41GNS_resolver_init (struct GNUNET_NAMECACHE_Handle *nc,
43 struct GNUNET_NAMECACHE_Handle *nc,
44 struct GNUNET_DHT_Handle *dht, 42 struct GNUNET_DHT_Handle *dht,
45 const struct GNUNET_CONFIGURATION_Handle *c, 43 const struct GNUNET_CONFIGURATION_Handle *c,
46 unsigned long long max_bg_queries); 44 unsigned long long max_bg_queries);