- For #391: fix indentation.

diff --git a/daemon/worker.c b/daemon/worker.c
index 33b70e83e68e5250d9ebeb4d911c47d78032e743..37a8e1fe0409a4d39e8670d01193b975a27da88b 100644 (file)
--- a/daemon/worker.c
+++ b/daemon/worker.c
@@ -546,7 +546,7 @@ answer_norec_from_cache(struct worker* worker, struct query_info* qinfo,
        edns->bits &= EDNS_DO;
        if(!inplace_cb_reply_cache_call(&worker->env, qinfo, NULL, msg->rep,
                (int)(flags&LDNS_RCODE_MASK), edns, repinfo, worker->scratchpad,
-        worker->env.now_tv))
+               worker->env.now_tv))
                        return 0;
        msg->rep->flags |= BIT_QR|BIT_RA;
        if(!apply_edns_options(edns, &edns_bak, worker->env.cfg,
@@ -688,7 +688,7 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
                edns->bits &= EDNS_DO;
                if(!inplace_cb_reply_servfail_call(&worker->env, qinfo, NULL, rep,
                        LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad,
-           worker->env.now_tv))
+                       worker->env.now_tv))
                        goto bail_out;
                error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL,
                        qinfo, id, flags, edns);
@@ -760,7 +760,7 @@ answer_from_cache(struct worker* worker, struct query_info* qinfo,
                udpsize, edns, (int)(edns->bits & EDNS_DO), *is_secure_answer)) {
                if(!inplace_cb_reply_servfail_call(&worker->env, qinfo, NULL, NULL,
                        LDNS_RCODE_SERVFAIL, edns, repinfo, worker->scratchpad,
-           worker->env.now_tv))
+                       worker->env.now_tv))
                                edns->opt_list = NULL;
                error_encode(repinfo->c->buffer, LDNS_RCODE_SERVFAIL, 
                        qinfo, id, flags, edns);
@@ -849,7 +849,7 @@ chaos_replystr(sldns_buffer* pkt, char** str, int num, struct edns_data* edns,
        edns->bits &= EDNS_DO;
        if(!inplace_cb_reply_local_call(&worker->env, NULL, NULL, NULL,
                LDNS_RCODE_NOERROR, edns, repinfo, worker->scratchpad,
-        worker->env.now_tv))
+               worker->env.now_tv))
                        edns->opt_list = NULL;
        if(sldns_buffer_capacity(pkt) >=
                sldns_buffer_limit(pkt)+calc_edns_field_size(edns))

diff --git a/doc/Changelog b/doc/Changelog
index e8da85d6ae76df739ed5c497e415b1f67fbf2458..c7d09cbb667772bef37f32b3f64cf5fb6045b324 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - Merge PR #391 from fhriley: Add start_time to reply callbacks so
          modules can compute the response time.
        - For #391: use struct timeval* start_time for callback information.
+       - For #391: fix indentation.
 
 6 January 2021: Wouter
        - Fix #379: zone loading over HTTP appears to have buffer issues.

diff --git a/pythonmod/pythonmod.h b/pythonmod/pythonmod.h
index f5ae9ca56bcde929bcd49e7cc3737cb17d19df2b..26d74e09f42bc9419a76c8bdd90aacde9cd98ec6 100644 (file)
--- a/pythonmod/pythonmod.h
+++ b/pythonmod/pythonmod.h
@@ -73,7 +73,7 @@ int python_inplace_cb_reply_generic(struct query_info* qinfo,
        struct module_qstate* qstate, struct reply_info* rep, int rcode,
        struct edns_data* edns, struct edns_option** opt_list_out,
        struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time, int id, void* python_callback);
