Compare commits
1 Commits
3797-part4
...
1068-make-
| Author | SHA1 | Date | |
|---|---|---|---|
|
dfadd7067b |
@@ -53,6 +53,7 @@
|
||||
|
||||
(expand-file-name "/usr/local/opt/openssl@1.1/include")
|
||||
(expand-file-name "/usr/local/opt/libxml2/include/libxml2")
|
||||
(expand-file-name "/usr/local/opt/json-c/include/json-c/")
|
||||
(expand-file-name "/usr/local/include")
|
||||
)
|
||||
)
|
||||
|
||||
@@ -16,15 +16,15 @@ VERSION=@BIND9_VERSION@
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = ${NS_INCLUDES} ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISCCFG_INCLUDES} \
|
||||
${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
${ISC_INCLUDES} @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES = -DNAMED_CONFFILE=\"${sysconfdir}/named.conf\"
|
||||
CWARNINGS =
|
||||
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
BIND9LIBS = ../../lib/bind9/libbind9.@A@
|
||||
NSLIBS = ../../lib/ns/libns.@A@
|
||||
|
||||
@@ -34,8 +34,8 @@ ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
||||
BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
|
||||
NSDEPENDLIBS = ../../lib/ns/libns.@A@
|
||||
|
||||
LIBS = ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
NOSYMLIBS = ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = ${ISCLIBS} @LIBS@
|
||||
NOSYMLIBS = ${ISCNOSYMLIBS} @LIBS@
|
||||
|
||||
SUBDIRS =
|
||||
|
||||
|
||||
@@ -20,15 +20,15 @@ VERSION=@BIND9_VERSION@
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
|
||||
${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} @JSON_C_CFLAGS@
|
||||
${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
ISCCCLIBS = ../../lib/isccc/libisccc.@A@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
BIND9LIBS = ../../lib/bind9/libbind9.@A@
|
||||
|
||||
@@ -41,9 +41,9 @@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
|
||||
RNDCLIBS = ${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@
|
||||
RNDCDEPLIBS = ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
|
||||
|
||||
LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
|
||||
|
||||
NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
|
||||
|
||||
CONFDEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} ${ISC_INCLUDES} \
|
||||
${IRS_INCLUDES} ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
${IRS_INCLUDES} ${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES = -DVERSION=\"${VERSION}\" \
|
||||
-DSYSCONFDIR=\"${sysconfdir}\"
|
||||
@@ -24,8 +24,8 @@ CWARNINGS =
|
||||
|
||||
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
IRSLIBS = ../../lib/irs/libirs.@A@
|
||||
|
||||
ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
@@ -35,8 +35,8 @@ IRSDEPLIBS = ../../lib/irs/libirs.@A@
|
||||
|
||||
DEPLIBS = ${DNSDEPLIBS} ${IRSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
|
||||
|
||||
LIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
|
||||
NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
|
||||
|
||||
SUBDIRS =
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ READLINE_LIB = @READLINE_LIB@
|
||||
|
||||
CINCLUDES = -I${srcdir}/include ${DNS_INCLUDES} \
|
||||
${BIND9_INCLUDES} ${ISC_INCLUDES} \
|
||||
${IRS_INCLUDES} ${ISCCFG_INCLUDES} @LIBIDN2_CFLAGS@ @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
${IRS_INCLUDES} ${ISCCFG_INCLUDES} @LIBIDN2_CFLAGS@ @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES = -DVERSION=\"${VERSION}\"
|
||||
CWARNINGS =
|
||||
@@ -27,8 +27,8 @@ CWARNINGS =
|
||||
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
BIND9LIBS = ../../lib/bind9/libbind9.@A@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
IRSLIBS = ../../lib/irs/libirs.@A@
|
||||
|
||||
ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
@@ -41,10 +41,10 @@ DEPLIBS = ${DNSDEPLIBS} ${IRSDEPLIBS} ${BIND9DEPLIBS} \
|
||||
${ISCDEPLIBS} ${ISCCFGDEPLIBS}
|
||||
|
||||
LIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
|
||||
${ISCLIBS} @LIBIDN2_LIBS@ @JSON_C_LIBS@ @LIBS@
|
||||
${ISCLIBS} @LIBIDN2_LIBS@ @LIBS@
|
||||
|
||||
NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} \
|
||||
${ISCNOSYMLIBS} @LIBIDN2_LIBS@ @JSON_C_LIBS@ @LIBS@
|
||||
${ISCNOSYMLIBS} @LIBIDN2_LIBS@ @LIBS@
|
||||
|
||||
SUBDIRS =
|
||||
|
||||
|
||||
@@ -15,23 +15,23 @@ VERSION=@BIND9_VERSION@
|
||||
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES = -DVERSION=\"${VERSION}\"
|
||||
CWARNINGS =
|
||||
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
DNSDEPLIBS = ../../lib/dns/libdns.@A@
|
||||
ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
||||
|
||||
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
|
||||
|
||||
LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
|
||||
|
||||
NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
NOSYMLIBS = ${DNSLIBS} ${ISCNOSYMLIBS} @LIBS@
|
||||
|
||||
# Alphabetically
|
||||
TARGETS = dnssec-cds@EXEEXT@ dnssec-dsfromkey@EXEEXT@ \
|
||||
|
||||
@@ -55,8 +55,8 @@ CWARNINGS =
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
ISCCCLIBS = ../../lib/isccc/libisccc.@A@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
BIND9LIBS = ../../lib/bind9/libbind9.@A@
|
||||
NSLIBS = ../../lib/ns/libns.@A@
|
||||
|
||||
@@ -73,12 +73,12 @@ DEPLIBS = ${NSDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
|
||||
LIBS = ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
|
||||
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCLIBS} \
|
||||
${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBCAP_LIBS@ \
|
||||
@JSON_C_LIBS@ @LIBS@
|
||||
@LIBS@
|
||||
|
||||
NOSYMLIBS = ${NSLIBS} ${DNSLIBS} ${BIND9LIBS} \
|
||||
${ISCCFGLIBS} ${ISCCCLIBS} ${ISCNOSYMLIBS} \
|
||||
${DLZDRIVER_LIBS} ${DBDRIVER_LIBS} @LIBCAP_LIBS@ \
|
||||
@JSON_C_LIBS@ @LIBS@
|
||||
@LIBS@
|
||||
|
||||
SUBDIRS = unix
|
||||
|
||||
|
||||
@@ -54,6 +54,9 @@
|
||||
#include <gperftools/profiler.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_JSON_C
|
||||
#include <json_c_version.h>
|
||||
#endif /* HAVE_JSON_C */
|
||||
|
||||
/*
|
||||
* Defining NAMED_MAIN provides storage declarations (rather than extern)
|
||||
|
||||
@@ -43,6 +43,11 @@
|
||||
#include <named/server.h>
|
||||
#include <named/statschannel.h>
|
||||
|
||||
#ifdef HAVE_JSON_C
|
||||
#include <json_object.h>
|
||||
#include <linkhash.h>
|
||||
#endif /* HAVE_JSON_C */
|
||||
|
||||
#include "bind9.xsl.h"
|
||||
|
||||
struct named_statschannel {
|
||||
|
||||
@@ -15,7 +15,7 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
CINCLUDES = -I${srcdir}/include -I${srcdir}/../include \
|
||||
${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} \
|
||||
${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
@@ -21,15 +21,15 @@ DST_GSSAPI_INC = @DST_GSSAPI_INC@
|
||||
|
||||
CINCLUDES = ${DNS_INCLUDES} ${BIND9_INCLUDES} ${ISC_INCLUDES} \
|
||||
${ISCCFG_INCLUDES} ${IRS_INCLUDES} ${DST_GSSAPI_INC} \
|
||||
@OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
@OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES = -DVERSION=\"${VERSION}\" @USE_GSSAPI@
|
||||
CWARNINGS =
|
||||
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
BIND9LIBS = ../../lib/bind9/libbind9.@A@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
IRSLIBS = ../../lib/irs/libirs.@A@
|
||||
|
||||
@@ -43,10 +43,10 @@ DEPLIBS = ${DNSDEPLIBS} ${IRSDEPLIBS} ${BIND9DEPLIBS} \
|
||||
${ISCDEPLIBS} ${ISCCFGDEPLIBS}
|
||||
|
||||
LIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} \
|
||||
${ISCCFGLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
${ISCCFGLIBS} ${ISCLIBS} @LIBS@
|
||||
|
||||
NOSYMLIBS = ${DNSLIBS} ${IRSLIBS} ${BIND9LIBS} \
|
||||
${ISCCFGLIBS} ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
|
||||
|
||||
SUBDIRS =
|
||||
|
||||
|
||||
@@ -13,18 +13,18 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = ${ISC_INCLUDES} @JSON_C_CFLAGS@
|
||||
CINCLUDES = ${ISC_INCLUDES}
|
||||
|
||||
CDEFINES =
|
||||
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
||||
|
||||
DEPLIBS = ${ISCDEPLIBS}
|
||||
|
||||
# if FORCE_STATIC_PROVIDER: LIBS += ${PROVIDER}
|
||||
LIBS = ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = ${ISCLIBS} @LIBS@
|
||||
|
||||
SUBDIRS = benchmarks
|
||||
|
||||
|
||||
@@ -15,11 +15,11 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include -I. \
|
||||
${NS_INCLUDES} ${DNS_INCLUDES} \
|
||||
${ISCCFG_INCLUDES} ${ISC_INCLUDES} @JSON_C_CFLAGS@
|
||||
${ISCCFG_INCLUDES} ${ISC_INCLUDES}
|
||||
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
NSLIBS = ../../lib/ns/libns.@A@
|
||||
|
||||
LIBS =
|
||||
|
||||
@@ -16,15 +16,15 @@ VERSION=@BIND9_VERSION@
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = -I${srcdir}/include ${ISC_INCLUDES} ${ISCCC_INCLUDES} \
|
||||
${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} @JSON_C_CFLAGS@
|
||||
${ISCCFG_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES}
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
ISCCCLIBS = ../../lib/isccc/libisccc.@A@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
BIND9LIBS = ../../lib/bind9/libbind9.@A@
|
||||
|
||||
@@ -34,8 +34,8 @@ ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
||||
DNSDEPLIBS = ../../lib/dns/libdns.@A@
|
||||
BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
|
||||
|
||||
LIBS = ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
NOSYMLIBS = ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = ${ISCLIBS} @LIBS@
|
||||
NOSYMLIBS = ${ISCNOSYMLIBS} @LIBS@
|
||||
|
||||
RNDCDEPLIBS = ${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${BIND9DEPLIBS} ${DNSDEPLIBS} ${ISCDEPLIBS}
|
||||
|
||||
|
||||
@@ -14,15 +14,15 @@ top_srcdir = @top_srcdir@
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
|
||||
@OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
@OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
BACKTRACECFLAGS = @BACKTRACECFLAGS@
|
||||
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
|
||||
DNSDEPLIBS = ../../lib/dns/libdns.@A@
|
||||
@@ -30,7 +30,7 @@ ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
||||
ISCDEPNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
|
||||
ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
|
||||
LIBS = @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = @LIBS@
|
||||
|
||||
SUBDIRS = system @PKCS11_TOOLS@
|
||||
TESTDIRS = system
|
||||
|
||||
@@ -14,7 +14,7 @@ top_srcdir = @top_srcdir@
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
|
||||
@OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ @JSON_C_CFLAGS@
|
||||
@OPENSSL_INCLUDES@ @DST_GSSAPI_INC@
|
||||
|
||||
CDEFINES = @USE_GSSAPI@
|
||||
|
||||
@@ -23,8 +23,8 @@ BACKTRACECFLAGS = @BACKTRACECFLAGS@
|
||||
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
|
||||
|
||||
DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCCFGLIBS = ../../../lib/isccfg/libisccfg.@A@
|
||||
|
||||
DNSDEPLIBS = ../../../lib/dns/libdns.@A@
|
||||
@@ -32,7 +32,7 @@ ISCDEPLIBS = ../../../lib/isc/libisc.@A@
|
||||
ISCDEPNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@
|
||||
ISCCFGDEPLIBS = ../../../lib/isccfg/libisccfg.@A@
|
||||
|
||||
LIBS = @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = @LIBS@
|
||||
|
||||
SUBDIRS =
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@
|
||||
CINCLUDES = ${ISC_INCLUDES}
|
||||
CDEFINES =
|
||||
|
||||
ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
LIBS = ${ISCLIBS} @LIBS@
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ top_srcdir = @top_srcdir@
|
||||
CINCLUDES = ${ISC_INCLUDES}
|
||||
CDEFINES =
|
||||
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
LIBS = ${ISCLIBS} @LIBS@
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ CDEFINES = @USE_GSSAPI@ @CONTRIB_DLZ@
|
||||
CWARNINGS =
|
||||
|
||||
DNSLIBS =
|
||||
ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
DNSDEPLIBS =
|
||||
ISCDEPLIBS =
|
||||
|
||||
@@ -112,7 +112,7 @@ PYTHON=@PYTHON@
|
||||
# Determine if we support various optional features.
|
||||
#
|
||||
HAVEXMLSTATS=@XMLSTATS@
|
||||
JSON_C_LIBS="@JSON_C_LIBS@"
|
||||
JSON_C_LIBS=""
|
||||
HAVEJSONSTATS=${JSON_C_LIBS:+1}
|
||||
ZLIB=@ZLIB@
|
||||
NZD=@NZD_TOOLS@
|
||||
|
||||
@@ -13,13 +13,13 @@ top_srcdir = @top_srcdir@
|
||||
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
DNSLIBS = ../../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCLIBS = ../../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
DNSDEPLIBS = ../../../../../lib/dns/libdns.@A@
|
||||
ISCDEPLIBS = ../../../../../lib/isc/libisc.@A@
|
||||
|
||||
@@ -15,20 +15,20 @@ VERSION=@BIND9_VERSION@
|
||||
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
DNSDEPLIBS = ../../../../lib/dns/libdns.@A@
|
||||
ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
|
||||
|
||||
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
|
||||
|
||||
LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
|
||||
|
||||
TARGETS = pipequeries@EXEEXT@
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ CINCLUDES = ${ISC_INCLUDES}
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
DNSDEPLIBS =
|
||||
ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
|
||||
|
||||
@@ -21,7 +21,7 @@ CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
DNSLIBS =
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
DNSDEPLIBS =
|
||||
ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
|
||||
|
||||
@@ -15,20 +15,20 @@ VERSION=@BIND9_VERSION@
|
||||
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
DNSDEPLIBS = ../../../../lib/dns/libdns.@A@
|
||||
ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
|
||||
|
||||
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
|
||||
|
||||
LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
|
||||
|
||||
TARGETS = bigkey@EXEEXT@
|
||||
|
||||
|
||||
@@ -15,20 +15,20 @@ VERSION=@BIND9_VERSION@
|
||||
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
DNSLIBS = ../../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
DNSDEPLIBS = ../../../../lib/dns/libdns.@A@
|
||||
ISCDEPLIBS = ../../../../lib/isc/libisc.@A@
|
||||
|
||||
DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS}
|
||||
|
||||
LIBS = ${DNSLIBS} ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@
|
||||
|
||||
TARGETS = keycreate@EXEEXT@ keydelete@EXEEXT@
|
||||
|
||||
|
||||
@@ -16,15 +16,15 @@ VERSION=@BIND9_VERSION@
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
|
||||
${BIND9_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
${BIND9_INCLUDES} @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES = -DVERSION=\"${VERSION}\"
|
||||
CWARNINGS =
|
||||
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
BIND9LIBS = ../../lib/bind9/libbind9.@A@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
|
||||
DNSDEPLIBS = ../../lib/dns/libdns.@A@
|
||||
@@ -32,8 +32,8 @@ BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
|
||||
ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
||||
ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
|
||||
LIBS = ${ISCLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
NOSYMLIBS = ${ISCNOSYMLIBS} @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = ${ISCLIBS} @LIBS@
|
||||
NOSYMLIBS = ${ISCNOSYMLIBS} @LIBS@
|
||||
|
||||
SUBDIRS =
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ CDEFINES = @CONTRIB_DLZ@
|
||||
CWARNINGS =
|
||||
|
||||
DLZLIBS = @DLZ_DRIVER_LIBS@
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
DEPLIBS = ${ISCDEPLIBS}
|
||||
|
||||
|
||||
Binary file not shown.
@@ -6,15 +6,15 @@ abs_srcdir = @abs_srcdir@
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = -I. -I.. ${DNS_INCLUDES} ${ISC_INCLUDES} \
|
||||
@OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
@OPENSSL_INCLUDES@
|
||||
CDEFINES = -DFUZZDIR=\"$(abs_srcdir)\"
|
||||
|
||||
ISCLIBS = ../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCDEPLIBS = ../lib/isc/libisc.@A@
|
||||
DNSLIBS = ../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
DNSDEPLIBS = ../lib/dns/libdns.@A@
|
||||
|
||||
LIBS = @JSON_C_LIBS@ @LIBS@
|
||||
LIBS = @LIBS@
|
||||
|
||||
OBJS = main.@O@
|
||||
SRCS = main.c dns_name_fromtext_target.c dns_rdata_fromwire_text.c
|
||||
|
||||
@@ -18,12 +18,12 @@ VERSION=@BIND9_VERSION@
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = -I. ${BIND9_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
|
||||
${ISCCFG_INCLUDES} ${NS_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
${ISCCFG_INCLUDES} ${NS_INCLUDES} @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
NSLIBS = ../../lib/ns/libns.@A@
|
||||
|
||||
@@ -27,13 +27,14 @@ VERSION=@BIND9_VERSION@
|
||||
USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
|
||||
|
||||
CINCLUDES = -I. -I${top_srcdir}/lib/dns -Iinclude ${DNS_INCLUDES} \
|
||||
${ISC_INCLUDES} @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ @JSON_C_CFLAGS@
|
||||
${ISC_INCLUDES} @OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ \
|
||||
@JSON_C_CFLAGS@
|
||||
|
||||
CDEFINES = @USE_GSSAPI@ ${USE_ISC_SPNEGO}
|
||||
|
||||
CWARNINGS =
|
||||
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
||||
|
||||
|
||||
@@ -40,6 +40,10 @@
|
||||
#include <dns/result.h>
|
||||
#include <dns/stats.h>
|
||||
|
||||
#ifdef HAVE_JSON_C
|
||||
#include <json_object.h>
|
||||
#endif
|
||||
|
||||
#include "rbtdb.h"
|
||||
|
||||
#define CACHE_MAGIC ISC_MAGIC('$', '$', '$', '$')
|
||||
@@ -1401,11 +1405,12 @@ error:
|
||||
} while(0)
|
||||
|
||||
isc_result_t
|
||||
dns_cache_renderjson(dns_cache_t *cache, json_object *cstats) {
|
||||
dns_cache_renderjson(dns_cache_t *cache, isc_json_object_t *cstats0) {
|
||||
isc_result_t result = ISC_R_SUCCESS;
|
||||
int indices[dns_cachestatscounter_max];
|
||||
uint64_t values[dns_cachestatscounter_max];
|
||||
json_object *obj;
|
||||
json_object *cstats = (json_object *)cstats0;
|
||||
|
||||
REQUIRE(VALID_CACHE(cache));
|
||||
|
||||
|
||||
@@ -329,7 +329,7 @@ dns_cache_renderxml(dns_cache_t *cache, xmlTextWriterPtr writer);
|
||||
|
||||
#ifdef HAVE_JSON_C
|
||||
isc_result_t
|
||||
dns_cache_renderjson(dns_cache_t *cache, json_object *cstats);
|
||||
dns_cache_renderjson(dns_cache_t *cache, isc_json_object_t *cstats0);
|
||||
/*
|
||||
* Render cache statistics and status in JSON
|
||||
*/
|
||||
|
||||
@@ -16,15 +16,15 @@ VERSION=@BIND9_VERSION@
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
|
||||
@OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
|
||||
@OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
|
||||
CDEFINES = -DTESTS="\"${top_builddir}/lib/dns/tests/\""
|
||||
|
||||
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCDEPLIBS = ../../isc/libisc.@A@
|
||||
DNSLIBS = ../libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
DNSDEPLIBS = ../libdns.@A@
|
||||
|
||||
LIBS = @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
|
||||
LIBS = @LIBS@ @CMOCKA_LIBS@
|
||||
|
||||
OBJS = dnstest.@O@
|
||||
SRCS = acl_test.c \
|
||||
|
||||
@@ -19,7 +19,7 @@ VERSION=@BIND9_VERSION@
|
||||
|
||||
CINCLUDES = -I. -I./include -I${srcdir}/include \
|
||||
${DNS_INCLUDES} ${ISC_INCLUDES} \
|
||||
${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
${ISCCFG_INCLUDES} @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
@@ -15,19 +15,19 @@ VERSION=@BIND9_VERSION@
|
||||
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = -I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES} @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
|
||||
CINCLUDES = -I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES} @CMOCKA_CFLAGS@
|
||||
CDEFINES = -DTESTS="\"${top_builddir}/lib/irs/tests/\""
|
||||
|
||||
CFGLIBS = ../../isccfg/libisccfg.@A@
|
||||
CFGDEPLIBS = ../../isccfg/libisccfg.@A@
|
||||
DNSLIBS = ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
DNSDEPLIBS = ../../dns/libdns.@A@
|
||||
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCDEPLIBS = ../../isc/libisc.@A@
|
||||
IRSLIBS = ../libirs.@A@
|
||||
IRSDEPLIBS = ../libirs.@A@
|
||||
|
||||
LIBS = ${IRSLIBS} ${CFGLIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
|
||||
LIBS = ${IRSLIBS} ${CFGLIBS} ${DNSLIBS} ${ISCLIBS} @LIBS@ @CMOCKA_LIBS@
|
||||
|
||||
OBJS =
|
||||
SRCS = resconf_test.c
|
||||
|
||||
@@ -20,7 +20,9 @@ VERSION=@BIND9_VERSION@
|
||||
CINCLUDES = -I${srcdir}/unix/include \
|
||||
-I${srcdir}/pthreads/include \
|
||||
-I./include \
|
||||
-I${srcdir}/include ${DNS_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
-I${srcdir}/include ${DNS_INCLUDES} @OPENSSL_INCLUDES@ \
|
||||
@JSON_C_CFLAGS@
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
|
||||
@@ -9,27 +9,6 @@
|
||||
* information regarding copyright ownership.
|
||||
*/
|
||||
|
||||
#ifndef ISC_JSON_H
|
||||
#define ISC_JSON_H 1
|
||||
#pragma once
|
||||
|
||||
#ifdef HAVE_JSON_C
|
||||
/*
|
||||
* This file is here mostly to make it easy to add additional json-c header
|
||||
* files as needed across all the users of this file. Rather than place
|
||||
* these json-c includes in each file, one include makes it easy to handle
|
||||
* the ifdef as well as adding the ability to add additional functions
|
||||
* which may be useful.
|
||||
*/
|
||||
#include <json_c_version.h>
|
||||
#include <json_object.h>
|
||||
#include <json_object_iterator.h>
|
||||
#include <json_tokener.h>
|
||||
#include <json_util.h>
|
||||
#include <linkhash.h>
|
||||
#endif
|
||||
|
||||
#define ISC_JSON_RENDERCONFIG 0x00000001 /* render config data */
|
||||
#define ISC_JSON_RENDERSTATS 0x00000002 /* render stats */
|
||||
#define ISC_JSON_RENDERALL 0x000000ff /* render everything */
|
||||
|
||||
#endif /* ISC_JSON_H */
|
||||
typedef void isc_json_object_t;
|
||||
|
||||
@@ -475,7 +475,7 @@ isc_mem_renderxml(xmlTextWriterPtr writer);
|
||||
|
||||
#ifdef HAVE_JSON_C
|
||||
isc_result_t
|
||||
isc_mem_renderjson(json_object *memobj);
|
||||
isc_mem_renderjson(isc_json_object_t *memobj0);
|
||||
/*%<
|
||||
* Render all contexts' statistics and status in JSON.
|
||||
*/
|
||||
|
||||
@@ -1025,7 +1025,7 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr, xmlTextWriterPtr writer);
|
||||
|
||||
#ifdef HAVE_JSON_C
|
||||
isc_result_t
|
||||
isc_socketmgr_renderjson(isc_socketmgr_t *mgr, json_object *stats);
|
||||
isc_socketmgr_renderjson(isc_socketmgr_t *mgr, isc_json_object_t *stats);
|
||||
/*%<
|
||||
* Render internal statistics and other state into JSON format.
|
||||
*/
|
||||
|
||||
@@ -768,7 +768,7 @@ isc_taskmgr_renderxml(isc_taskmgr_t *mgr, xmlTextWriterPtr writer);
|
||||
|
||||
#ifdef HAVE_JSON_C
|
||||
isc_result_t
|
||||
isc_taskmgr_renderjson(isc_taskmgr_t *mgr, json_object *tasksobj);
|
||||
isc_taskmgr_renderjson(isc_taskmgr_t *mgr, isc_json_object_t *tasksobj);
|
||||
#endif /* HAVE_JSON_C */
|
||||
|
||||
ISC_LANG_ENDDECLS
|
||||
|
||||
@@ -33,6 +33,10 @@
|
||||
#include <isc/util.h>
|
||||
#include <isc/xml.h>
|
||||
|
||||
#ifdef HAVE_JSON_C
|
||||
#include <json_object.h>
|
||||
#endif /* HAVE_JSON_C */
|
||||
|
||||
#include "mem_p.h"
|
||||
|
||||
#define MCTXLOCK(m, l) if (((m)->flags & ISC_MEMFLAG_NOLOCK) == 0) LOCK(l)
|
||||
@@ -2312,12 +2316,13 @@ json_renderctx(isc__mem_t *ctx, summarystat_t *summary, json_object *array) {
|
||||
}
|
||||
|
||||
isc_result_t
|
||||
isc_mem_renderjson(json_object *memobj) {
|
||||
isc_mem_renderjson(isc_json_object_t *memobj0) {
|
||||
isc_result_t result = ISC_R_SUCCESS;
|
||||
isc__mem_t *ctx;
|
||||
summarystat_t summary;
|
||||
uint64_t lost;
|
||||
json_object *ctxarray, *obj;
|
||||
json_object *memobj = (json_object *)memobj0;
|
||||
|
||||
memset(&summary, 0, sizeof(summary));
|
||||
RUNTIME_CHECK(isc_once_do(&once, initialize_action) == ISC_R_SUCCESS);
|
||||
|
||||
@@ -36,6 +36,10 @@
|
||||
#include <isc/util.h>
|
||||
#include <isc/xml.h>
|
||||
|
||||
#ifdef HAVE_JSON_C
|
||||
#include <json_object.h>
|
||||
#endif /* HAVE_JSON_C */
|
||||
|
||||
#ifdef OPENSSL_LEAKS
|
||||
#include <openssl/err.h>
|
||||
#endif
|
||||
@@ -1772,11 +1776,12 @@ isc_taskmgr_renderxml(isc_taskmgr_t *mgr0, xmlTextWriterPtr writer) {
|
||||
} while(0)
|
||||
|
||||
isc_result_t
|
||||
isc_taskmgr_renderjson(isc_taskmgr_t *mgr0, json_object *tasks) {
|
||||
isc_taskmgr_renderjson(isc_taskmgr_t *mgr0, isc_json_object_t *tasks0) {
|
||||
isc_result_t result = ISC_R_SUCCESS;
|
||||
isc__taskmgr_t *mgr = (isc__taskmgr_t *)mgr0;
|
||||
isc__task_t *task = NULL;
|
||||
json_object *obj = NULL, *array = NULL, *taskobj = NULL;
|
||||
json_object *tasks = (json_object *)tasks0;
|
||||
|
||||
LOCK(&mgr->lock);
|
||||
|
||||
|
||||
@@ -15,13 +15,13 @@ VERSION=@BIND9_VERSION@
|
||||
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = -I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
|
||||
CINCLUDES = -I. -Iinclude ${ISC_INCLUDES} @OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
|
||||
CDEFINES = -DTESTS="\"${top_builddir}/lib/isc/tests/\""
|
||||
|
||||
ISCLIBS = ../libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCDEPLIBS = ../libisc.@A@
|
||||
|
||||
LIBS = @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
|
||||
LIBS = @LIBS@ @CMOCKA_LIBS@
|
||||
|
||||
OBJS = isctest.@O@
|
||||
|
||||
|
||||
@@ -15,7 +15,8 @@ CINCLUDES = -I${srcdir}/include \
|
||||
-I${srcdir}/../pthreads/include \
|
||||
-I../include \
|
||||
-I${srcdir}/../include \
|
||||
-I${srcdir}/.. @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
-I${srcdir}/.. @OPENSSL_INCLUDES@ \
|
||||
@JSON_C_CFLAGS@
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
@@ -87,6 +87,10 @@
|
||||
#include <netinet/tcp.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_JSON_C
|
||||
#include <json_object.h>
|
||||
#endif /* HAVE_JSON_C */
|
||||
|
||||
/*%
|
||||
* Choose the most preferable multiplex method.
|
||||
*/
|
||||
@@ -5511,7 +5515,7 @@ isc_socketmgr_renderxml(isc_socketmgr_t *mgr0, xmlTextWriterPtr writer) {
|
||||
} while(0)
|
||||
|
||||
isc_result_t
|
||||
isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, json_object *stats) {
|
||||
isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, isc_json_object_t *stats0) {
|
||||
isc_result_t result = ISC_R_SUCCESS;
|
||||
isc__socketmgr_t *mgr = (isc__socketmgr_t *)mgr0;
|
||||
isc__socket_t *sock = NULL;
|
||||
@@ -5519,6 +5523,7 @@ isc_socketmgr_renderjson(isc_socketmgr_t *mgr0, json_object *stats) {
|
||||
isc_sockaddr_t addr;
|
||||
socklen_t len;
|
||||
json_object *obj, *array = json_object_new_array();
|
||||
json_object *stats = (json_object *)stats0;
|
||||
|
||||
CHECKMEM(array);
|
||||
|
||||
|
||||
@@ -18,12 +18,12 @@ VERSION=@BIND9_VERSION@
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} \
|
||||
${ISCCC_INCLUDES} @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
${ISCCC_INCLUDES} @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCCCLIBS = ../../lib/isccc/libisccc.@A@
|
||||
|
||||
ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
||||
|
||||
@@ -19,10 +19,10 @@ VERSION=@BIND9_VERSION@
|
||||
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = -I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES} @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
|
||||
CINCLUDES = -I. -Iinclude ${ISCCC_INCLUDES} ${ISC_INCLUDES} @CMOCKA_CFLAGS@
|
||||
CDEFINES =
|
||||
|
||||
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCDEPLIBS = ../../isc/libisc.@A@
|
||||
ISCCCLIBS = ../libisccc.@A@
|
||||
ISCCCDEPLIBS = ../libisccc.@A@
|
||||
|
||||
@@ -17,12 +17,12 @@ VERSION=@BIND9_VERSION@
|
||||
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} @JSON_C_CFLAGS@
|
||||
CINCLUDES = -I. ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES}
|
||||
|
||||
CDEFINES =
|
||||
CWARNINGS =
|
||||
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCCFGLIBS = ../../lib/cfg/libisccfg.@A@
|
||||
|
||||
|
||||
@@ -17,17 +17,17 @@ VERSION=@BIND9_VERSION@
|
||||
|
||||
CINCLUDES = -I. -Iinclude \
|
||||
${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
|
||||
@OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
|
||||
@OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
|
||||
CDEFINES = -DTESTS="\"${top_builddir}/lib/dns/tests/\""
|
||||
|
||||
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCDEPLIBS = ../../isc/libisc.@A@
|
||||
DNSLIBS = ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
DNSDEPLIBS = ../../dns/libdns.@A@
|
||||
ISCCFGLIBS = ../libisccfg.@A@
|
||||
ISCCFGDEPLIBS = ../libisccfg.@A@
|
||||
|
||||
LIBS = @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
|
||||
LIBS = @LIBS@ @CMOCKA_LIBS@
|
||||
|
||||
OBJS =
|
||||
SRCS = parser_test.c
|
||||
|
||||
@@ -26,13 +26,13 @@ USE_ISC_SPNEGO = @USE_ISC_SPNEGO@
|
||||
|
||||
CINCLUDES = -I. -I${top_srcdir}/lib/ns -Iinclude \
|
||||
${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
|
||||
@OPENSSL_INCLUDES@ @DST_GSSAPI_INC@ @JSON_C_CFLAGS@
|
||||
@OPENSSL_INCLUDES@ @DST_GSSAPI_INC@
|
||||
|
||||
CDEFINES = -DNAMED_PLUGINDIR=\"${plugindir}\"
|
||||
|
||||
CWARNINGS =
|
||||
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../lib/isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
|
||||
ISCDEPLIBS = ../../lib/isc/libisc.@A@
|
||||
|
||||
|
||||
@@ -16,17 +16,17 @@ VERSION=@BIND9_VERSION@
|
||||
@BIND9_MAKE_INCLUDES@
|
||||
|
||||
CINCLUDES = -I. -Iinclude ${NS_INCLUDES} ${DNS_INCLUDES} ${ISC_INCLUDES} \
|
||||
@OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@ @JSON_C_CFLAGS@
|
||||
@OPENSSL_INCLUDES@ @CMOCKA_CFLAGS@
|
||||
CDEFINES = -DTESTS="\"${top_builddir}/lib/ns/tests/\"" -DNAMED_PLUGINDIR=\"${plugindir}\"
|
||||
|
||||
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../../isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
ISCDEPLIBS = ../../isc/libisc.@A@
|
||||
DNSLIBS = ../../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
DNSDEPLIBS = ../../dns/libdns.@A@
|
||||
NSLIBS = ../libns.@A@
|
||||
NSDEPLIBS = ../libns.@A@
|
||||
|
||||
LIBS = @LIBS@ @CMOCKA_LIBS@ @JSON_C_LIBS@
|
||||
LIBS = @LIBS@ @CMOCKA_LIBS@
|
||||
|
||||
|
||||
OBJS = nstest.@O@
|
||||
|
||||
@@ -18,13 +18,13 @@ VERSION=@BIND9_VERSION@
|
||||
CINCLUDES = -I${srcdir}/include -I../dns/include \
|
||||
${DNS_INCLUDES} ${ISC_INCLUDES} \
|
||||
-I${top_srcdir}/lib/irs/include \
|
||||
-I../../lib/irs/include @OPENSSL_INCLUDES@ @JSON_C_CFLAGS@
|
||||
-I../../lib/irs/include @OPENSSL_INCLUDES@
|
||||
|
||||
CDEFINES = -DVERSION=\"${VERSION}\" \
|
||||
-DSYSCONFDIR=\"${sysconfdir}\"
|
||||
CWARNINGS =
|
||||
|
||||
ISCLIBS = ../isc/libisc.@A@ @OPENSSL_LIBS@
|
||||
ISCLIBS = ../isc/libisc.@A@ @OPENSSL_LIBS@ @JSON_C_LIBS@
|
||||
DNSLIBS = ../dns/libdns.@A@ @DNS_CRYPTO_LIBS@
|
||||
ISCCFGLIBS = ../isccfg/libisccfg.@A@
|
||||
IRSLIBS = ../irs/libirs.@A@
|
||||
@@ -36,7 +36,7 @@ IRSDEPLIBS = ../irs/libirs.@A@
|
||||
|
||||
DEPLIBS = ${DNSDEPLIBS} ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
|
||||
|
||||
LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ @JSON_C_LIBS@
|
||||
LIBS = ${DNSLIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
|
||||
|
||||
SUBDIRS =
|
||||
|
||||
|
||||
Reference in New Issue
Block a user