mirror of
https://github.com/NLnetLabs/unbound.git
synced 2024-09-21 06:37:08 +00:00
- Makefile changed for BSD make compatibility.
git-svn-id: file:///svn/unbound/trunk@2544 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
parent
cf1d2135e1
commit
a1c76554a2
1223
Makefile.in
1223
Makefile.in
File diff suppressed because it is too large
Load Diff
@ -2,7 +2,8 @@
|
|||||||
# Copyright 2009, Wouter Wijngaards, NLnet Labs.
|
# Copyright 2009, Wouter Wijngaards, NLnet Labs.
|
||||||
# BSD licensed.
|
# BSD licensed.
|
||||||
#
|
#
|
||||||
# Version 15
|
# Version 16
|
||||||
|
# 2011-11-10 Fix FLTO test to not drop a.out in current directory.
|
||||||
# 2011-11-01 Fix FLTO test for llvm on Lion.
|
# 2011-11-01 Fix FLTO test for llvm on Lion.
|
||||||
# 2011-08-01 Fix nonblock test (broken at v13).
|
# 2011-08-01 Fix nonblock test (broken at v13).
|
||||||
# 2011-08-01 Fix autoconf 2.68 warnings
|
# 2011-08-01 Fix autoconf 2.68 warnings
|
||||||
@ -396,12 +397,13 @@ AC_DEFUN([ACX_CHECK_FLTO],
|
|||||||
BAKCFLAGS="$CFLAGS"
|
BAKCFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS -flto"
|
CFLAGS="$CFLAGS -flto"
|
||||||
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [
|
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [
|
||||||
if $CC $CFLAGS conftest.c 2>&1 | grep "warning: no debug symbols in executable" >/dev/null; then
|
if $CC $CFLAGS -o conftest conftest.c 2>&1 | grep "warning: no debug symbols in executable" >/dev/null; then
|
||||||
CFLAGS="$BAKCFLAGS"
|
CFLAGS="$BAKCFLAGS"
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
fi
|
fi
|
||||||
|
rm -f conftest conftest.c conftest.o
|
||||||
], [CFLAGS="$BAKCFLAGS" ; AC_MSG_RESULT(no)])
|
], [CFLAGS="$BAKCFLAGS" ; AC_MSG_RESULT(no)])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
68
configure.ac
68
configure.ac
@ -444,6 +444,12 @@ if test x_$ub_test_python != x_no; then
|
|||||||
AC_DEFINE(WITH_PYTHONMODULE, 1, [Define if you want Python module.])
|
AC_DEFINE(WITH_PYTHONMODULE, 1, [Define if you want Python module.])
|
||||||
WITH_PYTHONMODULE=yes
|
WITH_PYTHONMODULE=yes
|
||||||
AC_SUBST(WITH_PYTHONMODULE)
|
AC_SUBST(WITH_PYTHONMODULE)
|
||||||
|
PYTHONMOD_OBJ="pythonmod.lo pythonmod_utils.lo"
|
||||||
|
AC_SUBST(PYTHONMOD_OBJ)
|
||||||
|
PYTHONMOD_INSTALL=pythonmod-install
|
||||||
|
AC_SUBST(PYTHONMOD_INSTALL)
|
||||||
|
PYTHONMOD_UNINSTALL=pythonmod-uninstall
|
||||||
|
AC_SUBST(PYTHONMOD_UNINSTALL)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Declare PyUnbound
|
# Declare PyUnbound
|
||||||
@ -451,6 +457,14 @@ if test x_$ub_test_python != x_no; then
|
|||||||
AC_DEFINE(WITH_PYUNBOUND, 1, [Define if you want PyUnbound.])
|
AC_DEFINE(WITH_PYUNBOUND, 1, [Define if you want PyUnbound.])
|
||||||
WITH_PYUNBOUND=yes
|
WITH_PYUNBOUND=yes
|
||||||
AC_SUBST(WITH_PYUNBOUND)
|
AC_SUBST(WITH_PYUNBOUND)
|
||||||
|
PYUNBOUND_OBJ="libunbound_wrap.lo"
|
||||||
|
AC_SUBST(PYUNBOUND_OBJ)
|
||||||
|
PYUNBOUND_TARGET="_unbound.la"
|
||||||
|
AC_SUBST(PYUNBOUND_TARGET)
|
||||||
|
PYUNBOUND_INSTALL=pyunbound-install
|
||||||
|
AC_SUBST(PYUNBOUND_INSTALL)
|
||||||
|
PYUNBOUND_UNINSTALL=pyunbound-uninstall
|
||||||
|
AC_SUBST(PYUNBOUND_UNINSTALL)
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
@ -460,6 +474,13 @@ if test x_$ub_test_python != x_no; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if test "`uname`" = "NetBSD"; then
|
||||||
|
NETBSD_LINTFLAGS='"-D__RENAME(x)=" -D_NETINET_IN_H_'
|
||||||
|
AC_SUBST(NETBSD_LINTFLAGS)
|
||||||
|
fi
|
||||||
|
CONFIG_DATE=`date +%Y%m%d`
|
||||||
|
AC_SUBST(CONFIG_DATE)
|
||||||
|
|
||||||
# Checks for libraries.
|
# Checks for libraries.
|
||||||
ACX_WITH_SSL
|
ACX_WITH_SSL
|
||||||
ACX_LIB_SSL
|
ACX_LIB_SSL
|
||||||
@ -771,6 +792,22 @@ if test "$USE_WINSOCK" = 1; then
|
|||||||
])
|
])
|
||||||
AC_CHECK_TOOL(WINDRES, windres)
|
AC_CHECK_TOOL(WINDRES, windres)
|
||||||
LIBS="$LIBS -liphlpapi"
|
LIBS="$LIBS -liphlpapi"
|
||||||
|
WINAPPS="unbound-service-install.exe unbound-service-remove.exe anchor-update.exe"
|
||||||
|
AC_SUBST(WINAPPS)
|
||||||
|
WIN_DAEMON_SRC="winrc/win_svc.c winrc/w_inst.c"
|
||||||
|
AC_SUBST(WIN_DAEMON_SRC)
|
||||||
|
WIN_DAEMON_OBJ="win_svc.lo w_inst.lo"
|
||||||
|
AC_SUBST(WIN_DAEMON_OBJ)
|
||||||
|
WIN_DAEMON_OBJ_LINK="rsrc_unbound.o"
|
||||||
|
AC_SUBST(WIN_DAEMON_OBJ_LINK)
|
||||||
|
WIN_HOST_OBJ_LINK="rsrc_unbound_host.o"
|
||||||
|
AC_SUBST(WIN_HOST_OBJ_LINK)
|
||||||
|
WIN_UBANCHOR_OBJ_LINK="rsrc_unbound_anchor.o log.lo locks.lo"
|
||||||
|
AC_SUBST(WIN_UBANCHOR_OBJ_LINK)
|
||||||
|
WIN_CONTROL_OBJ_LINK="rsrc_unbound_control.o"
|
||||||
|
AC_SUBST(WIN_CONTROL_OBJ_LINK)
|
||||||
|
WIN_CHECKCONF_OBJ_LINK="rsrc_unbound_checkconf.o"
|
||||||
|
AC_SUBST(WIN_CHECKCONF_OBJ_LINK)
|
||||||
fi
|
fi
|
||||||
if test $ac_cv_func_getaddrinfo = no; then
|
if test $ac_cv_func_getaddrinfo = no; then
|
||||||
AC_LIBOBJ([fake-rfc2553])
|
AC_LIBOBJ([fake-rfc2553])
|
||||||
@ -802,19 +839,44 @@ AC_REPLACE_FUNCS(snprintf)
|
|||||||
AC_REPLACE_FUNCS(strlcpy)
|
AC_REPLACE_FUNCS(strlcpy)
|
||||||
AC_REPLACE_FUNCS(memmove)
|
AC_REPLACE_FUNCS(memmove)
|
||||||
AC_REPLACE_FUNCS(gmtime_r)
|
AC_REPLACE_FUNCS(gmtime_r)
|
||||||
|
LIBOBJ_WITHOUT_CTIME="$LIBOBJS"
|
||||||
|
AC_SUBST(LIBOBJ_WITHOUT_CTIME)
|
||||||
AC_REPLACE_FUNCS(ctime_r)
|
AC_REPLACE_FUNCS(ctime_r)
|
||||||
|
|
||||||
AC_ARG_ENABLE(allsymbols, AC_HELP_STRING([--enable-allsymbols], [export all symbols from libunbound and link binaries to it, smaller install size but libunbound export table is polluted by internal symbols]))
|
AC_ARG_ENABLE(allsymbols, AC_HELP_STRING([--enable-allsymbols], [export all symbols from libunbound and link binaries to it, smaller install size but libunbound export table is polluted by internal symbols]))
|
||||||
case "$enable_allsymbols" in
|
case "$enable_allsymbols" in
|
||||||
no)
|
|
||||||
EXPORT_ALL_SYMBOLS=no
|
|
||||||
;;
|
|
||||||
yes)
|
yes)
|
||||||
EXPORT_ALL_SYMBOLS=yes
|
EXPORT_ALL_SYMBOLS=yes
|
||||||
|
COMMON_OBJ_ALL_SYMBOLS=""
|
||||||
|
UBSYMS=""
|
||||||
|
EXTRALINK="-L. -L.libs -lunbound"
|
||||||
AC_DEFINE(EXPORT_ALL_SYMBOLS, 1, [Define this if you enabled-allsymbols from libunbound to link binaries to it for smaller install size, but the libunbound export table is polluted by internal symbols])
|
AC_DEFINE(EXPORT_ALL_SYMBOLS, 1, [Define this if you enabled-allsymbols from libunbound to link binaries to it for smaller install size, but the libunbound export table is polluted by internal symbols])
|
||||||
;;
|
;;
|
||||||
|
no|*)
|
||||||
|
EXPORT_ALL_SYMBOLS=no
|
||||||
|
COMMON_OBJ_ALL_SYMBOLS='$(COMMON_OBJ)'
|
||||||
|
UBSYMS='-export-symbols $(srcdir)/libunbound/ubsyms.def'
|
||||||
|
EXTRALINK=""
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
AC_SUBST(EXPORT_ALL_SYMBOLS)
|
AC_SUBST(EXPORT_ALL_SYMBOLS)
|
||||||
|
AC_SUBST(COMMON_OBJ_ALL_SYMBOLS)
|
||||||
|
AC_SUBST(EXTRALINK)
|
||||||
|
AC_SUBST(UBSYMS)
|
||||||
|
if test x_$enable_lock_checks = x_yes; then
|
||||||
|
UBSYMS="-export-symbols clubsyms.def"
|
||||||
|
cp ${srcdir}/libunbound/ubsyms.def clubsyms.def
|
||||||
|
echo lock_protect >> clubsyms.def
|
||||||
|
echo lock_unprotect >> clubsyms.def
|
||||||
|
echo lock_get_mem >> clubsyms.def
|
||||||
|
echo checklock_start >> clubsyms.def
|
||||||
|
echo checklock_stop >> clubsyms.def
|
||||||
|
echo checklock_lock >> clubsyms.def
|
||||||
|
echo checklock_unlock >> clubsyms.def
|
||||||
|
echo checklock_init >> clubsyms.def
|
||||||
|
echo checklock_thrcreate >> clubsyms.def
|
||||||
|
echo checklock_thrjoin >> clubsyms.def
|
||||||
|
fi
|
||||||
|
|
||||||
# check this after all other compilation checks, since the linking of the lib
|
# check this after all other compilation checks, since the linking of the lib
|
||||||
# may break checks after this.
|
# may break checks after this.
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
* to text format.
|
* to text format.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "daemon/cachedump.h"
|
#include "daemon/cachedump.h"
|
||||||
#include "daemon/remote.h"
|
#include "daemon/remote.h"
|
||||||
#include "daemon/worker.h"
|
#include "daemon/worker.h"
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
#ifdef HAVE_OPENSSL_ENGINE_H
|
#ifdef HAVE_OPENSSL_ENGINE_H
|
||||||
#include <openssl/engine.h>
|
#include <openssl/engine.h>
|
||||||
#endif
|
#endif
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "daemon/daemon.h"
|
#include "daemon/daemon.h"
|
||||||
#include "daemon/worker.h"
|
#include "daemon/worker.h"
|
||||||
#include "daemon/remote.h"
|
#include "daemon/remote.h"
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
#endif
|
#endif
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "daemon/remote.h"
|
#include "daemon/remote.h"
|
||||||
#include "daemon/worker.h"
|
#include "daemon/worker.h"
|
||||||
#include "daemon/daemon.h"
|
#include "daemon/daemon.h"
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
* numbers. These 'statistics' may be of interest to the operator.
|
* numbers. These 'statistics' may be of interest to the operator.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/wire2host.h"
|
#include <ldns/wire2host.h>
|
||||||
#include "daemon/stats.h"
|
#include "daemon/stats.h"
|
||||||
#include "daemon/worker.h"
|
#include "daemon/worker.h"
|
||||||
#include "daemon/daemon.h"
|
#include "daemon/daemon.h"
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#ifndef DAEMON_STATS_H
|
#ifndef DAEMON_STATS_H
|
||||||
#define DAEMON_STATS_H
|
#define DAEMON_STATS_H
|
||||||
#include "util/timehist.h"
|
#include "util/timehist.h"
|
||||||
#include "ldns/buffer.h"
|
#include <ldns/buffer.h>
|
||||||
struct worker;
|
struct worker;
|
||||||
struct config_file;
|
struct config_file;
|
||||||
struct comm_point;
|
struct comm_point;
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
* pending requests.
|
* pending requests.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/wire2host.h"
|
#include <ldns/wire2host.h>
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "util/net_help.h"
|
#include "util/net_help.h"
|
||||||
#include "util/random.h"
|
#include "util/random.h"
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
10 November 2011: Wouter
|
||||||
|
- Makefile changed for BSD make compatibility.
|
||||||
|
|
||||||
9 November 2011: Wouter
|
9 November 2011: Wouter
|
||||||
- added unit test for SSL service and SSL-upstream.
|
- added unit test for SSL service and SSL-upstream.
|
||||||
|
|
||||||
|
@ -40,9 +40,9 @@
|
|||||||
* Keep track of forward zones and config settings.
|
* Keep track of forward zones and config settings.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/rdata.h"
|
#include <ldns/rdata.h>
|
||||||
#include "ldns/dname.h"
|
#include <ldns/dname.h>
|
||||||
#include "ldns/rr.h"
|
#include <ldns/rr.h>
|
||||||
#include "iterator/iter_fwd.h"
|
#include "iterator/iter_fwd.h"
|
||||||
#include "iterator/iter_delegpt.h"
|
#include "iterator/iter_delegpt.h"
|
||||||
#include "util/regional.h"
|
#include "util/regional.h"
|
||||||
|
@ -40,8 +40,8 @@
|
|||||||
* Keep track of stub and root hints, and read those from config.
|
* Keep track of stub and root hints, and read those from config.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/dname.h"
|
#include <ldns/dname.h>
|
||||||
#include "ldns/rr.h"
|
#include <ldns/rr.h>
|
||||||
#include "iterator/iter_hints.h"
|
#include "iterator/iter_hints.h"
|
||||||
#include "iterator/iter_delegpt.h"
|
#include "iterator/iter_delegpt.h"
|
||||||
#include "util/regional.h"
|
#include "util/regional.h"
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/dname.h"
|
#include <ldns/dname.h>
|
||||||
#include "iterator/iter_priv.h"
|
#include "iterator/iter_priv.h"
|
||||||
#include "util/regional.h"
|
#include "util/regional.h"
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#ifndef ITERATOR_ITER_PRIV_H
|
#ifndef ITERATOR_ITER_PRIV_H
|
||||||
#define ITERATOR_ITER_PRIV_H
|
#define ITERATOR_ITER_PRIV_H
|
||||||
#include "util/rbtree.h"
|
#include "util/rbtree.h"
|
||||||
#include "ldns/buffer.h"
|
#include <ldns/buffer.h>
|
||||||
struct iter_env;
|
struct iter_env;
|
||||||
struct config_file;
|
struct config_file;
|
||||||
struct regional;
|
struct regional;
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
* one of the response types.
|
* one of the response types.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/packet.h"
|
#include <ldns/packet.h>
|
||||||
#include "iterator/iter_resptype.h"
|
#include "iterator/iter_resptype.h"
|
||||||
#include "iterator/iter_delegpt.h"
|
#include "iterator/iter_delegpt.h"
|
||||||
#include "services/cache/dns.h"
|
#include "services/cache/dns.h"
|
||||||
|
@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
#ifndef ITERATOR_ITER_SCRUB_H
|
#ifndef ITERATOR_ITER_SCRUB_H
|
||||||
#define ITERATOR_ITER_SCRUB_H
|
#define ITERATOR_ITER_SCRUB_H
|
||||||
#include "ldns/buffer.h"
|
#include <ldns/buffer.h>
|
||||||
struct msg_parse;
|
struct msg_parse;
|
||||||
struct query_info;
|
struct query_info;
|
||||||
struct regional;
|
struct regional;
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#ifndef ITERATOR_ITER_UTILS_H
|
#ifndef ITERATOR_ITER_UTILS_H
|
||||||
#define ITERATOR_ITER_UTILS_H
|
#define ITERATOR_ITER_UTILS_H
|
||||||
#include "iterator/iter_resptype.h"
|
#include "iterator/iter_resptype.h"
|
||||||
#include "ldns/buffer.h"
|
#include <ldns/buffer.h>
|
||||||
struct iter_env;
|
struct iter_env;
|
||||||
struct iter_hints;
|
struct iter_hints;
|
||||||
struct iter_forwards;
|
struct iter_forwards;
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "iterator/iterator.h"
|
#include "iterator/iterator.h"
|
||||||
#include "iterator/iter_utils.h"
|
#include "iterator/iter_utils.h"
|
||||||
#include "iterator/iter_hints.h"
|
#include "iterator/iter_hints.h"
|
||||||
|
@ -44,7 +44,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
|
|
||||||
#undef _POSIX_C_SOURCE
|
#undef _POSIX_C_SOURCE
|
||||||
#undef _XOPEN_SOURCE
|
#undef _XOPEN_SOURCE
|
||||||
|
2
services/cache/infra.c
vendored
2
services/cache/infra.c
vendored
@ -39,7 +39,7 @@
|
|||||||
* This file contains the infrastructure cache.
|
* This file contains the infrastructure cache.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/rr.h"
|
#include <ldns/rr.h>
|
||||||
#include "services/cache/infra.h"
|
#include "services/cache/infra.h"
|
||||||
#include "util/storage/slabhash.h"
|
#include "util/storage/slabhash.h"
|
||||||
#include "util/storage/lookup3.h"
|
#include "util/storage/lookup3.h"
|
||||||
|
@ -39,8 +39,8 @@
|
|||||||
* This file contains functions to enable local zone authority service.
|
* This file contains functions to enable local zone authority service.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/dname.h"
|
#include <ldns/dname.h>
|
||||||
#include "ldns/host2wire.h"
|
#include <ldns/host2wire.h>
|
||||||
#include "services/localzone.h"
|
#include "services/localzone.h"
|
||||||
#include "util/regional.h"
|
#include "util/regional.h"
|
||||||
#include "util/config_file.h"
|
#include "util/config_file.h"
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
* send back to clients.
|
* send back to clients.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/wire2host.h"
|
#include <ldns/wire2host.h>
|
||||||
#include "services/mesh.h"
|
#include "services/mesh.h"
|
||||||
#include "services/outbound_list.h"
|
#include "services/outbound_list.h"
|
||||||
#include "services/cache/dns.h"
|
#include "services/cache/dns.h"
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
# include <sys/types.h>
|
# include <sys/types.h>
|
||||||
#endif
|
#endif
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include "ldns/wire2host.h"
|
#include <ldns/wire2host.h>
|
||||||
#include "services/outside_network.h"
|
#include "services/outside_network.h"
|
||||||
#include "services/listen_dnsport.h"
|
#include "services/listen_dnsport.h"
|
||||||
#include "services/cache/infra.h"
|
#include "services/cache/infra.h"
|
||||||
|
@ -72,7 +72,7 @@
|
|||||||
#ifdef HAVE_GETOPT_H
|
#ifdef HAVE_GETOPT_H
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
#endif
|
#endif
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include "libunbound/unbound.h"
|
#include "libunbound/unbound.h"
|
||||||
#ifdef HAVE_SYS_STAT_H
|
#ifdef HAVE_SYS_STAT_H
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#ifdef HAVE_GETOPT_H
|
#ifdef HAVE_GETOPT_H
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
#endif
|
#endif
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "util/locks.h"
|
#include "util/locks.h"
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "util/data/dname.h"
|
#include "util/data/dname.h"
|
||||||
#include "util/data/msgparse.h"
|
#include "util/data/msgparse.h"
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
#ifndef TESTCODE_READHEX_H
|
#ifndef TESTCODE_READHEX_H
|
||||||
#define TESTCODE_READHEX_H
|
#define TESTCODE_READHEX_H
|
||||||
#include "ldns/buffer.h"
|
#include <ldns/buffer.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper to convert hex string to packet buffer.
|
* Helper to convert hex string to packet buffer.
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
* construct input to test the validator with.
|
* construct input to test the validator with.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "util/config_file.h"
|
#include "util/config_file.h"
|
||||||
#include "util/net_help.h"
|
#include "util/net_help.h"
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#ifdef HAVE_GETOPT_H
|
#ifdef HAVE_GETOPT_H
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
#endif
|
#endif
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include "util/locks.h"
|
#include "util/locks.h"
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/rr.h"
|
#include <ldns/rr.h>
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "util/data/dname.h"
|
#include "util/data/dname.h"
|
||||||
#include "testcode/unitmain.h"
|
#include "testcode/unitmain.h"
|
||||||
|
@ -39,8 +39,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/dname.h"
|
#include <ldns/dname.h>
|
||||||
#include "ldns/host2wire.h"
|
#include <ldns/host2wire.h>
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "testcode/unitmain.h"
|
#include "testcode/unitmain.h"
|
||||||
#include "util/data/dname.h"
|
#include "util/data/dname.h"
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
#ifdef HAVE_OPENSSL_ENGINE_H
|
#ifdef HAVE_OPENSSL_ENGINE_H
|
||||||
#include <openssl/engine.h>
|
#include <openssl/engine.h>
|
||||||
#endif
|
#endif
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "testcode/unitmain.h"
|
#include "testcode/unitmain.h"
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "testcode/unitmain.h"
|
#include "testcode/unitmain.h"
|
||||||
#include "util/data/msgparse.h"
|
#include "util/data/msgparse.h"
|
||||||
|
@ -177,8 +177,8 @@ void alloc_set_id_cleanup(struct alloc_cache* alloc, void (*cleanup)(void*),
|
|||||||
void* arg);
|
void* arg);
|
||||||
|
|
||||||
#ifdef UNBOUND_ALLOC_LITE
|
#ifdef UNBOUND_ALLOC_LITE
|
||||||
# include "ldns/packet.h"
|
# include <ldns/packet.h>
|
||||||
# include "openssl/ssl.h"
|
# include <openssl/ssl.h>
|
||||||
# define malloc(s) unbound_stat_malloc_lite(s, __FILE__, __LINE__, __func__)
|
# define malloc(s) unbound_stat_malloc_lite(s, __FILE__, __LINE__, __func__)
|
||||||
# define calloc(n,s) unbound_stat_calloc_lite(n, s, __FILE__, __LINE__, __func__)
|
# define calloc(n,s) unbound_stat_calloc_lite(n, s, __FILE__, __LINE__, __func__)
|
||||||
# define free(p) unbound_stat_free_lite(p, __FILE__, __LINE__, __func__)
|
# define free(p) unbound_stat_free_lite(p, __FILE__, __LINE__, __func__)
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
|
|
||||||
#include "util/configyyrename.h"
|
#include "util/configyyrename.h"
|
||||||
|
@ -1660,7 +1660,7 @@ static int input (void );
|
|||||||
/* This used to be an fputs(), but since the string might contain NUL's,
|
/* This used to be an fputs(), but since the string might contain NUL's,
|
||||||
* we now use fwrite().
|
* we now use fwrite().
|
||||||
*/
|
*/
|
||||||
#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
|
#define ECHO fwrite( yytext, yyleng, 1, yyout )
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
|
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
|
||||||
@ -1671,7 +1671,7 @@ static int input (void );
|
|||||||
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
|
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
|
||||||
{ \
|
{ \
|
||||||
int c = '*'; \
|
int c = '*'; \
|
||||||
unsigned n; \
|
int n; \
|
||||||
for ( n = 0; n < max_size && \
|
for ( n = 0; n < max_size && \
|
||||||
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
|
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
|
||||||
buf[n] = (char) c; \
|
buf[n] = (char) c; \
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/wire2host.h"
|
#include <ldns/wire2host.h>
|
||||||
#include "util/data/msgencode.h"
|
#include "util/data/msgencode.h"
|
||||||
#include "util/data/msgreply.h"
|
#include "util/data/msgreply.h"
|
||||||
#include "util/data/msgparse.h"
|
#include "util/data/msgparse.h"
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
* Routines for message parsing a packet buffer to a descriptive structure.
|
* Routines for message parsing a packet buffer to a descriptive structure.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "util/data/msgparse.h"
|
#include "util/data/msgparse.h"
|
||||||
#include "util/net_help.h"
|
#include "util/net_help.h"
|
||||||
#include "util/data/dname.h"
|
#include "util/data/dname.h"
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
#ifndef UTIL_DATA_MSGPARSE_H
|
#ifndef UTIL_DATA_MSGPARSE_H
|
||||||
#define UTIL_DATA_MSGPARSE_H
|
#define UTIL_DATA_MSGPARSE_H
|
||||||
#include "util/storage/lruhash.h"
|
#include "util/storage/lruhash.h"
|
||||||
#include "ldns/packet.h"
|
#include <ldns/packet.h>
|
||||||
struct rrset_parse;
|
struct rrset_parse;
|
||||||
struct rr_parse;
|
struct rr_parse;
|
||||||
struct regional;
|
struct regional;
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "util/data/msgreply.h"
|
#include "util/data/msgreply.h"
|
||||||
#include "util/storage/lookup3.h"
|
#include "util/storage/lookup3.h"
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/wire2host.h"
|
#include <ldns/wire2host.h>
|
||||||
#include "util/data/packed_rrset.h"
|
#include "util/data/packed_rrset.h"
|
||||||
#include "util/data/dname.h"
|
#include "util/data/dname.h"
|
||||||
#include "util/storage/lookup3.h"
|
#include "util/storage/lookup3.h"
|
||||||
|
@ -42,7 +42,7 @@
|
|||||||
#ifndef UTIL_DATA_PACKED_RRSET_H
|
#ifndef UTIL_DATA_PACKED_RRSET_H
|
||||||
#define UTIL_DATA_PACKED_RRSET_H
|
#define UTIL_DATA_PACKED_RRSET_H
|
||||||
#include "util/storage/lruhash.h"
|
#include "util/storage/lruhash.h"
|
||||||
#include "ldns/rr.h"
|
#include <ldns/rr.h>
|
||||||
struct alloc_cache;
|
struct alloc_cache;
|
||||||
struct regional;
|
struct regional;
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
|
|
||||||
#ifndef UTIL_LOG_H
|
#ifndef UTIL_LOG_H
|
||||||
#define UTIL_LOG_H
|
#define UTIL_LOG_H
|
||||||
#include "ldns/buffer.h"
|
#include <ldns/buffer.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* verbosity value:
|
* verbosity value:
|
||||||
|
@ -38,7 +38,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "util/net_help.h"
|
#include "util/net_help.h"
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "util/data/dname.h"
|
#include "util/data/dname.h"
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
* This file contains event notification functions.
|
* This file contains event notification functions.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/wire2host.h"
|
#include <ldns/wire2host.h>
|
||||||
#include "util/netevent.h"
|
#include "util/netevent.h"
|
||||||
#include "util/log.h"
|
#include "util/log.h"
|
||||||
#include "util/net_help.h"
|
#include "util/net_help.h"
|
||||||
|
@ -60,7 +60,7 @@
|
|||||||
#ifndef NET_EVENT_H
|
#ifndef NET_EVENT_H
|
||||||
#define NET_EVENT_H
|
#define NET_EVENT_H
|
||||||
|
|
||||||
#include "ldns/buffer.h"
|
#include <ldns/buffer.h>
|
||||||
struct comm_point;
|
struct comm_point;
|
||||||
struct comm_reply;
|
struct comm_reply;
|
||||||
struct event_base;
|
struct event_base;
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
* It was modified to fit into unbound. The state table process is the same.
|
* It was modified to fit into unbound. The state table process is the same.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "validator/autotrust.h"
|
#include "validator/autotrust.h"
|
||||||
#include "validator/val_anchor.h"
|
#include "validator/val_anchor.h"
|
||||||
#include "validator/val_utils.h"
|
#include "validator/val_utils.h"
|
||||||
|
@ -40,8 +40,8 @@
|
|||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
#include "ldns/dname.h"
|
#include <ldns/dname.h>
|
||||||
#include "ldns/host2wire.h"
|
#include <ldns/host2wire.h>
|
||||||
#include "validator/val_anchor.h"
|
#include "validator/val_anchor.h"
|
||||||
#include "validator/val_sigcrypt.h"
|
#include "validator/val_sigcrypt.h"
|
||||||
#include "validator/autotrust.h"
|
#include "validator/autotrust.h"
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
* This file contains functions for dealing with validator key entries.
|
* This file contains functions for dealing with validator key entries.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "validator/val_kentry.h"
|
#include "validator/val_kentry.h"
|
||||||
#include "util/data/packed_rrset.h"
|
#include "util/data/packed_rrset.h"
|
||||||
#include "util/data/dname.h"
|
#include "util/data/dname.h"
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
* for denial of existance, and proofs for presence of types.
|
* for denial of existance, and proofs for presence of types.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/packet.h"
|
#include <ldns/packet.h>
|
||||||
#include "validator/val_nsec.h"
|
#include "validator/val_nsec.h"
|
||||||
#include "validator/val_utils.h"
|
#include "validator/val_utils.h"
|
||||||
#include "util/data/msgreply.h"
|
#include "util/data/msgreply.h"
|
||||||
|
@ -41,7 +41,7 @@
|
|||||||
* bridging between RR wireformat data and crypto calls.
|
* bridging between RR wireformat data and crypto calls.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "validator/val_sigcrypt.h"
|
#include "validator/val_sigcrypt.h"
|
||||||
#include "validator/validator.h"
|
#include "validator/validator.h"
|
||||||
#include "util/data/msgreply.h"
|
#include "util/data/msgreply.h"
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
* According to RFC 4034.
|
* According to RFC 4034.
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "validator/validator.h"
|
#include "validator/validator.h"
|
||||||
#include "validator/val_anchor.h"
|
#include "validator/val_anchor.h"
|
||||||
#include "validator/val_kcache.h"
|
#include "validator/val_kcache.h"
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
* windows (no shell).
|
* windows (no shell).
|
||||||
*/
|
*/
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "ldns/ldns.h"
|
#include <ldns/ldns.h>
|
||||||
#include "libunbound/unbound.h"
|
#include "libunbound/unbound.h"
|
||||||
|
|
||||||
/** usage */
|
/** usage */
|
||||||
|
Loading…
Reference in New Issue
Block a user