+       struct timeval* start_time, int id, void* python_callback);
 
 /** Declared here for fptr_wlist access. The definition is in interface.i. */
 int python_inplace_cb_query_generic(

diff --git a/services/mesh.c b/services/mesh.c
index 4c806dc4b2181cf07b50486f880a954a1757412f..270ffb8bac9a2ed3d43964f59d77edfcab5e5416 100644 (file)
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -1350,7 +1350,7 @@ void mesh_query_done(struct mesh_state* mstate)
                }
        }
        for(r = mstate->reply_list; r; r = r->next) {
-           tv = r->start_time;
+               tv = r->start_time;
 
                /* if a response-ip address block has been stored the
                 *  information should be logged for each client. */
@@ -1992,7 +1992,7 @@ mesh_serve_expired_callback(void* arg)
                log_dns_msg("Serve expired lookup", &qstate->qinfo, msg->rep);
 
        for(r = mstate->reply_list; r; r = r->next) {
-           tv = r->start_time;
+               tv = r->start_time;
 
                /* If address info is returned, it means the action should be an
                * 'inform' variant and the information should be logged. */

diff --git a/util/data/msgreply.c b/util/data/msgreply.c
index a48cb78f1218cee67d883401951a8694832ce35d..35cd8b93e0d97ea4a2b0d0c0a7622ec4a42b032b 100644 (file)
--- a/util/data/msgreply.c
+++ b/util/data/msgreply.c
@@ -1036,7 +1036,7 @@ static int inplace_cb_reply_call_generic(
        struct query_info* qinfo, struct module_qstate* qstate,
        struct reply_info* rep, int rcode, struct edns_data* edns,
        struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time)
+       struct timeval* start_time)
 {
        struct inplace_cb* cb;
        struct edns_option* opt_list_out = NULL;
@@ -1058,7 +1058,7 @@ static int inplace_cb_reply_call_generic(
 int inplace_cb_reply_call(struct module_env* env, struct query_info* qinfo,
        struct module_qstate* qstate, struct reply_info* rep, int rcode,
        struct edns_data* edns, struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time)
+       struct timeval* start_time)
 {
        return inplace_cb_reply_call_generic(
                env->inplace_cb_lists[inplace_cb_reply], inplace_cb_reply, qinfo,
@@ -1069,7 +1069,7 @@ int inplace_cb_reply_cache_call(struct module_env* env,
        struct query_info* qinfo, struct module_qstate* qstate,
        struct reply_info* rep, int rcode, struct edns_data* edns,
        struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time)
+       struct timeval* start_time)
 {
        return inplace_cb_reply_call_generic(
                env->inplace_cb_lists[inplace_cb_reply_cache], inplace_cb_reply_cache,
@@ -1080,7 +1080,7 @@ int inplace_cb_reply_local_call(struct module_env* env,
        struct query_info* qinfo, struct module_qstate* qstate,
        struct reply_info* rep, int rcode, struct edns_data* edns,
        struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time)
+       struct timeval* start_time)
 {
        return inplace_cb_reply_call_generic(
                env->inplace_cb_lists[inplace_cb_reply_local], inplace_cb_reply_local,
@@ -1091,7 +1091,7 @@ int inplace_cb_reply_servfail_call(struct module_env* env,
        struct query_info* qinfo, struct module_qstate* qstate,
        struct reply_info* rep, int rcode, struct edns_data* edns,
        struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time)
+       struct timeval* start_time)
 {
        /* We are going to servfail. Remove any potential edns options. */
        if(qstate)

diff --git a/util/data/msgreply.h b/util/data/msgreply.h
index 32466644f61461722f5c94ba174904c28bd336ee..76b75ea8a54b593a35b4b4322721886fe7fb402e 100644 (file)
--- a/util/data/msgreply.h
+++ b/util/data/msgreply.h
@@ -559,7 +559,7 @@ struct edns_option* edns_opt_list_find(struct edns_option* list, uint16_t code);
 int inplace_cb_reply_call(struct module_env* env, struct query_info* qinfo,
        struct module_qstate* qstate, struct reply_info* rep, int rcode,
        struct edns_data* edns, struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time);
+       struct timeval* start_time);
 
 /**
  * Call the registered functions in the inplace_cb_reply_cache linked list.
@@ -578,7 +578,7 @@ int inplace_cb_reply_cache_call(struct module_env* env,
        struct query_info* qinfo, struct module_qstate* qstate,
        struct reply_info* rep, int rcode, struct edns_data* edns,
        struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time);
+       struct timeval* start_time);
 
 /**
  * Call the registered functions in the inplace_cb_reply_local linked list.
@@ -597,7 +597,7 @@ int inplace_cb_reply_local_call(struct module_env* env,
        struct query_info* qinfo, struct module_qstate* qstate,
        struct reply_info* rep, int rcode, struct edns_data* edns,
        struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time);
+       struct timeval* start_time);
 
 /**
  * Call the registered functions in the inplace_cb_reply linked list.
@@ -617,7 +617,7 @@ int inplace_cb_reply_servfail_call(struct module_env* env,
        struct query_info* qinfo, struct module_qstate* qstate,
        struct reply_info* rep, int rcode, struct edns_data* edns,
        struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time);
+       struct timeval* start_time);
 
 /**
  * Call the registered functions in the inplace_cb_query linked list.

diff --git a/util/module.h b/util/module.h
index 9267b49e88f2b27fd155dea01df4dee990b281c2..81a31a9cca46c2ee1eb5baae0d47eed90ed7de1d 100644 (file)
--- a/util/module.h
+++ b/util/module.h
@@ -258,7 +258,7 @@ typedef int inplace_cb_reply_func_type(struct query_info* qinfo,
        struct module_qstate* qstate, struct reply_info* rep, int rcode,
        struct edns_data* edns, struct edns_option** opt_list_out,
        struct comm_reply* repinfo, struct regional* region,
-    struct timeval* start_time, int id, void* callback);
+       struct timeval* start_time, int id, void* callback);
 
 /**
  * Inplace callback function called before sending the query to a nameserver.