mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-23 02:28:55 +00:00
Code Issues Releases Wiki Activity
bind/lib/ns/hooks.c

515 lines
12 KiB
C
Raw Normal View History

set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
/*! \file */
#include <config.h>
#include <string.h>
#if HAVE_DLFCN_H
#include <dlfcn.h>
#elif _WIN32
#include <windows.h>
#endif
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
#include <isc/list.h>
#include <isc/log.h>
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
#include <isc/mem.h>
#include <isc/mutex.h>
#include <isc/result.h>
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
#include <isc/platform.h>
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
#include <isc/util.h>
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
#include <isc/types.h>
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
restore filter-aaaa syntax checking - added functionality to check hook parameters in named-checkconf, and restored the checkconf tests that were removed from the filter-aaaa test.
2018-11-02 23:28:25 -07:00
#include <dns/view.h>
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
#include <ns/hooks.h>
#include <ns/log.h>
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
#include <ns/query.h>
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
#define CHECK(op) \
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
do { \
result = (op); \
if (result != ISC_R_SUCCESS) { \
goto cleanup; \
} \
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
} while (0)
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
struct ns_module {
isc_mem_t *mctx;
void *handle;
void *inst;
char *modpath;
restore filter-aaaa syntax checking - added functionality to check hook parameters in named-checkconf, and restored the checkconf tests that were removed from the filter-aaaa test.
2018-11-02 23:28:25 -07:00
ns_hook_check_t *check_func;
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
ns_hook_register_t *register_func;
ns_hook_destroy_t *destroy_func;
LINK(ns_module_t) link;
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
};
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
static ns_hooklist_t default_hooktable[NS_HOOKPOINTS_COUNT];
LIBNS_EXTERNAL_DATA ns_hooktable_t *ns__hook_table = &default_hooktable;
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
#if HAVE_DLFCN_H && HAVE_DLOPEN
static isc_result_t
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
load_symbol(void *handle, const char *modpath,
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
const char *symbol_name, void **symbolp)
{
copy ns_hook objects before adding them to a hook table - 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.
2018-09-19 23:38:23 -07:00
void *symbol = NULL;
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
REQUIRE(handle != NULL);
REQUIRE(symbolp != NULL && *symbolp == NULL);
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
/*
* Clear any pre-existing error conditions before running dlsym().
* (In this case, we expect dlsym() to return non-NULL values
* and will always return an error if it returns NULL, but
* this ensures that we'll report the correct error condition
* if there is one.)
*/
dlerror();
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
symbol = dlsym(handle, symbol_name);
if (symbol == NULL) {
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
const char *errmsg = dlerror();
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
if (errmsg == NULL) {
errmsg = "returned function pointer is NULL";
}
isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_HOOKS, ISC_LOG_ERROR,
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
"failed to look up symbol %s in "
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
"hook module '%s': %s",
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
symbol_name, modpath, errmsg);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
return (ISC_R_FAILURE);
}
*symbolp = symbol;
return (ISC_R_SUCCESS);
}
static isc_result_t
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
load_library(isc_mem_t *mctx, const char *modpath, ns_module_t **hmodp) {
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
isc_result_t result;
void *handle = NULL;
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
ns_module_t *hmod = NULL;
restore filter-aaaa syntax checking - added functionality to check hook parameters in named-checkconf, and restored the checkconf tests that were removed from the filter-aaaa test.
2018-11-02 23:28:25 -07:00
ns_hook_check_t *check_func = NULL;
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
ns_hook_register_t *register_func = NULL;
ns_hook_destroy_t *destroy_func = NULL;
ns_hook_version_t *version_func = NULL;
int version, flags;
REQUIRE(hmodp != NULL && *hmodp == NULL);
restore filter-aaaa syntax checking - added functionality to check hook parameters in named-checkconf, and restored the checkconf tests that were removed from the filter-aaaa test.
2018-11-02 23:28:25 -07:00
flags = RTLD_LAZY | RTLD_LOCAL;
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
#ifdef RTLD_DEEPBIND
flags |= RTLD_DEEPBIND;
#endif
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
handle = dlopen(modpath, flags);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
if (handle == NULL) {
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
const char *errmsg = dlerror();
if (errmsg == NULL) {
errmsg = "unknown error";
}
isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_HOOKS, ISC_LOG_ERROR,
"failed to dlopen() hook module '%s': %s",
modpath, errmsg);
return (ISC_R_FAILURE);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
}
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
CHECK(load_symbol(handle, modpath, "hook_version",
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
(void **)&version_func));
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
version = version_func();
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
if (version < (NS_HOOK_VERSION - NS_HOOK_AGE) ||
version > NS_HOOK_VERSION)
{
isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_HOOKS, ISC_LOG_ERROR,
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
"hook API version mismatch: %d/%d",
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
version, NS_HOOK_VERSION);
CHECK(ISC_R_FAILURE);
}
restore filter-aaaa syntax checking - added functionality to check hook parameters in named-checkconf, and restored the checkconf tests that were removed from the filter-aaaa test.
2018-11-02 23:28:25 -07:00
CHECK(load_symbol(handle, modpath, "hook_check",
(void **)&check_func));
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
CHECK(load_symbol(handle, modpath, "hook_register",
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
(void **)&register_func));
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
CHECK(load_symbol(handle, modpath, "hook_destroy",
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
(void **)&destroy_func));
hmod = isc_mem_get(mctx, sizeof(*hmod));
restore filter-aaaa syntax checking - added functionality to check hook parameters in named-checkconf, and restored the checkconf tests that were removed from the filter-aaaa test.
2018-11-02 23:28:25 -07:00
memset(hmod, 0, sizeof(*hmod));
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
isc_mem_attach(mctx, &hmod->mctx);
hmod->handle = handle;
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
hmod->modpath = isc_mem_strdup(hmod->mctx, modpath);
restore filter-aaaa syntax checking - added functionality to check hook parameters in named-checkconf, and restored the checkconf tests that were removed from the filter-aaaa test.
2018-11-02 23:28:25 -07:00
hmod->check_func = check_func;
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
hmod->register_func = register_func;
hmod->destroy_func = destroy_func;
ISC_LINK_INIT(hmod, link);
*hmodp = hmod;
hmod = NULL;
cleanup:
if (result != ISC_R_SUCCESS) {
isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_HOOKS, ISC_LOG_ERROR,
"failed to dynamically load "
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
"module '%s': %s", modpath,
isc_result_totext(result));
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
if (hmod != NULL) {
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
isc_mem_putanddetach(&hmod->mctx, hmod, sizeof(*hmod));
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
}
if (handle != NULL) {
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
(void) dlclose(handle);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
}
}
return (result);
}
static void
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
unload_library(ns_module_t **hmodp) {
ns_module_t *hmod = NULL;
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
REQUIRE(hmodp != NULL && *hmodp != NULL);
hmod = *hmodp;
*hmodp = NULL;
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_HOOKS, ISC_LOG_INFO,
"unloading module '%s'", hmod->modpath);
if (hmod->inst != NULL) {
hmod->destroy_func(&hmod->inst);
}
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
if (hmod->handle != NULL) {
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
(void) dlclose(hmod->handle);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
}
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
if (hmod->modpath != NULL) {
isc_mem_free(hmod->mctx, hmod->modpath);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
}
initial implementation of filter-aaaa.so as a shared object - temporary kluge! in this version, for testing purposes, named always searches for a filter-aaaa module at /tmp/filter-aaaa.so. this enables the filter-aaaa system test to run even though the code to configure hooks in named.conf hasn't been written yet. - filter-aaaa-on-v4, filter-aaaa-on-v6 and the filter-aaaa ACL are still configured in the view as they were before, not in the hook.
2018-08-10 19:32:12 -07:00
isc_mem_putanddetach(&hmod->mctx, hmod, sizeof(*hmod));
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
}
#elif _WIN32
static isc_result_t
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
load_symbol(HMODULE handle, const char *modpath,
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
const char *symbol_name, void **symbolp)
{
copy ns_hook objects before adding them to a hook table - 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.
2018-09-19 23:38:23 -07:00
void *symbol = NULL;
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
REQUIRE(handle != NULL);
REQUIRE(symbolp != NULL && *symbolp == NULL);
symbol = GetProcAddress(handle, symbol_name);
if (symbol == NULL) {
int errstatus = GetLastError();
isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_HOOKS, ISC_LOG_ERROR,
"failed to look up symbol %s in "
"module '%s': %d",
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
symbol_name, modpath, errstatus);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
return (ISC_R_FAILURE);
}
*symbolp = symbol;
return (ISC_R_SUCCESS);
}
static isc_result_t
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
load_library(isc_mem_t *mctx, const char *modpath, ns_module_t **hmodp) {
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
isc_result_t result;
HMODULE handle;
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
ns_module_t *hmod = NULL;
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
ns_hook_register_t *register_func = NULL;
ns_hook_destroy_t *destroy_func = NULL;
ns_hook_version_t *version_func = NULL;
int version;
REQUIRE(hmodp != NULL && *hmodp == NULL);
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
handle = LoadLibraryA(modpath);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
if (handle == NULL) {
CHECK(ISC_R_FAILURE);
}
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
CHECK(load_symbol(handle, modpath, "hook_version",
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
(void **)&version_func));
version = version_func(NULL);
if (version < (NS_HOOK_VERSION - NS_HOOK_AGE) ||
version > NS_HOOK_VERSION)
{
isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_HOOKS, ISC_LOG_ERROR,
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
"hook API version mismatch: %d/%d",
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
version, NS_HOOK_VERSION);
CHECK(ISC_R_FAILURE);
}
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
CHECK(load_symbol(handle, modpath, "hook_register",
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
(void **)&register_func));
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
CHECK(load_symbol(handle, modpath, "hook_destroy",
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
(void **)&destroy_func));
hmod = isc_mem_get(mctx, sizeof(*hmod));
restore filter-aaaa syntax checking - added functionality to check hook parameters in named-checkconf, and restored the checkconf tests that were removed from the filter-aaaa test.
2018-11-02 23:28:25 -07:00
memset(hmod, 0, sizeof(*hmod));
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
isc_mem_attach(mctx, &hmod->mctx);
hmod->handle = handle;
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
hmod->modpath = isc_mem_strdup(hmod->mctx, modpath);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
hmod->register_func = register_func;
hmod->destroy_func = destroy_func;
ISC_LINK_INIT(hmod, link);
*hmodp = hmod;
hmod = NULL;
cleanup:
if (result != ISC_R_SUCCESS) {
isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_HOOKS, ISC_LOG_ERROR,
"failed to dynamically load "
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
"hook module '%s': %d (%s)", modpath,
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
GetLastError(), isc_result_totext(result));
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
if (hmod != NULL) {
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
isc_mem_putanddetach(&hmod->mctx, hmod, sizeof(*hmod));
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
}
if (handle != NULL) {
FreeLibrary(handle);
}
}
return (result);
}
static void
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
unload_library(ns_module_t **hmodp) {
ns_module_t *hmod = NULL;
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
REQUIRE(hmodp != NULL && *hmodp != NULL);
hmod = *hmodp;
*hmodp = NULL;
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_HOOKS, ISC_LOG_INFO,
"unloading module '%s'", hmod->modpath);
if (hmod->inst != NULL) {
hmod->destroy_func(&hmod->inst);
}
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
if (hmod->handle != NULL) {
FreeLibrary(hmod->handle);
}
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
if (hmod->modpath != NULL) {
isc_mem_free(hmod->mctx, hmod->modpath);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
}
isc_mem_putanddetach(&hmod->mctx, hmod, sizeof(*hmod));
}
#else /* HAVE_DLFCN_H || _WIN32 */
static isc_result_t
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
load_library(isc_mem_t *mctx, const char *modpath, ns_module_t **hmodp) {
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
UNUSED(mctx);
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
UNUSED(modpath);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
UNUSED(hmodp);
isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_HOOKS, ISC_LOG_ERROR,
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
"hook module support is not implemented");
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
return (ISC_R_NOTIMPLEMENTED);
}
static void
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
unload_library(ns_module_t **hmodp) {
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
UNUSED(hmodp);
}
#endif /* HAVE_DLFCN_H */
isc_result_t
eliminate ns_hookctx structure, pass mctx/lctx/view directly
2018-11-30 10:12:04 -08:00
ns_module_load(const char *modpath, const char *parameters, const void *cfg,
const char *cfg_file, unsigned long cfg_line, isc_mem_t *mctx,
isc_log_t *lctx, void *actx, dns_view_t *view)
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
{
isc_result_t result;
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
ns_module_t *hmod = NULL;
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
eliminate ns_hookctx structure, pass mctx/lctx/view directly
2018-11-30 10:12:04 -08:00
REQUIRE(mctx != NULL);
REQUIRE(lctx != NULL);
REQUIRE(view != NULL);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_HOOKS, ISC_LOG_INFO,
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
"loading module '%s'", modpath);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
eliminate ns_hookctx structure, pass mctx/lctx/view directly
2018-11-30 10:12:04 -08:00
CHECK(load_library(mctx, modpath, &hmod));
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
NS_LOGMODULE_HOOKS, ISC_LOG_INFO,
"registering module '%s'", modpath);
eliminate ns_hookctx structure, pass mctx/lctx/view directly
2018-11-30 10:12:04 -08:00
CHECK(hmod->register_func(parameters, cfg, cfg_file, cfg_line,
mctx, lctx, actx, view->hooktable,
&hmod->inst));
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
eliminate ns_hookctx structure, pass mctx/lctx/view directly
2018-11-30 10:12:04 -08:00
ISC_LIST_APPEND(*(ns_modlist_t *)view->modlist, hmod, link);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
cleanup:
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
if (result != ISC_R_SUCCESS && hmod != NULL) {
unload_library(&hmod);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
}
return (result);
}
initial implementation of filter-aaaa.so as a shared object - temporary kluge! in this version, for testing purposes, named always searches for a filter-aaaa module at /tmp/filter-aaaa.so. this enables the filter-aaaa system test to run even though the code to configure hooks in named.conf hasn't been written yet. - filter-aaaa-on-v4, filter-aaaa-on-v6 and the filter-aaaa ACL are still configured in the view as they were before, not in the hook.
2018-08-10 19:32:12 -07:00
isc_result_t
restore filter-aaaa syntax checking - added functionality to check hook parameters in named-checkconf, and restored the checkconf tests that were removed from the filter-aaaa test.
2018-11-02 23:28:25 -07:00
ns_module_check(const char *modpath, const char *parameters,
eliminate ns_hookctx structure, pass mctx/lctx/view directly
2018-11-30 10:12:04 -08:00
const void *cfg, const char *cfg_file, unsigned long cfg_line,
isc_mem_t *mctx, isc_log_t *lctx, void *actx)
restore filter-aaaa syntax checking - added functionality to check hook parameters in named-checkconf, and restored the checkconf tests that were removed from the filter-aaaa test.
2018-11-02 23:28:25 -07:00
{
isc_result_t result;
ns_module_t *hmod = NULL;
CHECK(load_library(mctx, modpath, &hmod));
eliminate ns_hookctx structure, pass mctx/lctx/view directly
2018-11-30 10:12:04 -08:00
result = hmod->check_func(parameters, cfg, cfg_file, cfg_line,
mctx, lctx, actx);
restore filter-aaaa syntax checking - added functionality to check hook parameters in named-checkconf, and restored the checkconf tests that were removed from the filter-aaaa test.
2018-11-02 23:28:25 -07:00
cleanup:
if (hmod != NULL) {
unload_library(&hmod);
}
return (result);
}
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
void
ns_hooktable_init(ns_hooktable_t *hooktable) {
int i;
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
for (i = 0; i < NS_HOOKPOINTS_COUNT; i++) {
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
ISC_LIST_INIT((*hooktable)[i]);
}
}
add hook statement to configuration parser - allow multiple "hook" statements at global or view level - add "optional bracketed text" type for optional parameter list - load hook module from specified path rather than hardcoded path - add a hooktable pointer (and a callback for freeing it) to the view structure - change the hooktable functions so they no longer update ns__hook_table by default, and modify PROCESS_HOOK so it uses the view hooktable, if set, rather than ns__hook_table. (ns__hook_table is retained for use by unit tests.) - update the filter-aaaa system test to load filter-aaaa.so - add a prereq script to check for dlopen support before running the filter-aaaa system test not yet done: - configuration parameters are not being passed to the filter-aaaa module; the filter-aaaa ACL and filter-aaaa-on-{v4,v6} settings are still stored in dns_view
2018-08-12 11:19:36 -07:00
isc_result_t
ns_hooktable_create(isc_mem_t *mctx, ns_hooktable_t **tablep) {
copy ns_hook objects before adding them to a hook table - 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.
2018-09-19 23:38:23 -07:00
ns_hooktable_t *hooktable = NULL;
add hook statement to configuration parser - allow multiple "hook" statements at global or view level - add "optional bracketed text" type for optional parameter list - load hook module from specified path rather than hardcoded path - add a hooktable pointer (and a callback for freeing it) to the view structure - change the hooktable functions so they no longer update ns__hook_table by default, and modify PROCESS_HOOK so it uses the view hooktable, if set, rather than ns__hook_table. (ns__hook_table is retained for use by unit tests.) - update the filter-aaaa system test to load filter-aaaa.so - add a prereq script to check for dlopen support before running the filter-aaaa system test not yet done: - configuration parameters are not being passed to the filter-aaaa module; the filter-aaaa ACL and filter-aaaa-on-{v4,v6} settings are still stored in dns_view
2018-08-12 11:19:36 -07:00
REQUIRE(tablep != NULL && *tablep == NULL);
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
hooktable = isc_mem_get(mctx, sizeof(*hooktable));
add hook statement to configuration parser - allow multiple "hook" statements at global or view level - add "optional bracketed text" type for optional parameter list - load hook module from specified path rather than hardcoded path - add a hooktable pointer (and a callback for freeing it) to the view structure - change the hooktable functions so they no longer update ns__hook_table by default, and modify PROCESS_HOOK so it uses the view hooktable, if set, rather than ns__hook_table. (ns__hook_table is retained for use by unit tests.) - update the filter-aaaa system test to load filter-aaaa.so - add a prereq script to check for dlopen support before running the filter-aaaa system test not yet done: - configuration parameters are not being passed to the filter-aaaa module; the filter-aaaa ACL and filter-aaaa-on-{v4,v6} settings are still stored in dns_view
2018-08-12 11:19:36 -07:00
ns_hooktable_init(hooktable);
*tablep = hooktable;
return (ISC_R_SUCCESS);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
}
void
add hook statement to configuration parser - allow multiple "hook" statements at global or view level - add "optional bracketed text" type for optional parameter list - load hook module from specified path rather than hardcoded path - add a hooktable pointer (and a callback for freeing it) to the view structure - change the hooktable functions so they no longer update ns__hook_table by default, and modify PROCESS_HOOK so it uses the view hooktable, if set, rather than ns__hook_table. (ns__hook_table is retained for use by unit tests.) - update the filter-aaaa system test to load filter-aaaa.so - add a prereq script to check for dlopen support before running the filter-aaaa system test not yet done: - configuration parameters are not being passed to the filter-aaaa module; the filter-aaaa ACL and filter-aaaa-on-{v4,v6} settings are still stored in dns_view
2018-08-12 11:19:36 -07:00
ns_hooktable_free(isc_mem_t *mctx, void **tablep) {
copy ns_hook objects before adding them to a hook table - 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.
2018-09-19 23:38:23 -07:00
ns_hooktable_t *table = NULL;
ns_hook_t *hook = NULL, *next = NULL;
int i = 0;
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
add hook statement to configuration parser - allow multiple "hook" statements at global or view level - add "optional bracketed text" type for optional parameter list - load hook module from specified path rather than hardcoded path - add a hooktable pointer (and a callback for freeing it) to the view structure - change the hooktable functions so they no longer update ns__hook_table by default, and modify PROCESS_HOOK so it uses the view hooktable, if set, rather than ns__hook_table. (ns__hook_table is retained for use by unit tests.) - update the filter-aaaa system test to load filter-aaaa.so - add a prereq script to check for dlopen support before running the filter-aaaa system test not yet done: - configuration parameters are not being passed to the filter-aaaa module; the filter-aaaa ACL and filter-aaaa-on-{v4,v6} settings are still stored in dns_view
2018-08-12 11:19:36 -07:00
REQUIRE(tablep != NULL && *tablep != NULL);
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
table = *tablep;
add hook statement to configuration parser - allow multiple "hook" statements at global or view level - add "optional bracketed text" type for optional parameter list - load hook module from specified path rather than hardcoded path - add a hooktable pointer (and a callback for freeing it) to the view structure - change the hooktable functions so they no longer update ns__hook_table by default, and modify PROCESS_HOOK so it uses the view hooktable, if set, rather than ns__hook_table. (ns__hook_table is retained for use by unit tests.) - update the filter-aaaa system test to load filter-aaaa.so - add a prereq script to check for dlopen support before running the filter-aaaa system test not yet done: - configuration parameters are not being passed to the filter-aaaa module; the filter-aaaa ACL and filter-aaaa-on-{v4,v6} settings are still stored in dns_view
2018-08-12 11:19:36 -07:00
*tablep = NULL;
copy ns_hook objects before adding them to a hook table - 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.
2018-09-19 23:38:23 -07:00
for (i = 0; i < NS_HOOKPOINTS_COUNT; i++) {
for (hook = ISC_LIST_HEAD((*table)[i]);
hook != NULL;
hook = next)
{
next = ISC_LIST_NEXT(hook, link);
ISC_LIST_UNLINK((*table)[i], hook, link);
if (hook->mctx != NULL) {
isc_mem_putanddetach(&hook->mctx,
hook, sizeof(*hook));
}
}
}
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
isc_mem_put(mctx, table, sizeof(*table));
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
}
void
copy ns_hook objects before adding them to a hook table - 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.
2018-09-19 23:38:23 -07:00
ns_hook_add(ns_hooktable_t *hooktable, isc_mem_t *mctx,
ns_hookpoint_t hookpoint, const ns_hook_t *hook)
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
{
copy ns_hook objects before adding them to a hook table - 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.
2018-09-19 23:38:23 -07:00
ns_hook_t *copy = NULL;
REQUIRE(hooktable != NULL);
REQUIRE(mctx != NULL);
clear AD flag when altering response messages - the AD flag was not being cleared correctly when filtering - enabled dnssec valdiation in the filter-aaaa test to confirm this works correctly now
2018-09-14 12:32:36 -07:00
REQUIRE(hookpoint < NS_HOOKPOINTS_COUNT);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
REQUIRE(hook != NULL);
copy ns_hook objects before adding them to a hook table - 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.
2018-09-19 23:38:23 -07:00
copy = isc_mem_get(mctx, sizeof(*copy));
memset(copy, 0, sizeof(*copy));
copy->action = hook->action;
copy->action_data = hook->action_data;
isc_mem_attach(mctx, &copy->mctx);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
copy ns_hook objects before adding them to a hook table - 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.
2018-09-19 23:38:23 -07:00
ISC_LINK_INIT(copy, link);
ISC_LIST_APPEND((*hooktable)[hookpoint], copy, link);
set up hooks.c to enable setting hook points and loading modules - 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
2018-08-03 14:16:41 -07:00
}
refactor to support multiple module instances - use a per-view module list instead of global hook_modules - create an 'instance' pointer when registering modules, store it in the module structure, and use it as action_data when calling hook functions - this enables multiple module instances to be set up in parallel - also some nomenclature changes and cleanup
2018-10-31 19:02:29 -07:00
void
ns_modlist_create(isc_mem_t *mctx, ns_modlist_t **listp) {
ns_modlist_t *modlist = NULL;
REQUIRE(listp != NULL && *listp == NULL);
modlist = isc_mem_get(mctx, sizeof(*modlist));
memset(modlist, 0, sizeof(*modlist));
ISC_LIST_INIT(*modlist);
*listp = modlist;
}
void
ns_modlist_free(isc_mem_t *mctx, void **listp) {
ns_modlist_t *list = NULL;
ns_module_t *hmod = NULL, *next = NULL;
REQUIRE(listp != NULL && *listp != NULL);
list = *listp;
*listp = NULL;
for (hmod = ISC_LIST_HEAD(*list);
hmod != NULL;
hmod = next)
{
next = ISC_LIST_NEXT(hmod, link);
ISC_LIST_UNLINK(*list, hmod, link);
unload_library(&hmod);
}
isc_mem_put(mctx, list, sizeof(*list));
}
Reference in New Issue Copy Permalink