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

set up hooks.c to enable setting hook points and loading modules

Browse Source 
- move hooks.h to public include directory
- ns_hooktable_init() initializes a hook table. if NULL is passed in, it
  initializes the global hook table
- ns_hooktable_save() saves a pointer to the current global hook table.
- ns_hooktable_reset() replaces the global hook table with different
  one
- ns_hook_add() adds hooks at specified hook points in a hook table (or
  the global hook table if the specified table is NULL)
- load and unload functions support dlopen() of hook modules (this is
  adapted from dyndb and not yet functional)
- began adding new hook points to query.c
This commit is contained in:
Evan Hunt
2018-08-03 14:16:41 -07:00
parent 6f11f90ef4
commit 70cc3f803e
17 changed files with 671 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,8 +19,6 @@
#include <isc/util.h>
#ifdef NS_HOOKS_ENABLE
#include <inttypes.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -31,12 +29,12 @@
#include <dns/badcache.h>
#include <dns/view.h>
#include <ns/client.h>
#include <ns/hooks.h>
#include <ns/query.h>
#include <isc/util.h>
#include "../hooks.h"
#include "nstest.h"
static int
@@ -95,13 +93,14 @@ run_sfcache_test(const ns__query_sfcache_test_params_t *test) {
/*
* Interrupt execution if query_done() is called.
*/
ns_hook_t query_hooks[NS_QUERY_HOOKS_COUNT + 1] = {
[NS_QUERY_DONE_BEGIN] = {
.callback = ns_test_hook_catch_call,
.callback_data = NULL,
},
ns_hook_t hook = {
.callback = ns_test_hook_catch_call,
};
ns__hook_table = query_hooks;
ns_hooktable_t query_hooks;
ns_hooktable_init(&query_hooks);
ns_hook_add(&query_hooks, NS_QUERY_DONE_BEGIN, &hook);
ns_hooktable_reset(&query_hooks);
/*
* Construct a query context for a ./NS query with given flags.
@@ -295,17 +294,16 @@ run_start_test(const ns__query_start_test_params_t *test) {
/*
* Interrupt execution if query_lookup() or query_done() is called.
*/
ns_hook_t query_hooks[NS_QUERY_HOOKS_COUNT + 1] = {
[NS_QUERY_LOOKUP_BEGIN] = {
.callback = ns_test_hook_catch_call,
.callback_data = NULL,
},
[NS_QUERY_DONE_BEGIN] = {
.callback = ns_test_hook_catch_call,
.callback_data = NULL,
},
ns_hook_t hook = {
.callback = ns_test_hook_catch_call,
};
ns__hook_table = query_hooks;
ns_hooktable_t query_hooks;
ns_hooktable_init(&query_hooks);
ns_hook_add(&query_hooks, NS_QUERY_LOOKUP_BEGIN, &hook);
ns_hook_add(&query_hooks, NS_QUERY_DONE_BEGIN, &hook);
ns_hooktable_reset(&query_hooks);
/*
* Construct a query context using the supplied parameters.
@@ -604,18 +602,6 @@ main(void) {
return (cmocka_run_group_tests(tests, NULL, NULL));
}
#else
#include <stdio.h>
int
main(void) {
printf("1..0 # Skipped: libns hooks not enabled\n");
return (0);
}
#endif /* NS_HOOKS_ENABLE */
#else /* HAVE_CMOCKA */
#include <stdio.h>