From: Vicky Shrestha <vicky@geeks.net.np>
Date: Sat, 24 Dec 2016 18:04:53 +0000 (-0800)
Subject: Fixing structs after rebasing upstream changes
X-Git-Tag: v1.3.0~23^2~62^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d83e1d0715eb94a9b95ef71acd520cc0edd8d56;p=thirdparty%2Fknot-resolver.git

Fixing structs after rebasing upstream changes
---

diff --git a/modules/dnstap/dnstap.c b/modules/dnstap/dnstap.c
index 818a8c54a..66340a033 100644
--- a/modules/dnstap/dnstap.c
+++ b/modules/dnstap/dnstap.c
@@ -38,7 +38,7 @@
 #include <ccan/json/json.h>
 #include <fstrm.h>
 
-#define DEBUG_MSG(fmt, ...) kr_log_debug("[dnstap] " fmt, ##__VA_ARGS__);
+#define DEBUG_MSG(fmt, ...) kr_log_verbose("[dnstap] " fmt, ##__VA_ARGS__);
 #define CFG_SOCK_PATH "sockPath"
 #define CFG_LOG_RESP_PKT "logRespPkt"
 #define DEFAULT_SOCK_PATH "/tmp/dnstap.sock"
@@ -107,8 +107,8 @@ static void set_address(const struct sockaddr *sockaddr,
 }
 
 /* dnstap_log prepares dnstap message and sent it to fstrm */
-static int dnstap_log(knot_layer_t *ctx) {
-	struct kr_request *req = ctx->data;
+static int dnstap_log(kr_layer_t *ctx) {
+	struct kr_request *req = ctx->req;
 	struct kr_module *module = ctx->api->data;
 	struct kr_rplan *rplan = &req->rplan;
 	struct dnstap_data *dnstap_dt = module->data;
@@ -397,8 +397,8 @@ int dnstap_config(struct kr_module *module, const char *conf) {
 }
 
 KR_EXPORT
-const knot_layer_api_t *dnstap_layer(struct kr_module *module) {
-	static knot_layer_api_t _layer = {
+const kr_layer_api_t *dnstap_layer(struct kr_module *module) {
+	static kr_layer_api_t _layer = {
 		.finish = &dnstap_log,
 	};
 	/* Store module reference */