From: Karel Slany <karel.slany@nic.cz>
Date: Wed, 13 Jul 2016 06:57:41 +0000 (+0200)
Subject: Removed cookie-related preprocessor conditionals from resolver structures.
X-Git-Tag: v1.1.0~2^2~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94775b94fae008ddde5b31ee540b38bd27ddee2e;p=thirdparty%2Fknot-resolver.git

Removed cookie-related preprocessor conditionals from resolver structures.
---

diff --git a/daemon/bindings.c b/daemon/bindings.c
index f14e05b98..ecc750c0d 100644
--- a/daemon/bindings.c
+++ b/daemon/bindings.c
@@ -657,10 +657,8 @@ static int cache_clear(lua_State *L)
 	lru_deinit(engine->resolver.cache_rep);
 	lru_init(engine->resolver.cache_rtt, LRU_RTT_SIZE);
 	lru_init(engine->resolver.cache_rep, LRU_REP_SIZE);
-#if defined(ENABLE_COOKIES)
 	lru_deinit(engine->resolver.cache_cookie);
 	lru_init(engine->resolver.cache_cookie, LRU_COOKIES_SIZE);
-#endif /* defined(ENABLE_COOKIES) */
 	lua_pushboolean(L, true);
 	return 1;
 }
diff --git a/daemon/engine.c b/daemon/engine.c
index 35fd331da..d08344b63 100644
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -469,12 +469,10 @@ static int init_resolver(struct engine *engine)
 	if (engine->resolver.cache_rep) {
 		lru_init(engine->resolver.cache_rep, LRU_REP_SIZE);
 	}
-#if defined(ENABLE_COOKIES)
 	engine->resolver.cache_cookie = mm_alloc(engine->pool, lru_size(kr_cookie_lru_t, LRU_COOKIES_SIZE));
 	if (engine->resolver.cache_cookie) {
 		lru_init(engine->resolver.cache_cookie, LRU_COOKIES_SIZE);
 	}
-#endif /* defined(ENABLE_COOKIES) */
 
 	/* Load basic modules */
 	engine_register(engine, "iterate", NULL, NULL);
@@ -593,9 +591,7 @@ void engine_deinit(struct engine *engine)
 	kr_cache_close(&engine->resolver.cache);
 	lru_deinit(engine->resolver.cache_rtt);
 	lru_deinit(engine->resolver.cache_rep);
-#if defined(ENABLE_COOKIES)
 	lru_deinit(engine->resolver.cache_cookie);
-#endif /* defined(ENABLE_COOKIES) */
 
 	/* Clear IPC pipes */
 	for (size_t i = 0; i < engine->ipc_set.len; ++i) {
diff --git a/daemon/engine.h b/daemon/engine.h
index 7f229c294..16d3e02d0 100644
--- a/daemon/engine.h
+++ b/daemon/engine.h
@@ -23,11 +23,9 @@
 #ifndef LRU_REP_SIZE
 #define LRU_REP_SIZE (LRU_RTT_SIZE / 4) /**< NS reputation cache size */
 #endif
-#if defined(ENABLE_COOKIES)
 #ifndef LRU_COOKIES_SIZE
 #define LRU_COOKIES_SIZE 65536 /**< DNS cookies cache size. */
 #endif
-#endif /* defined(ENABLE_COOKIES) */
 #ifndef MP_FREELIST_SIZE
 #define MP_FREELIST_SIZE 64 /**< Maximum length of the worker mempool freelist */
 #endif
diff --git a/lib/resolve.c b/lib/resolve.c
index 3397d6bca..934fcf565 100644
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -527,7 +527,6 @@ int kr_resolve_consume(struct kr_request *request, const struct sockaddr *src, k
 	/* Different processing for network error */
 	struct kr_query *qry = array_tail(rplan->pending);
 
-#if defined(ENABLE_COOKIES)
 	if (src && !(qry->flags & QUERY_CACHED)) {
 		/* Track response source.
 		 * @todo -- Find a more suitable place to put the source
@@ -544,7 +543,6 @@ int kr_resolve_consume(struct kr_request *request, const struct sockaddr *src, k
 			break;
 		}
 	}
-#endif /* defined(ENABLE_COOKIES) */
 
 	bool tried_tcp = (qry->flags & QUERY_TCP);
 	if (!packet || packet->size == 0) {
diff --git a/lib/resolve.h b/lib/resolve.h
index 8c0c3c97e..46e8e0cd3 100644
--- a/lib/resolve.h
+++ b/lib/resolve.h
@@ -94,12 +94,10 @@ struct kr_context
 	kr_nsrep_lru_t *cache_rtt;
 	kr_nsrep_lru_t *cache_rep;
 	module_array_t *modules;
-#if defined(ENABLE_COOKIES)
-	/* The structure should not be held within the cookies module because
-	 * of better access. */
+	/* The cookie context structure should not be held within the cookies
+	 * module because of better access. */
 	struct kr_cookie_ctx cookie_ctx;
 	kr_cookie_lru_t *cache_cookie;
-#endif /* defined(ENABLE_COOKIES) */
 	knot_mm_t *pool;
 };
 
diff --git a/lib/rplan.h b/lib/rplan.h
index 433b9642a..de679deb1 100644
--- a/lib/rplan.h
+++ b/lib/rplan.h
@@ -76,12 +76,10 @@ struct kr_query {
 	struct kr_zonecut zone_cut;
 	struct kr_nsrep ns;
 	struct kr_layer_pickle *deferred;
-#if defined(ENABLE_COOKIES)
 	union {
 		struct sockaddr_in ip4;
 		struct sockaddr_in6 ip6;
 	} rsource; /**< Response source address. */
-#endif /* defined(ENABLE_COOKIES) */
 };
 
 /** @cond internal Array of queries. */