Commit 87ae0d84 authored by Lubos Slovak's avatar Lubos Slovak

Merge branch 'master' into ext-rcode

Conflicts:
	src/knot/nameserver/process_query.c
parents 5e302090 c6874dc3
Doxyfile
KNOWN_ISSUES
Makefile.am
README
configure.ac
doc/Makefile.am
doc/configuration.rst
doc/index.rst
doc/installation.rst
doc/introduction.rst
doc/Makefile.am
doc/migration.rst
doc/reference.rst
doc/requirements.rst
doc/running.rst
doc/troubleshooting.rst
libtap/Makefile.am
libtap/runtests.c
libtap/tap/basic.c
libtap/tap/basic.h
libtap/tap/float.c
libtap/tap/float.h
libtap/tap/macros.h
libtap/Makefile.am
libtap/runtests.c
man/Makefile.am
patches/Makefile.am
samples/Makefile.am
src/Makefile.am
src/common-knot/array-sort.h
src/common-knot/binsearch.h
src/common-knot/crc.h
src/common-knot/evsched.c
src/common-knot/evsched.h
src/common-knot/fdset.c
src/common-knot/fdset.h
src/common-knot/hattrie/hat-trie.c
src/common-knot/hattrie/hat-trie.h
src/common-knot/hattrie/murmurhash3.c
src/common-knot/hattrie/murmurhash3.h
src/common-knot/heap.c
src/common-knot/heap.h
src/common-knot/hex.c
src/common-knot/hex.h
src/common-knot/hhash.c
src/common-knot/hhash.h
src/common-knot/lists.c
src/common-knot/lists.h
src/common-knot/print.c
src/common-knot/print.h
src/common-knot/ref.c
src/common-knot/ref.h
src/common-knot/sockaddr.c
src/common-knot/sockaddr.h
src/common-knot/strlcat.c
src/common-knot/strlcat.h
src/common-knot/strlcpy.c
src/common-knot/strlcpy.h
src/common-knot/strtonum.h
src/common-knot/trim.h
src/common/namedb/namedb.h
src/common/namedb/namedb_lmdb.c
src/common/namedb/namedb_lmdb.h
src/common/namedb/namedb_trie.c
src/common/namedb/namedb_trie.h
src/common/trie/hat-trie.c
src/common/trie/hat-trie.h
src/common/trie/murmurhash3.c
src/common/trie/murmurhash3.h
src/common/array-sort.h
src/common/base32hex.c
src/common/base32hex.h
src/common/base64.c
src/common/base64.h
src/common/binsearch.h
src/common/debug.h
src/common/errors.c
src/common/errors.h
src/common/getline.c
src/common/getline.h
src/common/hhash.c
src/common/hhash.h
src/common/lists.c
src/common/lists.h
src/common/log.c
src/common/log.h
src/common/macros.h
src/common/mem.c
src/common/mem.h
src/common/mempattern.c
src/common/mempattern.h
src/common/mempool.c
src/common/mempool.h
src/common/namedb/namedb.h
src/common/namedb/namedb_lmdb.c
src/common/namedb/namedb_lmdb.h
src/common/namedb/namedb_trie.c
src/common/namedb/namedb_trie.h
src/dnstap/Makefile.am
src/common/net.c
src/common/net.h
src/common/print.c
src/common/print.h
src/common/sockaddr.c
src/common/sockaddr.h
src/common/strlcpy.c
src/common/strlcpy.h
src/common-knot/crc.h
src/common-knot/evsched.c
src/common-knot/evsched.h
src/common-knot/fdset.c
src/common-knot/fdset.h
src/common-knot/heap.c
src/common-knot/heap.h
src/common-knot/hex.c
src/common-knot/hex.h
src/common-knot/ref.c
src/common-knot/ref.h
src/common-knot/strlcat.c
src/common-knot/strlcat.h
src/common-knot/strtonum.h
src/common-knot/trim.h
src/dnstap/convert.c
src/dnstap/convert.h
src/dnstap/dnstap.c
src/dnstap/dnstap.h
src/dnstap/Makefile.am
src/dnstap/message.c
src/dnstap/message.h
src/dnstap/reader.c
......@@ -113,8 +112,6 @@ src/knot/dnssec/zone-nsec.c
src/knot/dnssec/zone-nsec.h
src/knot/dnssec/zone-sign.c
src/knot/dnssec/zone-sign.h
src/knot/knot.h
src/knot/main.c
src/knot/modules/dnstap.c
src/knot/modules/dnstap.h
src/knot/modules/synth_record.c
......@@ -139,8 +136,6 @@ src/knot/nameserver/process_query.c
src/knot/nameserver/process_query.h
src/knot/nameserver/query_module.c
src/knot/nameserver/query_module.h
src/knot/nameserver/requestor.c
src/knot/nameserver/requestor.h
src/knot/nameserver/tsig_ctx.c
src/knot/nameserver/tsig_ctx.h
src/knot/nameserver/update.c
......@@ -150,8 +145,6 @@ src/knot/server/dthreads.c
src/knot/server/dthreads.h
src/knot/server/journal.c
src/knot/server/journal.h
src/knot/server/net.c
src/knot/server/net.h
src/knot/server/rrl.c
src/knot/server/rrl.h
src/knot/server/serialization.c
......@@ -176,14 +169,14 @@ src/knot/worker/pool.c
src/knot/worker/pool.h
src/knot/worker/queue.c
src/knot/worker/queue.h
src/knot/zone/contents.c
src/knot/zone/contents.h
src/knot/zone/events/events.c
src/knot/zone/events/events.h
src/knot/zone/events/handlers.c
src/knot/zone/events/handlers.h
src/knot/zone/events/replan.c
src/knot/zone/events/replan.h
src/knot/zone/contents.c
src/knot/zone/contents.h
src/knot/zone/node.c
src/knot/zone/node.h
src/knot/zone/semantic-check.c
......@@ -206,15 +199,8 @@ src/knot/zone/zonedb.c
src/knot/zone/zonedb.h
src/knot/zone/zonefile.c
src/knot/zone/zonefile.h
src/libknot/binary.c
src/libknot/binary.h
src/libknot/common.h
src/libknot/consts.c
src/libknot/consts.h
src/libknot/descriptor.c
src/libknot/descriptor.h
src/libknot/dname.c
src/libknot/dname.h
src/knot/knot.h
src/knot/main.c
src/libknot/dnssec/bitmap.h
src/libknot/dnssec/config.h
src/libknot/dnssec/crypto.c
......@@ -230,11 +216,6 @@ src/libknot/dnssec/sig0.c
src/libknot/dnssec/sig0.h
src/libknot/dnssec/sign.c
src/libknot/dnssec/sign.h
src/libknot/errcode.c
src/libknot/errcode.h
src/libknot/libknot.h
src/libknot/mempattern.c
src/libknot/mempattern.h
src/libknot/packet/compr.c
src/libknot/packet/compr.h
src/libknot/packet/pkt.c
......@@ -242,16 +223,13 @@ src/libknot/packet/pkt.h
src/libknot/packet/rrset-wire.c
src/libknot/packet/rrset-wire.h
src/libknot/packet/wire.h
src/libknot/processing/process.c
src/libknot/processing/process.h
src/libknot/rdata.c
src/libknot/rdata.h
src/libknot/rdataset.c
src/libknot/rdataset.h
src/libknot/rrset-dump.c
src/libknot/rrset-dump.h
src/libknot/rrset.c
src/libknot/rrset.h
src/libknot/processing/layer.c
src/libknot/processing/layer.h
src/libknot/processing/overlay.c
src/libknot/processing/overlay.h
src/libknot/processing/requestor.c
src/libknot/processing/requestor.h
src/libknot/rrtype/aaaa.h
src/libknot/rrtype/dnskey.h
src/libknot/rrtype/naptr.h
src/libknot/rrtype/nsec.h
......@@ -266,13 +244,32 @@ src/libknot/rrtype/rrsig.h
src/libknot/rrtype/soa.h
src/libknot/rrtype/tsig.c
src/libknot/rrtype/tsig.h
src/libknot/tsig-op.c
src/libknot/tsig-op.h
src/libknot/util/endian.h
src/libknot/util/tolower.c
src/libknot/util/tolower.h
src/libknot/util/utils.c
src/libknot/util/utils.h
src/libknot/binary.c
src/libknot/binary.h
src/libknot/consts.c
src/libknot/consts.h
src/libknot/descriptor.c
src/libknot/descriptor.h
src/libknot/dname.c
src/libknot/dname.h
src/libknot/errcode.c
src/libknot/errcode.h
src/libknot/libknot.h
src/libknot/rdata.c
src/libknot/rdata.h
src/libknot/rdataset.c
src/libknot/rdataset.h
src/libknot/rrset-dump.c
src/libknot/rrset-dump.h
src/libknot/rrset.c
src/libknot/rrset.h
src/libknot/tsig-op.c
src/libknot/tsig-op.h
src/utils/common/exec.c
src/utils/common/exec.h
src/utils/common/msg.c
......@@ -299,20 +296,20 @@ src/utils/nsupdate/nsupdate_exec.h
src/utils/nsupdate/nsupdate_main.c
src/utils/nsupdate/nsupdate_params.c
src/utils/nsupdate/nsupdate_params.h
src/zscanner/Makefile.am
src/zscanner/tests/processing.c
src/zscanner/tests/processing.h
src/zscanner/tests/tests.c
src/zscanner/tests/tests.h
src/zscanner/tests/zscanner-tool.c
src/zscanner/error.c
src/zscanner/error.h
src/zscanner/functions.c
src/zscanner/functions.h
src/zscanner/Makefile.am
src/zscanner/scanner.h
src/zscanner/scanner.rl
src/zscanner/scanner_body.rl
src/zscanner/tests/processing.c
src/zscanner/tests/processing.h
src/zscanner/tests/tests.c
src/zscanner/tests/tests.h
src/zscanner/tests/zscanner-tool.c
tests/Makefile.am
src/Makefile.am
tests/acl.c
tests/base32hex.c
tests/base64.c
......@@ -331,8 +328,10 @@ tests/fdset.c
tests/hattrie.c
tests/hhash.c
tests/journal.c
tests/Makefile.am
tests/namedb.c
tests/node.c
tests/overlay.c
tests/pkt.c
tests/process_answer.c
tests/process_query.c
......@@ -353,3 +352,8 @@ tests/zone_timers.c
tests/zone_update.c
tests/zonedb.c
tests/ztree.c
configure.ac
Doxyfile
KNOWN_ISSUES
Makefile.am
README
Knot DNS 1.6.0 (2014-10-23)
===========================
Bugfixes:
---------
- Fix zone expiration when AXFR/IXFR is being refused by master
- Fix forced zone refresh on slave (knotc refresh -f)
Knot DNS 1.6.0-rc2 (2014-10-17)
===============================
Improvements:
-------------
- Maximal size of persistent timers database increased from 10 MB to 100 MB
- Added logging of persistent timers database errors
Bugfixes:
---------
- Persistent timers database opening after privileges has been dropped
Knot DNS 1.6.0-rc1 (2014-10-13)
===============================
......@@ -6,7 +26,7 @@ Features:
- Persistent timers for slave zones (expire, refresh, and flush)
Bugfixes:
--------
---------
- DNSSEC: RFC compliant processing of letter case in RDATA domain names
- EDNS: Return minimal error response for queries with unsupported version
- EDNS: Fix interpretation of Extended RCODE
......
# -*- Autoconf -*-
AC_PREREQ([2.60])
AC_INIT([knot], [1.6.0-rc1], [knot-dns@labs.nic.cz])
AC_INIT([knot], [1.6.0], [knot-dns@labs.nic.cz])
AM_INIT_AUTOMAKE([gnits subdir-objects dist-xz -Wall -Werror])
AM_SILENT_RULES([yes])
AC_CONFIG_SRCDIR([src/knot/main.c])
......@@ -350,8 +350,8 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sched.h>]], [[cpuset_t* set = cpuset
# Use -fvisibility=hidden when linking.
# Let's leave it default now and use -export-symbols-regex in LDFLAGS
#gl_VISIBILITY()
#CFLAGS="$CFLAGS $CFLAG_VISIBILITY"
gl_VISIBILITY()
CFLAGS="$CFLAGS $CFLAG_VISIBILITY"
# Add code coverage macro
AX_CODE_COVERAGE
......
......@@ -8,9 +8,9 @@ noinst_LTLIBRARIES = libknotd.la libknots.la libknotus.la libknotcs.la
# $(YACC) will generate header file
AM_CPPFLAGS = \
-include $(top_builddir)/src/config.h \
-DCONFIG_DIR='"${config_dir}"' \
-DSTORAGE_DIR='"${storage_dir}"' \
-include $(top_builddir)/src/config.h \
-DCONFIG_DIR='"${config_dir}"' \
-DSTORAGE_DIR='"${storage_dir}"' \
-DRUN_DIR='"${run_dir}"'
AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
......@@ -62,60 +62,65 @@ knsec3hash_SOURCES = \
# static: shared (not in libknot)
libknots_la_SOURCES = \
common-knot/array-sort.h \
common-knot/binsearch.h \
common-knot/crc.h \
common-knot/evsched.c \
common-knot/evsched.h \
common-knot/fdset.c \
common-knot/fdset.h \
common-knot/hattrie/hat-trie.c \
common-knot/hattrie/hat-trie.h \
common-knot/hattrie/murmurhash3.c \
common-knot/hattrie/murmurhash3.h \
common-knot/heap.c \
common-knot/heap.h \
common-knot/hex.c \
common-knot/hex.h \
common-knot/hhash.c \
common-knot/hhash.h \
common-knot/lists.c \
common-knot/lists.h \
common-knot/print.c \
common-knot/print.h \
common-knot/ref.c \
common-knot/ref.h \
common-knot/sockaddr.c \
common-knot/sockaddr.h \
common-knot/strlcat.c \
common-knot/strlcat.h \
common-knot/strlcpy.c \
common-knot/strlcpy.h \
common-knot/strtonum.h \
common-knot/trim.h
# static: common shared (also in libknot)
libknotcs_la_SOURCES = \
common/array-sort.h \
common/base32hex.c \
common/base32hex.h \
common/base64.c \
common/base64.h \
common/binsearch.h \
common/debug.h \
common/errors.c \
common/errors.h \
common/getline.c \
common/getline.h \
common/hhash.c \
common/hhash.h \
common/lists.c \
common/lists.h \
common/log.c \
common/log.h \
common/macros.h \
common/mem.c \
common/mem.h \
common/mempattern.c \
common/mempattern.h \
common/mempool.c \
common/mempool.h \
common/namedb/namedb.h \
common/namedb/namedb_lmdb.h \
common/namedb/namedb_lmdb.c \
common/namedb/namedb_trie.h \
common/namedb/namedb_lmdb.h \
common/namedb/namedb_trie.c \
common/log.c \
common/log.h
common/namedb/namedb_trie.h \
common/net.c \
common/net.h \
common/print.c \
common/print.h \
common/sockaddr.c \
common/sockaddr.h \
common/strlcpy.c \
common/strlcpy.h \
common/trie/hat-trie.c \
common/trie/hat-trie.h \
common/trie/murmurhash3.c \
common/trie/murmurhash3.h
# static: utilities shared
libknotus_la_SOURCES = \
......@@ -135,13 +140,11 @@ libknotus_la_SOURCES = \
# dynamic: libknot
libknot_la_LDFLAGS = \
$(AM_LDFLAGS) \
-version-info 0:1:0 \
-export-symbols-regex '^(knot|KNOT|rrset|tsig|zone|mm)_'
-version-info 0:1:0
libknot_la_SOURCES = \
libknot/binary.c \
libknot/binary.h \
libknot/common.h \
libknot/consts.c \
libknot/consts.h \
libknot/consts.h \
......@@ -149,12 +152,12 @@ libknot_la_SOURCES = \
libknot/descriptor.h \
libknot/dname.c \
libknot/dname.h \
libknot/dnssec/bitmap.h \
libknot/dnssec/config.h \
libknot/dnssec/crypto.c \
libknot/dnssec/crypto.h \
libknot/dnssec/key.c \
libknot/dnssec/key.h \
libknot/dnssec/bitmap.h \
libknot/dnssec/policy.c \
libknot/dnssec/policy.h \
libknot/dnssec/random.h \
......@@ -167,8 +170,6 @@ libknot_la_SOURCES = \
libknot/errcode.c \
libknot/errcode.h \
libknot/libknot.h \
libknot/mempattern.c \
libknot/mempattern.h \
libknot/packet/compr.c \
libknot/packet/compr.h \
libknot/packet/pkt.c \
......@@ -176,12 +177,26 @@ libknot_la_SOURCES = \
libknot/packet/rrset-wire.c \
libknot/packet/rrset-wire.h \
libknot/packet/wire.h \
libknot/processing/process.c \
libknot/processing/process.h \
libknot/processing/layer.c \
libknot/processing/layer.h \
libknot/processing/overlay.c \
libknot/processing/overlay.h \
libknot/processing/requestor.c \
libknot/processing/requestor.h \
libknot/rdata.c \
libknot/rdata.h \
libknot/rdataset.c \
libknot/rdataset.h \
libknot/rrset-dump.c \
libknot/rrset-dump.h \
libknot/rrset.c \
libknot/rrset.h \
libknot/rrtype/aaaa.h \
libknot/rrtype/dnskey.h \
libknot/rrtype/naptr.h \
libknot/rrtype/nsec.h \
libknot/rrtype/nsec.h \
libknot/rrtype/nsec.h \
libknot/rrtype/nsec3.c \
libknot/rrtype/nsec3.h \
libknot/rrtype/nsec3param.c \
......@@ -193,14 +208,6 @@ libknot_la_SOURCES = \
libknot/rrtype/soa.h \
libknot/rrtype/tsig.c \
libknot/rrtype/tsig.h \
libknot/rrset-dump.c \
libknot/rrset-dump.h \
libknot/rdata.c \
libknot/rdata.h \
libknot/rdataset.c \
libknot/rdataset.h \
libknot/rrset.c \
libknot/rrset.h \
libknot/tsig-op.c \
libknot/tsig-op.h \
libknot/util/endian.h \
......@@ -238,34 +245,32 @@ libknotd_la_SOURCES = \
knot/dnssec/zone-sign.c \
knot/dnssec/zone-sign.h \
knot/knot.h \
knot/modules/synth_record.c \
knot/modules/synth_record.h \
knot/nameserver/axfr.c \
knot/nameserver/axfr.h \
knot/nameserver/chaos.c \
knot/nameserver/chaos.h \
knot/nameserver/capture.c \
knot/nameserver/capture.h \
knot/nameserver/chaos.c \
knot/nameserver/chaos.h \
knot/nameserver/internet.c \
knot/nameserver/internet.h \
knot/nameserver/ixfr.c \
knot/nameserver/ixfr.h \
knot/nameserver/notify.c \
knot/nameserver/notify.h \
knot/nameserver/nsec_proofs.c \
knot/nameserver/nsec_proofs.h \
knot/nameserver/process_query.c \
knot/nameserver/process_query.h \
knot/nameserver/process_answer.c \
knot/nameserver/process_answer.h \
knot/nameserver/requestor.c \
knot/nameserver/requestor.h \
knot/nameserver/process_query.c \
knot/nameserver/process_query.h \
knot/nameserver/query_module.c \
knot/nameserver/query_module.h \
knot/nameserver/update.c \
knot/nameserver/update.h \
knot/nameserver/notify.c \
knot/nameserver/notify.h \
knot/nameserver/tsig_ctx.c \
knot/nameserver/tsig_ctx.h \
knot/modules/synth_record.c \
knot/modules/synth_record.h \
knot/nameserver/update.c \
knot/nameserver/update.h \
knot/other/debug.h \
knot/server/dthreads.c \
knot/server/dthreads.h \
......@@ -273,24 +278,22 @@ libknotd_la_SOURCES = \
knot/server/journal.h \
knot/server/rrl.c \
knot/server/rrl.h \
knot/server/serialization.c \
knot/server/serialization.h \
knot/server/server.c \
knot/server/server.h \
knot/server/net.c \
knot/server/net.h \
knot/server/tcp-handler.c \
knot/server/tcp-handler.h \
knot/server/udp-handler.c \
knot/server/udp-handler.h \
knot/server/serialization.c \
knot/server/serialization.h \
knot/updates/acl.c \
knot/updates/acl.h \
knot/updates/apply.c \
knot/updates/apply.h \
knot/updates/changesets.c \
knot/updates/changesets.h \
knot/updates/ddns.c \
knot/updates/ddns.h \
knot/updates/apply.c \
knot/updates/apply.h \
knot/updates/zone-update.c \
knot/updates/zone-update.h \
knot/worker/pool.c \
......@@ -315,16 +318,16 @@ libknotd_la_SOURCES = \
knot/zone/zone-diff.h \
knot/zone/zone-dump.c \
knot/zone/zone-dump.h \
knot/zone/zone-load.c \
knot/zone/zone-load.h \
knot/zone/zone-tree.c \
knot/zone/zone-tree.h \
knot/zone/zone.c \
knot/zone/zone.h \
knot/zone/zone-load.c \
knot/zone/zone-load.h \
knot/zone/zonedb.c \
knot/zone/zonedb.h \
knot/zone/zonedb-load.c \
knot/zone/zonedb-load.h \
knot/zone/zonedb.c \
knot/zone/zonedb.h \
knot/zone/zonefile.c \
knot/zone/zonefile.h
......
......@@ -19,7 +19,7 @@
#include <unistd.h>
#include <time.h>
#include "common-knot/fdset.h"
#include "libknot/common.h"
#include "libknot/errcode.h"
/* Workarounds for clock_gettime() not available on some platforms. */
#ifdef HAVE_CLOCK_GETTIME
......
......@@ -40,6 +40,10 @@
* undef'd.
*/
#pragma once
#include "common/macros.h"
typedef unsigned uns;
#ifndef ASORT_LT
......
......@@ -7,6 +7,8 @@
* of the GNU Lesser General Public License.
*/
#pragma once
/***
* [[defs]]
* Definitions
......
......@@ -32,7 +32,7 @@
#include <stdio.h>
#include "common/log.h"
#include "common-knot/print.h"
#include "common/print.h"
/*
* Debug macros
......
......@@ -2,11 +2,10 @@
#include <assert.h>
#include <stdbool.h>
#include "common-knot/hhash.h"
#include "common-knot/binsearch.h"
#include "common/hhash.h"
#include "common/binsearch.h"
#include "common/trie/murmurhash3.h"
#include "libknot/errcode.h"
#include "common-knot/hattrie/murmurhash3.h"
#include "libknot/common.h"
/* UCW array sorting defines. */
static int universal_cmp(uint32_t k1, uint32_t k2, hhash_t *tbl);
......@@ -14,7 +13,7 @@ static int universal_cmp(uint32_t k1, uint32_t k2, hhash_t *tbl);
#define ASORT_KEY_TYPE uint32_t
#define ASORT_LT(x, y) (universal_cmp((x), (y), tbl) < 0)
#define ASORT_EXTRA_ARGS , hhash_t *tbl
#include "common-knot/array-sort.h"
#include "common/array-sort.h"
/* Hopscotch internal defines. */
#define HOP_NEXT(x) __builtin_ctz((x))
......@@ -218,7 +217,7 @@ hhash_t *hhash_create_mm(uint32_t size, const mm_ctx_t *mm)
}
const size_t total_len = sizeof(hhash_t) + size * sizeof(hhelem_t);
hhash_t *tbl = mm->alloc(mm->ctx, total_len);
hhash_t *tbl = mm_alloc((mm_ctx_t *)mm, total_len);
if (tbl) {
memset(tbl, 0, total_len);