ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

copy ns_hook objects before adding them to a hook table

Browse Source 
- this is necessary because adding the same hook to multiple views
  causes the ISC_LIST link value to become inconsistent; it isn't
  noticeable when only one hook action is ever registered at a
  given hook point, but it will break things when there are two.
This commit is contained in:
Evan Hunt
2018-09-19 23:38:23 -07:00
parent 74683fbc3b
commit 0b988256c7
6 changed files with 87 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/ns/tests/query_test.c
View File

@@ -82,9 +82,10 @@ typedef struct {
*/
static void
run_sfcache_test(const ns__query_sfcache_test_params_t *test) {
ns_hooktable_t *query_hooks = NULL;
query_ctx_t *qctx = NULL;
isc_result_t result;
ns_hook_t hook = {
const ns_hook_t hook = {
.action = ns_test_hook_catch_call,
};
@@ -97,8 +98,9 @@ run_sfcache_test(const ns__query_sfcache_test_params_t *test) {
* Interrupt execution if ns_query_done() is called.
*/
ns_hooktable_init(ns__hook_table);
ns_hook_add(ns__hook_table, NS_QUERY_DONE_BEGIN, &hook);
ns_hooktable_create(mctx, &query_hooks);
ns_hook_add(query_hooks, mctx, NS_QUERY_DONE_BEGIN, &hook);
ns__hook_table = query_hooks;
/*
* Construct a query context for a ./NS query with given flags.
@@ -157,6 +159,7 @@ run_sfcache_test(const ns__query_sfcache_test_params_t *test) {
* Clean up.
*/
ns_test_qctx_destroy(&qctx);
ns_hooktable_free(mctx, (void **)&query_hooks);
}
/* test ns__query_sfcache() */
@@ -279,9 +282,10 @@ typedef struct {
*/
static void
run_start_test(const ns__query_start_test_params_t *test) {
ns_hooktable_t *query_hooks = NULL;
query_ctx_t *qctx = NULL;
isc_result_t result;
ns_hook_t hook = {
const ns_hook_t hook = {
.action = ns_test_hook_catch_call,
};
@@ -295,10 +299,10 @@ run_start_test(const ns__query_start_test_params_t *test) {
/*
* Interrupt execution if query_lookup() or ns_query_done() is called.
*/
ns_hooktable_init(ns__hook_table);
ns_hook_add(ns__hook_table, NS_QUERY_LOOKUP_BEGIN, &hook);
ns_hook_add(ns__hook_table, NS_QUERY_DONE_BEGIN, &hook);
ns_hooktable_create(mctx, &query_hooks);
ns_hook_add(query_hooks, mctx, NS_QUERY_LOOKUP_BEGIN, &hook);
ns_hook_add(query_hooks, mctx, NS_QUERY_DONE_BEGIN, &hook);
ns__hook_table = query_hooks;
/*
* Construct a query context using the supplied parameters.
@@ -414,6 +418,7 @@ run_start_test(const ns__query_start_test_params_t *test) {
ns_test_cleanup_zone();
}
ns_test_qctx_destroy(&qctx);
ns_hooktable_free(mctx, (void **)&query_hooks);
}
/* test ns__query_start() */