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

Adjust the nstests for isc_nmhandle_{attach,detach} name change

Browse Source 
Due to the added attach/detach tracing in the netmgr-v2 code, the
libns tests needs to be adjusted as the real function names have
changed from isc_nmhandle_* to isc__nmhandle_*.
This commit is contained in:
Ondřej Surý
2020-12-02 12:34:35 +01:00
parent 9b2184893d
commit e8e8ed7fb9
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ns/tests/Makefile.in
View File

@@ -15,7 +15,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
WRAP_OPTIONS = -Wl,--wrap=isc_nmhandle_detach -Wl,--wrap=isc_nmhandle_attach
WRAP_OPTIONS = -Wl,--wrap=isc__nmhandle_detach -Wl,--wrap=isc__nmhandle_attach
CINCLUDES = -I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
${OPENSSL_CFLAGS} \

16
lib/ns/tests/nstest.c
View File

@@ -78,12 +78,12 @@ atomic_uint_fast32_t client_refs[32];
atomic_uintptr_t client_addrs[32];
void
__wrap_isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp);
__wrap_isc__nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp);
void
__wrap_isc_nmhandle_detach(isc_nmhandle_t **handlep);
__wrap_isc__nmhandle_detach(isc_nmhandle_t **handlep);
void
__wrap_isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
__wrap_isc__nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
ns_client_t *client = (ns_client_t *)source;
int i;
@@ -102,7 +102,7 @@ __wrap_isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
}
void
__wrap_isc_nmhandle_detach(isc_nmhandle_t **handlep) {
__wrap_isc__nmhandle_detach(isc_nmhandle_t **handlep) {
isc_nmhandle_t *handle = *handlep;
ns_client_t *client = (ns_client_t *)handle;
int i;
@@ -129,12 +129,12 @@ __wrap_isc_nmhandle_detach(isc_nmhandle_t **handlep) {
#ifdef USE_LIBTOOL
void
isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
__wrap_isc_nmhandle_attach(source, targetp);
isc__nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
__wrap_isc__nmhandle_attach(source, targetp);
}
void
isc_nmhandle_detach(isc_nmhandle_t **handle) {
__wrap_isc_nmhandle_detach(handle);
isc__nmhandle_detach(isc_nmhandle_t **handle) {
__wrap_isc__nmhandle_detach(handle);
}
#endif /* USE_LIBTOOL */