diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-11-14 14:03:41 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-11-14 14:03:41 +0100 |
| commit | 1bbf06e94150d938ea45f0b8ed237fadad7efbc7 (patch) | |
| tree | 32840bda765c9e1d52b207b17588c7788cfb2eb2 | |
| parent | 77bfcd8d02fbe5cae75a41017144f15c5d0bc5f4 (diff) | |
| download | knot-1bbf06e94150d938ea45f0b8ed237fadad7efbc7.tar.gz | |
Imported Upstream version 1.1.2~rc1upstream/1.1.2_rc1
326 files changed, 121 insertions, 66 deletions
diff --git a/ChangeLog b/ChangeLog index e69de29..e69de29 100644..100755 --- a/ChangeLog +++ b/ChangeLog diff --git a/CodingStyle b/CodingStyle index 986417c..986417c 100644..100755 --- a/CodingStyle +++ b/CodingStyle diff --git a/Doxy.page.h b/Doxy.page.h index 9d73024..9d73024 100644..100755 --- a/Doxy.page.h +++ b/Doxy.page.h diff --git a/Doxyfile.devel b/Doxyfile.devel index 4b73045..4b73045 100644..100755 --- a/Doxyfile.devel +++ b/Doxyfile.devel diff --git a/KNOWN_ISSUES b/KNOWN_ISSUES index fff55a8..fff55a8 100644..100755 --- a/KNOWN_ISSUES +++ b/KNOWN_ISSUES diff --git a/Knot.config b/Knot.config index 8cec188..8cec188 100644..100755 --- a/Knot.config +++ b/Knot.config diff --git a/Knot.creator b/Knot.creator index e94cbbd..e94cbbd 100644..100755 --- a/Knot.creator +++ b/Knot.creator diff --git a/Knot.files b/Knot.files index 903cf79..903cf79 100644..100755 --- a/Knot.files +++ b/Knot.files diff --git a/Knot.includes b/Knot.includes index 8184956..8184956 100644..100755 --- a/Knot.includes +++ b/Knot.includes diff --git a/Makefile.am b/Makefile.am index a3ae405..a3ae405 100644..100755 --- a/Makefile.am +++ b/Makefile.am diff --git a/Makefile.in b/Makefile.in index 5aa9697..5aa9697 100644..100755 --- a/Makefile.in +++ b/Makefile.in @@ -1,3 +1,11 @@ +v1.1.2-rc1 - Nov 14, 2012 +------------------------- + +Bugfixes: + * Fixed crash on reload when config contained duplicate zones. + * Fixed scheduling of transfers. + + v1.1.1 - Oct 31, 2012 --------------------- diff --git a/aclocal.m4 b/aclocal.m4 index ab7b78f..ab7b78f 100644..100755 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for knot 1.1.1. +# Generated by GNU Autoconf 2.68 for knot 1.1.2-rc1. # # Report bugs to <knot-dns@labs.nic.cz>. # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='knot' PACKAGE_TARNAME='knot' -PACKAGE_VERSION='1.1.1' -PACKAGE_STRING='knot 1.1.1' +PACKAGE_VERSION='1.1.2-rc1' +PACKAGE_STRING='knot 1.1.2-rc1' PACKAGE_BUGREPORT='knot-dns@labs.nic.cz' PACKAGE_URL='' @@ -1300,7 +1300,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures knot 1.1.1 to adapt to many kinds of systems. +\`configure' configures knot 1.1.2-rc1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1370,7 +1370,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of knot 1.1.1:";; + short | recursive ) echo "Configuration of knot 1.1.2-rc1:";; esac cat <<\_ACEOF @@ -1488,7 +1488,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -knot configure 1.1.1 +knot configure 1.1.2-rc1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2038,7 +2038,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by knot $as_me 1.1.1, which was +It was created by knot $as_me 1.1.2-rc1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2856,7 +2856,7 @@ fi # Define the identity of the package. PACKAGE='knot' - VERSION='1.1.1' + VERSION='1.1.2-rc1' cat >>confdefs.h <<_ACEOF @@ -15108,7 +15108,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by knot $as_me 1.1.1, which was +This file was extended by knot $as_me 1.1.2-rc1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15174,7 +15174,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -knot config.status 1.1.1 +knot config.status 1.1.2-rc1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 68bc0d5..9230f1d 100644..100755 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- AC_PREREQ([2.60]) -AC_INIT([knot], [1.1.1], [knot-dns@labs.nic.cz]) +AC_INIT([knot], [1.1.2-rc1], [knot-dns@labs.nic.cz]) AM_INIT_AUTOMAKE([gnu -Wall -Werror]) AC_CONFIG_SRCDIR([src/knot/main.c]) AC_CONFIG_HEADERS([src/config.h]) diff --git a/doc/.gitignore b/doc/.gitignore index b9dc5b2..b9dc5b2 100644..100755 --- a/doc/.gitignore +++ b/doc/.gitignore diff --git a/doc/Makefile.am b/doc/Makefile.am index 9cec847..9cec847 100644..100755 --- a/doc/Makefile.am +++ b/doc/Makefile.am diff --git a/doc/Makefile.in b/doc/Makefile.in index 5e388a2..5e388a2 100644..100755 --- a/doc/Makefile.in +++ b/doc/Makefile.in diff --git a/doc/configuration.texi b/doc/configuration.texi index 8b7a1ef..8b7a1ef 100644..100755 --- a/doc/configuration.texi +++ b/doc/configuration.texi diff --git a/doc/indices.texi b/doc/indices.texi index f3a1e88..f3a1e88 100644..100755 --- a/doc/indices.texi +++ b/doc/indices.texi diff --git a/doc/installation.texi b/doc/installation.texi index 0d88f06..0d88f06 100644..100755 --- a/doc/installation.texi +++ b/doc/installation.texi diff --git a/doc/introduction.texi b/doc/introduction.texi index 4217001..4217001 100644..100755 --- a/doc/introduction.texi +++ b/doc/introduction.texi diff --git a/doc/knot.texi b/doc/knot.texi index b0929ae..b0929ae 100644..100755 --- a/doc/knot.texi +++ b/doc/knot.texi diff --git a/doc/migration.texi b/doc/migration.texi index 9d4e0fa..9d4e0fa 100644..100755 --- a/doc/migration.texi +++ b/doc/migration.texi diff --git a/doc/reference.texi b/doc/reference.texi index 9dffd00..9dffd00 100644..100755 --- a/doc/reference.texi +++ b/doc/reference.texi diff --git a/doc/requirements.texi b/doc/requirements.texi index 136f3c6..136f3c6 100644..100755 --- a/doc/requirements.texi +++ b/doc/requirements.texi diff --git a/doc/running.texi b/doc/running.texi index 628cd7d..628cd7d 100644..100755 --- a/doc/running.texi +++ b/doc/running.texi diff --git a/doc/security.texi b/doc/security.texi index 3716521..3716521 100644..100755 --- a/doc/security.texi +++ b/doc/security.texi diff --git a/doc/texinfo.tex b/doc/texinfo.tex index 9140826..9140826 100644..100755 --- a/doc/texinfo.tex +++ b/doc/texinfo.tex diff --git a/doc/troubleshooting.texi b/doc/troubleshooting.texi index 18fee7a..18fee7a 100644..100755 --- a/doc/troubleshooting.texi +++ b/doc/troubleshooting.texi diff --git a/knot.sample.conf.in b/knot.sample.conf.in index db5c587..db5c587 100644..100755 --- a/knot.sample.conf.in +++ b/knot.sample.conf.in diff --git a/m4/ax_check_compiler_flags.m4 b/m4/ax_check_compiler_flags.m4 index 05e5c3b..05e5c3b 100644..100755 --- a/m4/ax_check_compiler_flags.m4 +++ b/m4/ax_check_compiler_flags.m4 diff --git a/m4/ax_ext.m4 b/m4/ax_ext.m4 index 898f2bf..898f2bf 100644..100755 --- a/m4/ax_ext.m4 +++ b/m4/ax_ext.m4 diff --git a/m4/ax_gcc_x86_cpuid.m4 b/m4/ax_gcc_x86_cpuid.m4 index e9231b8..e9231b8 100644..100755 --- a/m4/ax_gcc_x86_cpuid.m4 +++ b/m4/ax_gcc_x86_cpuid.m4 diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 8ff3c76..8ff3c76 100644..100755 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index 17cfd51..17cfd51 100644..100755 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index 9000a05..9000a05 100644..100755 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index 9c7b5d4..9c7b5d4 100644..100755 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index c573da9..c573da9 100644..100755 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 diff --git a/samples/Makefile.am b/samples/Makefile.am index f9aa616..f9aa616 100644..100755 --- a/samples/Makefile.am +++ b/samples/Makefile.am diff --git a/samples/Makefile.in b/samples/Makefile.in index 0bc8a32..0bc8a32 100644..100755 --- a/samples/Makefile.in +++ b/samples/Makefile.in diff --git a/samples/bogus25.com.zone b/samples/bogus25.com.zone index 5260270..5260270 100644..100755 --- a/samples/bogus25.com.zone +++ b/samples/bogus25.com.zone diff --git a/samples/example.com.zone b/samples/example.com.zone index c6a0aef..c6a0aef 100644..100755 --- a/samples/example.com.zone +++ b/samples/example.com.zone diff --git a/samples/example.com.zone.signed b/samples/example.com.zone.signed index d57b39b..d57b39b 100644..100755 --- a/samples/example.com.zone.signed +++ b/samples/example.com.zone.signed diff --git a/samples/example.com.zone.signed.nsec3 b/samples/example.com.zone.signed.nsec3 index 88a28fc..88a28fc 100644..100755 --- a/samples/example.com.zone.signed.nsec3 +++ b/samples/example.com.zone.signed.nsec3 diff --git a/samples/knot.full.conf b/samples/knot.full.conf index bb3ba92..bb3ba92 100644..100755 --- a/samples/knot.full.conf +++ b/samples/knot.full.conf diff --git a/samples/knot.min.conf b/samples/knot.min.conf index 6b7c1af..6b7c1af 100644..100755 --- a/samples/knot.min.conf +++ b/samples/knot.min.conf diff --git a/samples/knot.sample.conf.in b/samples/knot.sample.conf.in index 09da2a8..09da2a8 100644..100755 --- a/samples/knot.sample.conf.in +++ b/samples/knot.sample.conf.in diff --git a/scripts/urcu-tls-compat.patch b/scripts/urcu-tls-compat.patch index cd5ff25..cd5ff25 100644..100755 --- a/scripts/urcu-tls-compat.patch +++ b/scripts/urcu-tls-compat.patch diff --git a/src/Makefile.am b/src/Makefile.am index 1bd26f5..1bd26f5 100644..100755 --- a/src/Makefile.am +++ b/src/Makefile.am diff --git a/src/Makefile.in b/src/Makefile.in index 81c5dd1..81c5dd1 100644..100755 --- a/src/Makefile.in +++ b/src/Makefile.in diff --git a/src/common/LICENSE.txt b/src/common/LICENSE.txt index 15e3bef..15e3bef 100644..100755 --- a/src/common/LICENSE.txt +++ b/src/common/LICENSE.txt diff --git a/src/common/acl.c b/src/common/acl.c index c8e0488..c8e0488 100644..100755 --- a/src/common/acl.c +++ b/src/common/acl.c diff --git a/src/common/acl.h b/src/common/acl.h index 7ce8f26..7ce8f26 100644..100755 --- a/src/common/acl.h +++ b/src/common/acl.h diff --git a/src/common/base32.c b/src/common/base32.c index 43b86c1..43b86c1 100644..100755 --- a/src/common/base32.c +++ b/src/common/base32.c diff --git a/src/common/base32.h b/src/common/base32.h index 45df9fa..45df9fa 100644..100755 --- a/src/common/base32.h +++ b/src/common/base32.h diff --git a/src/common/base32hex.c b/src/common/base32hex.c index cd2d2ce..cd2d2ce 100644..100755 --- a/src/common/base32hex.c +++ b/src/common/base32hex.c diff --git a/src/common/base32hex.h b/src/common/base32hex.h index 9ac4fa8..9ac4fa8 100644..100755 --- a/src/common/base32hex.h +++ b/src/common/base32hex.h diff --git a/src/common/base64.c b/src/common/base64.c index f1f601c..f1f601c 100644..100755 --- a/src/common/base64.c +++ b/src/common/base64.c diff --git a/src/common/base64.h b/src/common/base64.h index aa0b696..aa0b696 100644..100755 --- a/src/common/base64.h +++ b/src/common/base64.h diff --git a/src/common/crc.h b/src/common/crc.h index 7d748be..7d748be 100644..100755 --- a/src/common/crc.h +++ b/src/common/crc.h diff --git a/src/common/dSFMT-params.h b/src/common/dSFMT-params.h index c779d8a..c779d8a 100644..100755 --- a/src/common/dSFMT-params.h +++ b/src/common/dSFMT-params.h diff --git a/src/common/dSFMT-params521.h b/src/common/dSFMT-params521.h index f771dc1..f771dc1 100644..100755 --- a/src/common/dSFMT-params521.h +++ b/src/common/dSFMT-params521.h diff --git a/src/common/dSFMT.c b/src/common/dSFMT.c index 090bb80..090bb80 100644..100755 --- a/src/common/dSFMT.c +++ b/src/common/dSFMT.c diff --git a/src/common/dSFMT.h b/src/common/dSFMT.h index f1aa9bd..f1aa9bd 100644..100755 --- a/src/common/dSFMT.h +++ b/src/common/dSFMT.h diff --git a/src/common/errcode.c b/src/common/errcode.c index 9f5aff3..9f5aff3 100644..100755 --- a/src/common/errcode.c +++ b/src/common/errcode.c diff --git a/src/common/errcode.h b/src/common/errcode.h index 50535ad..50535ad 100644..100755 --- a/src/common/errcode.h +++ b/src/common/errcode.h diff --git a/src/common/errors.c b/src/common/errors.c index 11aff95..11aff95 100644..100755 --- a/src/common/errors.c +++ b/src/common/errors.c diff --git a/src/common/errors.h b/src/common/errors.h index a2773ac..a2773ac 100644..100755 --- a/src/common/errors.h +++ b/src/common/errors.h diff --git a/src/common/evqueue.c b/src/common/evqueue.c index 240ced6..240ced6 100644..100755 --- a/src/common/evqueue.c +++ b/src/common/evqueue.c diff --git a/src/common/evqueue.h b/src/common/evqueue.h index ffb3860..ffb3860 100644..100755 --- a/src/common/evqueue.h +++ b/src/common/evqueue.h diff --git a/src/common/evsched.c b/src/common/evsched.c index 8b6f721..9bfdef0 100644..100755 --- a/src/common/evsched.c +++ b/src/common/evsched.c @@ -26,15 +26,18 @@ #define OPENBSD_SLAB_BROKEN #endif -/* Heap only cares about x<y. */ -static int compare_event_heap_nodes(event_t **e1, event_t **e2) +/*! \brief Some implementations of timercmp >= are broken, this is for compat.*/ +static inline int timercmp_ge(struct timeval *a, struct timeval *b) { + return timercmp(a, b, >) || timercmp(a, b, ==); +} + +static int compare_event_heap_nodes(event_t *e1, event_t *e2) { - if (timercmp(&(*e1)->tv, &(*e2)->tv, <)) return -1; - if (timercmp(&(*e1)->tv, &(*e2)->tv, >)) return 1; + if (timercmp(&e1->tv, &e2->tv, <)) return -1; + if (timercmp(&e1->tv, &e2->tv, >)) return 1; return 0; } - /*! * \brief Set event timer to T (now) + dt miliseconds. */ @@ -78,7 +81,7 @@ evsched_t *evsched_new() #ifndef OPENBSD_SLAB_BROKEN slab_cache_init(&s->cache.alloc, sizeof(event_t)); #endif - heap_init(&s->heap, sizeof(event_t *), compare_event_heap_nodes, 0, NULL); + heap_init(&s->heap, compare_event_heap_nodes, 0); return s; } @@ -179,7 +182,7 @@ event_t* evsched_next(evsched_t *s) event_t *next_ev = *((event_t**)HHEAD(&s->heap)); /* Immediately return. */ - if (timercmp(&dt, &next_ev->tv, >=)) { + if (timercmp_ge(&dt, &next_ev->tv)) { s->current = next_ev; heap_delmin(&s->heap); pthread_mutex_unlock(&s->mx); @@ -235,10 +238,10 @@ int evsched_schedule(evsched_t *s, event_t *ev, uint32_t dt) /* Lock calendar. */ pthread_mutex_lock(&s->mx); - heap_insert(&s->heap, &ev); + heap_insert(&s->heap, ev); /* Unlock calendar. */ - pthread_cond_signal(&s->notify); + pthread_cond_broadcast(&s->notify); pthread_mutex_unlock(&s->mx); return 0; @@ -302,12 +305,12 @@ int evsched_cancel(evsched_t *s, event_t *ev) /* Lock calendar. */ pthread_mutex_lock(&s->mx); - if ((found = heap_find(&s->heap, &ev))) { + if ((found = heap_find(&s->heap, ev))) { heap_delete(&s->heap, found); } /* Unlock calendar. */ - pthread_cond_signal(&s->notify); + pthread_cond_broadcast(&s->notify); pthread_mutex_unlock(&s->mx); /* Enable running events. */ diff --git a/src/common/evsched.h b/src/common/evsched.h index 47bf672..47bf672 100644..100755 --- a/src/common/evsched.h +++ b/src/common/evsched.h diff --git a/src/common/fdset.c b/src/common/fdset.c index c915e01..c915e01 100644..100755 --- a/src/common/fdset.c +++ b/src/common/fdset.c diff --git a/src/common/fdset.h b/src/common/fdset.h index 4038083..4038083 100644..100755 --- a/src/common/fdset.h +++ b/src/common/fdset.h diff --git a/src/common/fdset_epoll.c b/src/common/fdset_epoll.c index d4481b5..d4481b5 100644..100755 --- a/src/common/fdset_epoll.c +++ b/src/common/fdset_epoll.c diff --git a/src/common/fdset_epoll.h b/src/common/fdset_epoll.h index 58f25f8..58f25f8 100644..100755 --- a/src/common/fdset_epoll.h +++ b/src/common/fdset_epoll.h diff --git a/src/common/fdset_kqueue.c b/src/common/fdset_kqueue.c index 108c572..108c572 100644..100755 --- a/src/common/fdset_kqueue.c +++ b/src/common/fdset_kqueue.c diff --git a/src/common/fdset_kqueue.h b/src/common/fdset_kqueue.h index 4b650a7..4b650a7 100644..100755 --- a/src/common/fdset_kqueue.h +++ b/src/common/fdset_kqueue.h diff --git a/src/common/fdset_poll.c b/src/common/fdset_poll.c index 9b1c135..9b1c135 100644..100755 --- a/src/common/fdset_poll.c +++ b/src/common/fdset_poll.c diff --git a/src/common/fdset_poll.h b/src/common/fdset_poll.h index 68e9e69..68e9e69 100644..100755 --- a/src/common/fdset_poll.h +++ b/src/common/fdset_poll.h diff --git a/src/common/general-tree.c b/src/common/general-tree.c index e1048e7..e1048e7 100644..100755 --- a/src/common/general-tree.c +++ b/src/common/general-tree.c diff --git a/src/common/general-tree.h b/src/common/general-tree.h index 552638a..552638a 100644..100755 --- a/src/common/general-tree.h +++ b/src/common/general-tree.h diff --git a/src/common/heap.c b/src/common/heap.c index 6fefb11..27b82da 100644..100755 --- a/src/common/heap.c +++ b/src/common/heap.c @@ -22,11 +22,8 @@ * * Most macros use these parameters: * - * - @type - the type of elements * - @num - a variable (signed or unsigned integer) with the number of elements * - @heap - a C array of type @type; the heap is stored in `heap[1] .. heap[num]`; `heap[0]` is unused - * - @less - a callback to compare two element values; `less(x, y)` shall return a non-zero value iff @x is lower than @y - * - @swap - a callback to swap two array elements; `swap(heap, i, j, t)` must swap `heap[i]` with `heap[j]` with possible help of temporary variable @t (type @type). * * A valid heap must follow these rules: * @@ -44,26 +41,23 @@ #include <string.h> #include <stdlib.h> -void _def_swap(struct heap *h, void *e1, void *e2) +static inline void heap_swap(heap_val_t *e1, heap_val_t *e2) { - if (e1 == e2) return; - void *tmp = HTEMPELEMENT(h); - memcpy(tmp, e1, h->elm_size); - memcpy(e1, e2, h->elm_size); - memcpy(e2, tmp, h->elm_size); + if (e1 == e2) return; /* Stack tmp should be faster than tmpelem. */ + heap_val_t tmp = *e1; /* Even faster than 2-XOR nowadays. */ + *e1 = *e2; + *e2 = tmp; } -int heap_init(struct heap *h, int elm_size, int (*cmp)(void *, void *), int init_size, void (*swap)(struct heap *, void *, void *)) +int heap_init(struct heap *h, int (*cmp)(void *, void *), int init_size) { int isize = init_size ? init_size : INITIAL_HEAP_SIZE; h->num = 0; h->max_size = isize; h->cmp = cmp; - h->swap = swap ? swap : _def_swap; - h->data = malloc((isize + 1) * elm_size); - h->elm_size = elm_size; + h->data = malloc((isize + 1) * sizeof(heap_val_t)); /* Temp element unused. */ return h->data ? 1 : 0; }; @@ -75,9 +69,9 @@ static inline void _heap_bubble_down(struct heap *h, int e) { e1 = 2*e; if(e1 > h->num) break; - if((h->cmp(HELEMENT(h, e),HELEMENT(h,e1)) < 0) && (e1 == h->num || (h->cmp(HELEMENT(h, e),HELEMENT(h,e1+1)) < 0))) break; - if((e1 != h->num) && (h->cmp(HELEMENT(h, e1+1), HELEMENT(h,e1)) < 0)) e1++; - h->swap(h,HELEMENT(h,e),HELEMENT(h,e1)); + if((h->cmp(*HELEMENT(h, e),*HELEMENT(h,e1)) < 0) && (e1 == h->num || (h->cmp(*HELEMENT(h, e),*HELEMENT(h,e1+1)) < 0))) break; + if((e1 != h->num) && (h->cmp(*HELEMENT(h, e1+1), *HELEMENT(h,e1)) < 0)) e1++; + heap_swap(HELEMENT(h,e),HELEMENT(h,e1)); e = e1; } } @@ -88,8 +82,8 @@ static inline void _heap_bubble_up(struct heap *h, int e) while (e > 1) { e1 = e/2; - if(h->cmp(HELEMENT(h, e1),HELEMENT(h,e)) < 0) break; - h->swap(h,HELEMENT(h,e),HELEMENT(h,e1)); + if(h->cmp(*HELEMENT(h, e1),*HELEMENT(h,e)) < 0) break; + heap_swap(HELEMENT(h,e),HELEMENT(h,e1)); e = e1; } @@ -100,7 +94,7 @@ void heap_delmin(struct heap *h) if(h->num == 0) return; if(h->num > 1) { - h->swap(h,HHEAD(h),HELEMENT(h,h->num)); + heap_swap(HHEAD(h),HELEMENT(h,h->num)); } --h->num; _heap_bubble_down(h, 1); @@ -111,39 +105,39 @@ int heap_insert(struct heap *h, void *e) if(h->num == h->max_size) { h->max_size = h->max_size * HEAP_INCREASE_STEP; - h->data = realloc(h->data, (h->max_size + 1) * h->elm_size); + h->data = realloc(h->data, (h->max_size + 1) * sizeof(heap_val_t)); } h->num++; - memcpy(HELEMENT(h,h->num),e,h->elm_size); + *HELEMENT(h,h->num) = e; _heap_bubble_up(h,h->num); - return h->data ? 1 :0 ; + return h->data ? 1 : 0; } int heap_find(struct heap *h, void *elm) /* FIXME - very slow */ { - int i = h->num; - - while(i > 0) + int i = 1; /* Skip tmp element. */ + int np = h->num + 1; /* Start from min-heap top. */ + while(i != np) { - if(h->cmp(HELEMENT(h, i),elm) == 0) break; - --i; + if(*HELEMENT(h, i) == elm) return i; + ++i; } - return i; + return 0; } void heap_delete(struct heap *h, int e) { - h->swap(h, HELEMENT(h, e), HELEMENT(h, h->num)); + heap_swap(HELEMENT(h, e), HELEMENT(h, h->num)); h->num--; - if(h->cmp(HELEMENT(h, e), HELEMENT(h, h->num + 1)) < 0) _heap_bubble_up(h, e); + if(h->cmp(*HELEMENT(h, e), *HELEMENT(h, h->num + 1)) < 0) _heap_bubble_up(h, e); else _heap_bubble_down(h, e); if ((h->num > INITIAL_HEAP_SIZE) && (h->num < h->max_size / HEAP_DECREASE_THRESHOLD)) { h->max_size = h->max_size / HEAP_INCREASE_STEP; - h->data = realloc(h->data, (h->max_size + 1) * h->elm_size); + h->data = realloc(h->data, (h->max_size + 1) * sizeof(heap_val_t)); } } diff --git a/src/common/heap.h b/src/common/heap.h index d6f8a0b..6fe355c 100644..100755 --- a/src/common/heap.h +++ b/src/common/heap.h @@ -28,24 +28,23 @@ #ifndef _HEAP_H_ #define _HEAP_H_ +typedef void* heap_val_t; + struct heap { int num; /* Number of elements */ - int elm_size; /* Size of a single element */ int max_size; /* Size of allocated memory */ int (*cmp)(void *, void *); - void (*swap)(struct heap *, void *, void *); - void *data; + heap_val_t *data; }; /* Array follows */ #define INITIAL_HEAP_SIZE 512 /* initial heap size */ #define HEAP_INCREASE_STEP 2 /* multiplier for each inflation, keep conservative */ #define HEAP_DECREASE_THRESHOLD 2 /* threshold for deflation, keep conservative */ -#define HTEMPELEMENT(h) ((h)->data) /* Pointer to tmp element (for swap) */ -#define HELEMENT(h,num) ((char*)(h)->data + (num) * (h)->elm_size) +#define HELEMENT(h,num) ((h)->data + (num)) #define HHEAD(h) HELEMENT((h),1) #define EMPTY_HEAP(h) ((h)->num == 0) /* h->num == 0 */ -int heap_init(struct heap *, int, int (*cmp)(), int, void (*swap)()); +int heap_init(struct heap *, int (*cmp)(), int); void heap_delmin(struct heap *); int heap_insert(struct heap *, void *); int heap_find(struct heap *, void *); diff --git a/src/common/latency.c b/src/common/latency.c index a563f58..a563f58 100644..100755 --- a/src/common/latency.c +++ b/src/common/latency.c diff --git a/src/common/latency.h b/src/common/latency.h index d965c56..d965c56 100644..100755 --- a/src/common/latency.h +++ b/src/common/latency.h diff --git a/src/common/libtap/README b/src/common/libtap/README index d57b81d..d57b81d 100644..100755 --- a/src/common/libtap/README +++ b/src/common/libtap/README diff --git a/src/common/libtap/tap.c b/src/common/libtap/tap.c index d6bb995..d6bb995 100644..100755 --- a/src/common/libtap/tap.c +++ b/src/common/libtap/tap.c diff --git a/src/common/libtap/tap.h b/src/common/libtap/tap.h index 89484f4..89484f4 100644..100755 --- a/src/common/libtap/tap.h +++ b/src/common/libtap/tap.h diff --git a/src/common/libtap/tap_unit.h b/src/common/libtap/tap_unit.h index c248fde..c248fde 100644..100755 --- a/src/common/libtap/tap_unit.h +++ b/src/common/libtap/tap_unit.h diff --git a/src/common/lists.c b/src/common/lists.c index 9a93733..9a93733 100644..100755 --- a/src/common/lists.c +++ b/src/common/lists.c diff --git a/src/common/lists.h b/src/common/lists.h index 897b1a9..897b1a9 100644..100755 --- a/src/common/lists.h +++ b/src/common/lists.h diff --git a/src/common/log.c b/src/common/log.c index 5267d2d..5267d2d 100644..100755 --- a/src/common/log.c +++ b/src/common/log.c diff --git a/src/common/log.h b/src/common/log.h index 8b9e311..8b9e311 100644..100755 --- a/src/common/log.h +++ b/src/common/log.h diff --git a/src/common/mempattern.c b/src/common/mempattern.c index 5982e18..5982e18 100644..100755 --- a/src/common/mempattern.c +++ b/src/common/mempattern.c diff --git a/src/common/mempattern.h b/src/common/mempattern.h index ae1fa78..ae1fa78 100644..100755 --- a/src/common/mempattern.h +++ b/src/common/mempattern.h diff --git a/src/common/modified_tree.h b/src/common/modified_tree.h index 9ceddd1..9ceddd1 100644..100755 --- a/src/common/modified_tree.h +++ b/src/common/modified_tree.h diff --git a/src/common/print.c b/src/common/print.c index 9764568..9764568 100644..100755 --- a/src/common/print.c +++ b/src/common/print.c diff --git a/src/common/print.h b/src/common/print.h index 482f55e..482f55e 100644..100755 --- a/src/common/print.h +++ b/src/common/print.h diff --git a/src/common/prng.c b/src/common/prng.c index 250a506..250a506 100644..100755 --- a/src/common/prng.c +++ b/src/common/prng.c diff --git a/src/common/prng.h b/src/common/prng.h index a64eabb..a64eabb 100644..100755 --- a/src/common/prng.h +++ b/src/common/prng.h diff --git a/src/common/ref.c b/src/common/ref.c index 3b9c033..3b9c033 100644..100755 --- a/src/common/ref.c +++ b/src/common/ref.c diff --git a/src/common/ref.h b/src/common/ref.h index 13a7037..13a7037 100644..100755 --- a/src/common/ref.h +++ b/src/common/ref.h diff --git a/src/common/skip-list.c b/src/common/skip-list.c index cde08d7..cde08d7 100644..100755 --- a/src/common/skip-list.c +++ b/src/common/skip-list.c diff --git a/src/common/skip-list.h b/src/common/skip-list.h index 784f366..784f366 100644..100755 --- a/src/common/skip-list.h +++ b/src/common/skip-list.h diff --git a/src/common/slab/alloc-common.h b/src/common/slab/alloc-common.h index e15008a..e15008a 100644..100755 --- a/src/common/slab/alloc-common.h +++ b/src/common/slab/alloc-common.h diff --git a/src/common/slab/slab.c b/src/common/slab/slab.c index b581c42..b581c42 100644..100755 --- a/src/common/slab/slab.c +++ b/src/common/slab/slab.c diff --git a/src/common/slab/slab.h b/src/common/slab/slab.h index 4ea7e31..4ea7e31 100644..100755 --- a/src/common/slab/slab.h +++ b/src/common/slab/slab.h diff --git a/src/common/sockaddr.c b/src/common/sockaddr.c index b4e75ee..b4e75ee 100644..100755 --- a/src/common/sockaddr.c +++ b/src/common/sockaddr.c diff --git a/src/common/sockaddr.h b/src/common/sockaddr.h index 52e621c..52e621c 100644..100755 --- a/src/common/sockaddr.h +++ b/src/common/sockaddr.h diff --git a/src/common/tree.h b/src/common/tree.h index efea65b..efea65b 100644..100755 --- a/src/common/tree.h +++ b/src/common/tree.h diff --git a/src/config.h.in b/src/config.h.in index b711d4f..b711d4f 100644..100755 --- a/src/config.h.in +++ b/src/config.h.in diff --git a/src/knot.conf.5 b/src/knot.conf.5 index e778553..4c3f367 100644..100755 --- a/src/knot.conf.5 +++ b/src/knot.conf.5 @@ -1,4 +1,4 @@ -.TH "knot.conf" "5" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.1" +.TH "knot.conf" "5" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.2-rc1" .SH "NAME" .LP .B knot.conf diff --git a/src/knot.service b/src/knot.service index 36864d0..36864d0 100644..100755 --- a/src/knot.service +++ b/src/knot.service diff --git a/src/knot.spec b/src/knot.spec index 5856aab..5856aab 100644..100755 --- a/src/knot.spec +++ b/src/knot.spec diff --git a/src/knot.sysconfig b/src/knot.sysconfig index 99daeba..99daeba 100644..100755 --- a/src/knot.sysconfig +++ b/src/knot.sysconfig diff --git a/src/knot/common.h b/src/knot/common.h index ec70f4a..ec70f4a 100644..100755 --- a/src/knot/common.h +++ b/src/knot/common.h diff --git a/src/knot/conf/cf-lex.l b/src/knot/conf/cf-lex.l index 58d1f4b..58d1f4b 100644..100755 --- a/src/knot/conf/cf-lex.l +++ b/src/knot/conf/cf-lex.l diff --git a/src/knot/conf/cf-parse.y b/src/knot/conf/cf-parse.y index 7a18e6e..4f490b5 100644..100755 --- a/src/knot/conf/cf-parse.y +++ b/src/knot/conf/cf-parse.y @@ -189,6 +189,7 @@ static void conf_zone_start(void *scanner, char *name) { } /* Check domain name. */ + char buf[512]; knot_dname_t *dn = NULL; if (this_zone->name != NULL) { dn = knot_dname_new_from_str(this_zone->name, nlen + 1, 0); @@ -199,9 +200,23 @@ static void conf_zone_start(void *scanner, char *name) { this_zone = NULL; cf_error(scanner, "invalid zone origin"); } else { + /* Check for duplicates. */ + if (gen_tree_find(new_config->zone_tree, dn) != NULL) { + snprintf(buf, sizeof(buf), "zone '%s' is already present, " + "refusing to duplicate", this_zone->name); + knot_dname_free(&dn); + free(this_zone->name); + this_zone->name = NULL; + /* Must not free, some versions of flex might continue after error and segfault. + * free(this_zone); this_zone = NULL; + */ + cf_error(scanner, buf); + return; + } + /* Directly discard dname, won't be needed. */ - knot_dname_free(&dn); add_tail(&new_config->zones, &this_zone->n); + gen_tree_add(new_config->zone_tree, dn, NULL); /* Will hold reference. */ ++new_config->zones_count; /* Initialize ACL lists. */ diff --git a/src/knot/conf/conf.c b/src/knot/conf/conf.c index 0583c88..d9d0a77 100644..100755 --- a/src/knot/conf/conf.c +++ b/src/knot/conf/conf.c @@ -72,6 +72,30 @@ void cf_error(void *scanner, const char *msg) _parser_res = KNOT_EPARSEFAIL; } +static int conf_ztree_compare(void *p1, void *p2) +{ + return knot_dname_compare((knot_dname_t*)p1, (knot_dname_t*)p2); +} + +static void conf_ztree_free(void *node, void *data) +{ + UNUSED(data); + knot_dname_t *zname = (knot_dname_t*)node; + knot_dname_free(&zname); +} + +static void conf_parse_begin(conf_t *conf) +{ + conf->zone_tree = gen_tree_new(conf_ztree_compare); +} + +static void conf_parse_end(conf_t *conf) +{ + if (conf->zone_tree) { + gen_tree_destroy(&conf->zone_tree, conf_ztree_free, NULL); + } +} + /*! * \brief Call config hooks that need updating. * @@ -346,6 +370,7 @@ static int conf_fparser(conf_t *conf) int ret = KNOT_EOK; pthread_mutex_lock(&_parser_lock); + // { // Hook new configuration new_config = conf; @@ -367,6 +392,7 @@ static int conf_fparser(conf_t *conf) fclose(f); // } pthread_mutex_unlock(&_parser_lock); + return ret; } @@ -456,8 +482,10 @@ int conf_add_hook(conf_t * conf, int sections, int conf_parse(conf_t *conf) { /* Parse file. */ + conf_parse_begin(conf); int ret = conf_fparser(conf); - + conf_parse_end(conf); + /* Postprocess config. */ if (ret == 0) { ret = conf_process(conf); @@ -475,7 +503,9 @@ int conf_parse(conf_t *conf) int conf_parse_str(conf_t *conf, const char* src) { /* Parse config from string. */ + conf_parse_begin(conf); int ret = conf_strparser(conf, src); + conf_parse_end(conf); /* Postprocess config. */ conf_process(conf); @@ -625,7 +655,9 @@ int conf_open(const char* path) conf_t *nconf = conf_new(path); /* Parse config. */ + conf_parse_begin(nconf); int ret = conf_fparser(nconf); + conf_parse_end(nconf); if (ret == KNOT_EOK) { /* Postprocess config. */ ret = conf_process(nconf); diff --git a/src/knot/conf/conf.h b/src/knot/conf/conf.h index 391a85f..9f2440e 100644..100755 --- a/src/knot/conf/conf.h +++ b/src/knot/conf/conf.h @@ -39,6 +39,7 @@ #include "common/lists.h" #include "common/log.h" #include "common/sockaddr.h" +#include "common/general-tree.h" /* Constants. */ #define CONFIG_DEFAULT_PORT 53 @@ -199,7 +200,8 @@ typedef struct conf_t { int dbsync_timeout; /*!< Default interval between syncing to zonefile.*/ size_t ixfr_fslimit; /*!< File size limit for IXFR journal. */ int build_diffs; /*!< Calculate differences from changes. */ - + general_tree_t *zone_tree; /*!< Zone tree for duplicate checking. */ + /* * Implementation specifics */ diff --git a/src/knot/conf/logconf.c b/src/knot/conf/logconf.c index 0d2b7da..0d2b7da 100644..100755 --- a/src/knot/conf/logconf.c +++ b/src/knot/conf/logconf.c diff --git a/src/knot/conf/logconf.h b/src/knot/conf/logconf.h index 37ca2c4..37ca2c4 100644..100755 --- a/src/knot/conf/logconf.h +++ b/src/knot/conf/logconf.h diff --git a/src/knot/ctl/knotc_main.c b/src/knot/ctl/knotc_main.c index dd9a8e7..dd9a8e7 100644..100755 --- a/src/knot/ctl/knotc_main.c +++ b/src/knot/ctl/knotc_main.c diff --git a/src/knot/ctl/process.c b/src/knot/ctl/process.c index 5eb5c2d..5eb5c2d 100644..100755 --- a/src/knot/ctl/process.c +++ b/src/knot/ctl/process.c diff --git a/src/knot/ctl/process.h b/src/knot/ctl/process.h index b993f72..b993f72 100644..100755 --- a/src/knot/ctl/process.h +++ b/src/knot/ctl/process.h diff --git a/src/knot/main.c b/src/knot/main.c index de37de4..de37de4 100644..100755 --- a/src/knot/main.c +++ b/src/knot/main.c diff --git a/src/knot/other/debug.h b/src/knot/other/debug.h index 1a8698e..1a8698e 100644..100755 --- a/src/knot/other/debug.h +++ b/src/knot/other/debug.h diff --git a/src/knot/server/dthreads.c b/src/knot/server/dthreads.c index 4e3bee9..82d7dd2 100644..100755 --- a/src/knot/server/dthreads.c +++ b/src/knot/server/dthreads.c @@ -435,6 +435,7 @@ void dt_delete(dt_unit_t **unit) // Deinit mutexes pthread_mutex_destroy(&d_unit->_notify_mx); pthread_mutex_destroy(&d_unit->_report_mx); + pthread_mutex_destroy(&d_unit->_mx); // Deinit conditions pthread_cond_destroy(&d_unit->_notify); diff --git a/src/knot/server/dthreads.h b/src/knot/server/dthreads.h index 374e399..374e399 100644..100755 --- a/src/knot/server/dthreads.h +++ b/src/knot/server/dthreads.h diff --git a/src/knot/server/journal.c b/src/knot/server/journal.c index dc20e41..ac393cf 100644..100755 --- a/src/knot/server/journal.c +++ b/src/knot/server/journal.c @@ -718,7 +718,7 @@ int journal_read(journal_t *journal, uint64_t id, journal_cmp_t cf, char *dst) /* Check valid flag. */ if (!(n->flags & JOURNAL_VALID)) { dbg_journal("journal: node with id=%llu is invalid " - "(flags=0x%hx)\n", (unsigned long long)id, n->flags); + "(flags=0x%hx)\n", (unsigned long long)n->id, n->flags); return KNOT_EINVAL; } diff --git a/src/knot/server/journal.h b/src/knot/server/journal.h index f6716ae..f6716ae 100644..100755 --- a/src/knot/server/journal.h +++ b/src/knot/server/journal.h diff --git a/src/knot/server/notify.c b/src/knot/server/notify.c index 381b1b2..381b1b2 100644..100755 --- a/src/knot/server/notify.c +++ b/src/knot/server/notify.c diff --git a/src/knot/server/notify.h b/src/knot/server/notify.h index 91b47d9..91b47d9 100644..100755 --- a/src/knot/server/notify.h +++ b/src/knot/server/notify.h diff --git a/src/knot/server/server.c b/src/knot/server/server.c index 5a792c7..5a792c7 100644..100755 --- a/src/knot/server/server.c +++ b/src/knot/server/server.c diff --git a/src/knot/server/server.h b/src/knot/server/server.h index a28be63..a28be63 100644..100755 --- a/src/knot/server/server.h +++ b/src/knot/server/server.h diff --git a/src/knot/server/socket.c b/src/knot/server/socket.c index 5f4f936..5f4f936 100644..100755 --- a/src/knot/server/socket.c +++ b/src/knot/server/socket.c diff --git a/src/knot/server/socket.h b/src/knot/server/socket.h index 1266c53..1266c53 100644..100755 --- a/src/knot/server/socket.h +++ b/src/knot/server/socket.h diff --git a/src/knot/server/tcp-handler.c b/src/knot/server/tcp-handler.c index 11628bc..11628bc 100644..100755 --- a/src/knot/server/tcp-handler.c +++ b/src/knot/server/tcp-handler.c diff --git a/src/knot/server/tcp-handler.h b/src/knot/server/tcp-handler.h index 17a7293..17a7293 100644..100755 --- a/src/knot/server/tcp-handler.h +++ b/src/knot/server/tcp-handler.h diff --git a/src/knot/server/udp-handler.c b/src/knot/server/udp-handler.c index d0a21bb..d0a21bb 100644..100755 --- a/src/knot/server/udp-handler.c +++ b/src/knot/server/udp-handler.c diff --git a/src/knot/server/udp-handler.h b/src/knot/server/udp-handler.h index 073a4d8..073a4d8 100644..100755 --- a/src/knot/server/udp-handler.h +++ b/src/knot/server/udp-handler.h diff --git a/src/knot/server/xfr-handler.c b/src/knot/server/xfr-handler.c index 5e8c31a..5e8c31a 100644..100755 --- a/src/knot/server/xfr-handler.c +++ b/src/knot/server/xfr-handler.c diff --git a/src/knot/server/xfr-handler.h b/src/knot/server/xfr-handler.h index 581f47f..581f47f 100644..100755 --- a/src/knot/server/xfr-handler.h +++ b/src/knot/server/xfr-handler.h diff --git a/src/knot/server/zones.c b/src/knot/server/zones.c index 4b5ad38..d993c49 100644..100755 --- a/src/knot/server/zones.c +++ b/src/knot/server/zones.c @@ -1565,6 +1565,7 @@ static int zones_insert_zone(conf_zone_t *z, knot_zone_t **dst, /* Refresh new slave zones (almost) immediately. */ if(is_new && zd->xfr_in.timer) { + evsched_cancel(sch, zd->xfr_in.timer); evsched_schedule(sch, zd->xfr_in.timer, zd->xfr_in.bootstrap_retry / 2); } diff --git a/src/knot/server/zones.h b/src/knot/server/zones.h index 33b3d70..33b3d70 100644..100755 --- a/src/knot/server/zones.h +++ b/src/knot/server/zones.h diff --git a/src/knot/stat/gatherer.c b/src/knot/stat/gatherer.c index 5b8eab6..5b8eab6 100644..100755 --- a/src/knot/stat/gatherer.c +++ b/src/knot/stat/gatherer.c diff --git a/src/knot/stat/gatherer.h b/src/knot/stat/gatherer.h index 62b3939..62b3939 100644..100755 --- a/src/knot/stat/gatherer.h +++ b/src/knot/stat/gatherer.h diff --git a/src/knot/stat/stat-common.h b/src/knot/stat/stat-common.h index 032e32b..032e32b 100644..100755 --- a/src/knot/stat/stat-common.h +++ b/src/knot/stat/stat-common.h diff --git a/src/knot/stat/stat.c b/src/knot/stat/stat.c index a473085..a473085 100644..100755 --- a/src/knot/stat/stat.c +++ b/src/knot/stat/stat.c diff --git a/src/knot/stat/stat.h b/src/knot/stat/stat.h index 0cf1454..0cf1454 100644..100755 --- a/src/knot/stat/stat.h +++ b/src/knot/stat/stat.h diff --git a/src/knot/zone/semantic-check.c b/src/knot/zone/semantic-check.c index abc83eb..abc83eb 100644..100755 --- a/src/knot/zone/semantic-check.c +++ b/src/knot/zone/semantic-check.c diff --git a/src/knot/zone/semantic-check.h b/src/knot/zone/semantic-check.h index 2f6dad7..2f6dad7 100644..100755 --- a/src/knot/zone/semantic-check.h +++ b/src/knot/zone/semantic-check.h diff --git a/src/knot/zone/zone-dump-text.c b/src/knot/zone/zone-dump-text.c index bf02ea1..bf02ea1 100644..100755 --- a/src/knot/zone/zone-dump-text.c +++ b/src/knot/zone/zone-dump-text.c diff --git a/src/knot/zone/zone-dump-text.h b/src/knot/zone/zone-dump-text.h index 3d26742..3d26742 100644..100755 --- a/src/knot/zone/zone-dump-text.h +++ b/src/knot/zone/zone-dump-text.h diff --git a/src/knot/zone/zone-dump.c b/src/knot/zone/zone-dump.c index b9c7bc2..b9c7bc2 100644..100755 --- a/src/knot/zone/zone-dump.c +++ b/src/knot/zone/zone-dump.c diff --git a/src/knot/zone/zone-dump.h b/src/knot/zone/zone-dump.h index 538cb87..538cb87 100644..100755 --- a/src/knot/zone/zone-dump.h +++ b/src/knot/zone/zone-dump.h diff --git a/src/knot/zone/zone-load.c b/src/knot/zone/zone-load.c index 28195f8..28195f8 100644..100755 --- a/src/knot/zone/zone-load.c +++ b/src/knot/zone/zone-load.c diff --git a/src/knot/zone/zone-load.h b/src/knot/zone/zone-load.h index 837d5f2..837d5f2 100644..100755 --- a/src/knot/zone/zone-load.h +++ b/src/knot/zone/zone-load.h diff --git a/src/knotc.8 b/src/knotc.8 index 5b83f49..9776ff7 100644..100755 --- a/src/knotc.8 +++ b/src/knotc.8 @@ -1,4 +1,4 @@ -.TH knotc "8" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.1" +.TH knotc "8" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.2-rc1" .SH NAME .B knotc \- Knot DNS control utility diff --git a/src/knotd.8 b/src/knotd.8 index 9ae9eba..63eba6e 100644..100755 --- a/src/knotd.8 +++ b/src/knotd.8 @@ -1,4 +1,4 @@ -.TH "knotd" "8" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.1" +.TH "knotd" "8" "August 2012" "CZ.NIC Labs" "Knot DNS, version 1.1.2-rc1" .SH NAME .B knotd \- Knot DNS daemon diff --git a/src/libknot/common.h b/src/libknot/common.h index 0bff97e..0bff97e 100644..100755 --- a/src/libknot/common.h +++ b/src/libknot/common.h diff --git a/src/libknot/consts.h b/src/libknot/consts.h index 4249763..4249763 100644..100755 --- a/src/libknot/consts.h +++ b/src/libknot/consts.h diff --git a/src/libknot/dname.c b/src/libknot/dname.c index eed2fd6..eed2fd6 100644..100755 --- a/src/libknot/dname.c +++ b/src/libknot/dname.c diff --git a/src/libknot/dname.h b/src/libknot/dname.h index 347e699..347e699 100644..100755 --- a/src/libknot/dname.h +++ b/src/libknot/dname.h diff --git a/src/libknot/edns.c b/src/libknot/edns.c index a71c4eb..a71c4eb 100644..100755 --- a/src/libknot/edns.c +++ b/src/libknot/edns.c diff --git a/src/libknot/edns.h b/src/libknot/edns.h index d59050e..d59050e 100644..100755 --- a/src/libknot/edns.h +++ b/src/libknot/edns.h diff --git a/src/libknot/hash/cuckoo-hash-table.c b/src/libknot/hash/cuckoo-hash-table.c index 7358e14..7358e14 100644..100755 --- a/src/libknot/hash/cuckoo-hash-table.c +++ b/src/libknot/hash/cuckoo-hash-table.c diff --git a/src/libknot/hash/cuckoo-hash-table.h b/src/libknot/hash/cuckoo-hash-table.h index c0fe9cc..c0fe9cc 100644..100755 --- a/src/libknot/hash/cuckoo-hash-table.h +++ b/src/libknot/hash/cuckoo-hash-table.h diff --git a/src/libknot/hash/hash-functions.c b/src/libknot/hash/hash-functions.c index a33dd6b..a33dd6b 100644..100755 --- a/src/libknot/hash/hash-functions.c +++ b/src/libknot/hash/hash-functions.c diff --git a/src/libknot/hash/hash-functions.h b/src/libknot/hash/hash-functions.h index f23730b..f23730b 100644..100755 --- a/src/libknot/hash/hash-functions.h +++ b/src/libknot/hash/hash-functions.h diff --git a/src/libknot/hash/universal-system.c b/src/libknot/hash/universal-system.c index 096974c..096974c 100644..100755 --- a/src/libknot/hash/universal-system.c +++ b/src/libknot/hash/universal-system.c diff --git a/src/libknot/hash/universal-system.h b/src/libknot/hash/universal-system.h index 25330de..25330de 100644..100755 --- a/src/libknot/hash/universal-system.h +++ b/src/libknot/hash/universal-system.h diff --git a/src/libknot/libknot.h b/src/libknot/libknot.h index 287233d..287233d 100644..100755 --- a/src/libknot/libknot.h +++ b/src/libknot/libknot.h diff --git a/src/libknot/nameserver/name-server.c b/src/libknot/nameserver/name-server.c index 10d8671..10d8671 100644..100755 --- a/src/libknot/nameserver/name-server.c +++ b/src/libknot/nameserver/name-server.c diff --git a/src/libknot/nameserver/name-server.h b/src/libknot/nameserver/name-server.h index 3fe1210..3fe1210 100644..100755 --- a/src/libknot/nameserver/name-server.h +++ b/src/libknot/nameserver/name-server.h diff --git a/src/libknot/nsec3.c b/src/libknot/nsec3.c index 23130ba..23130ba 100644..100755 --- a/src/libknot/nsec3.c +++ b/src/libknot/nsec3.c diff --git a/src/libknot/nsec3.h b/src/libknot/nsec3.h index 7efd229..7efd229 100644..100755 --- a/src/libknot/nsec3.h +++ b/src/libknot/nsec3.h diff --git a/src/libknot/packet/packet.c b/src/libknot/packet/packet.c index 6a047fb..6a047fb 100644..100755 --- a/src/libknot/packet/packet.c +++ b/src/libknot/packet/packet.c diff --git a/src/libknot/packet/packet.h b/src/libknot/packet/packet.h index 522ae8e..522ae8e 100644..100755 --- a/src/libknot/packet/packet.h +++ b/src/libknot/packet/packet.h diff --git a/src/libknot/packet/query.c b/src/libknot/packet/query.c index 8f4cf18..8f4cf18 100644..100755 --- a/src/libknot/packet/query.c +++ b/src/libknot/packet/query.c diff --git a/src/libknot/packet/query.h b/src/libknot/packet/query.h index cda72b9..cda72b9 100644..100755 --- a/src/libknot/packet/query.h +++ b/src/libknot/packet/query.h diff --git a/src/libknot/packet/response.c b/src/libknot/packet/response.c index c6a1a09..c6a1a09 100644..100755 --- a/src/libknot/packet/response.c +++ b/src/libknot/packet/response.c diff --git a/src/libknot/packet/response.h b/src/libknot/packet/response.h index beb1a59..beb1a59 100644..100755 --- a/src/libknot/packet/response.h +++ b/src/libknot/packet/response.h diff --git a/src/libknot/rdata.c b/src/libknot/rdata.c index 9bcdbe5..9bcdbe5 100644..100755 --- a/src/libknot/rdata.c +++ b/src/libknot/rdata.c diff --git a/src/libknot/rdata.h b/src/libknot/rdata.h index 57517bd..57517bd 100644..100755 --- a/src/libknot/rdata.h +++ b/src/libknot/rdata.h diff --git a/src/libknot/rrset.c b/src/libknot/rrset.c index d8b10ce..d8b10ce 100644..100755 --- a/src/libknot/rrset.c +++ b/src/libknot/rrset.c diff --git a/src/libknot/rrset.h b/src/libknot/rrset.h index b5b62db..b5b62db 100644..100755 --- a/src/libknot/rrset.h +++ b/src/libknot/rrset.h diff --git a/src/libknot/tsig-op.c b/src/libknot/tsig-op.c index cb280ab..cb280ab 100644..100755 --- a/src/libknot/tsig-op.c +++ b/src/libknot/tsig-op.c diff --git a/src/libknot/tsig-op.h b/src/libknot/tsig-op.h index 07a84a8..07a84a8 100644..100755 --- a/src/libknot/tsig-op.h +++ b/src/libknot/tsig-op.h diff --git a/src/libknot/tsig.c b/src/libknot/tsig.c index a4a8f1b..a4a8f1b 100644..100755 --- a/src/libknot/tsig.c +++ b/src/libknot/tsig.c diff --git a/src/libknot/tsig.h b/src/libknot/tsig.h index cd5910f..cd5910f 100644..100755 --- a/src/libknot/tsig.h +++ b/src/libknot/tsig.h diff --git a/src/libknot/updates/changesets.c b/src/libknot/updates/changesets.c index ab83b07..ab83b07 100644..100755 --- a/src/libknot/updates/changesets.c +++ b/src/libknot/updates/changesets.c diff --git a/src/libknot/updates/changesets.h b/src/libknot/updates/changesets.h index 642b155..642b155 100644..100755 --- a/src/libknot/updates/changesets.h +++ b/src/libknot/updates/changesets.h diff --git a/src/libknot/updates/ddns.c b/src/libknot/updates/ddns.c index 72a1be9..72a1be9 100644..100755 --- a/src/libknot/updates/ddns.c +++ b/src/libknot/updates/ddns.c diff --git a/src/libknot/updates/ddns.h b/src/libknot/updates/ddns.h index 35dfcb7..35dfcb7 100644..100755 --- a/src/libknot/updates/ddns.h +++ b/src/libknot/updates/ddns.h diff --git a/src/libknot/updates/xfr-in.c b/src/libknot/updates/xfr-in.c index 7d3ffdf..7d3ffdf 100644..100755 --- a/src/libknot/updates/xfr-in.c +++ b/src/libknot/updates/xfr-in.c diff --git a/src/libknot/updates/xfr-in.h b/src/libknot/updates/xfr-in.h index a762b81..a762b81 100644..100755 --- a/src/libknot/updates/xfr-in.h +++ b/src/libknot/updates/xfr-in.h diff --git a/src/libknot/util/debug.c b/src/libknot/util/debug.c index a6555ad..a6555ad 100644..100755 --- a/src/libknot/util/debug.c +++ b/src/libknot/util/debug.c diff --git a/src/libknot/util/debug.h b/src/libknot/util/debug.h index 731fed8..731fed8 100644..100755 --- a/src/libknot/util/debug.h +++ b/src/libknot/util/debug.h diff --git a/src/libknot/util/descriptor.c b/src/libknot/util/descriptor.c index 1588a2e..1588a2e 100644..100755 --- a/src/libknot/util/descriptor.c +++ b/src/libknot/util/descriptor.c diff --git a/src/libknot/util/descriptor.h b/src/libknot/util/descriptor.h index 6364e5b..6364e5b 100644..100755 --- a/src/libknot/util/descriptor.h +++ b/src/libknot/util/descriptor.h diff --git a/src/libknot/util/tolower.c b/src/libknot/util/tolower.c index d71c467..d71c467 100644..100755 --- a/src/libknot/util/tolower.c +++ b/src/libknot/util/tolower.c diff --git a/src/libknot/util/tolower.h b/src/libknot/util/tolower.h index 2e92258..2e92258 100644..100755 --- a/src/libknot/util/tolower.h +++ b/src/libknot/util/tolower.h diff --git a/src/libknot/util/utils.c b/src/libknot/util/utils.c index 04e12c5..04e12c5 100644..100755 --- a/src/libknot/util/utils.c +++ b/src/libknot/util/utils.c diff --git a/src/libknot/util/utils.h b/src/libknot/util/utils.h index fd275b3..fd275b3 100644..100755 --- a/src/libknot/util/utils.h +++ b/src/libknot/util/utils.h diff --git a/src/libknot/util/wire.h b/src/libknot/util/wire.h index 0a24ff1..0a24ff1 100644..100755 --- a/src/libknot/util/wire.h +++ b/src/libknot/util/wire.h diff --git a/src/libknot/zone/dname-table.c b/src/libknot/zone/dname-table.c index f86bb90..f86bb90 100644..100755 --- a/src/libknot/zone/dname-table.c +++ b/src/libknot/zone/dname-table.c diff --git a/src/libknot/zone/dname-table.h b/src/libknot/zone/dname-table.h index 945b6de..945b6de 100644..100755 --- a/src/libknot/zone/dname-table.h +++ b/src/libknot/zone/dname-table.h diff --git a/src/libknot/zone/node.c b/src/libknot/zone/node.c index eca4abc..eca4abc 100644..100755 --- a/src/libknot/zone/node.c +++ b/src/libknot/zone/node.c diff --git a/src/libknot/zone/node.h b/src/libknot/zone/node.h index 4e0b2c4..4e0b2c4 100644..100755 --- a/src/libknot/zone/node.h +++ b/src/libknot/zone/node.h diff --git a/src/libknot/zone/zone-contents.c b/src/libknot/zone/zone-contents.c index 61e9e51..61e9e51 100644..100755 --- a/src/libknot/zone/zone-contents.c +++ b/src/libknot/zone/zone-contents.c diff --git a/src/libknot/zone/zone-contents.h b/src/libknot/zone/zone-contents.h index 52eaa40..52eaa40 100644..100755 --- a/src/libknot/zone/zone-contents.h +++ b/src/libknot/zone/zone-contents.h diff --git a/src/libknot/zone/zone-diff.c b/src/libknot/zone/zone-diff.c index 65f162f..65f162f 100644..100755 --- a/src/libknot/zone/zone-diff.c +++ b/src/libknot/zone/zone-diff.c diff --git a/src/libknot/zone/zone-diff.h b/src/libknot/zone/zone-diff.h index 6e0eb1d..6e0eb1d 100644..100755 --- a/src/libknot/zone/zone-diff.h +++ b/src/libknot/zone/zone-diff.h diff --git a/src/libknot/zone/zone-tree.c b/src/libknot/zone/zone-tree.c index ceaa6a9..ceaa6a9 100644..100755 --- a/src/libknot/zone/zone-tree.c +++ b/src/libknot/zone/zone-tree.c diff --git a/src/libknot/zone/zone-tree.h b/src/libknot/zone/zone-tree.h index 6c38310..6c38310 100644..100755 --- a/src/libknot/zone/zone-tree.h +++ b/src/libknot/zone/zone-tree.h diff --git a/src/libknot/zone/zone.c b/src/libknot/zone/zone.c index 3ab508e..3ab508e 100644..100755 --- a/src/libknot/zone/zone.c +++ b/src/libknot/zone/zone.c diff --git a/src/libknot/zone/zone.h b/src/libknot/zone/zone.h index 31ff2ac..31ff2ac 100644..100755 --- a/src/libknot/zone/zone.h +++ b/src/libknot/zone/zone.h diff --git a/src/libknot/zone/zonedb.c b/src/libknot/zone/zonedb.c index 5e5c516..5e5c516 100644..100755 --- a/src/libknot/zone/zonedb.c +++ b/src/libknot/zone/zonedb.c diff --git a/src/libknot/zone/zonedb.h b/src/libknot/zone/zonedb.h index 81326bf..81326bf 100644..100755 --- a/src/libknot/zone/zonedb.h +++ b/src/libknot/zone/zonedb.h diff --git a/src/tests/README b/src/tests/README index 2f299ad..2f299ad 100644..100755 --- a/src/tests/README +++ b/src/tests/README diff --git a/src/tests/common/acl_tests.c b/src/tests/common/acl_tests.c index c1884cd..c1884cd 100644..100755 --- a/src/tests/common/acl_tests.c +++ b/src/tests/common/acl_tests.c diff --git a/src/tests/common/acl_tests.h b/src/tests/common/acl_tests.h index a928e2d..a928e2d 100644..100755 --- a/src/tests/common/acl_tests.h +++ b/src/tests/common/acl_tests.h diff --git a/src/tests/common/events_tests.c b/src/tests/common/events_tests.c index 0acd706..0acd706 100644..100755 --- a/src/tests/common/events_tests.c +++ b/src/tests/common/events_tests.c diff --git a/src/tests/common/events_tests.h b/src/tests/common/events_tests.h index b54b6da..b54b6da 100644..100755 --- a/src/tests/common/events_tests.h +++ b/src/tests/common/events_tests.h diff --git a/src/tests/common/fdset_tests.c b/src/tests/common/fdset_tests.c index 08e0577..08e0577 100644..100755 --- a/src/tests/common/fdset_tests.c +++ b/src/tests/common/fdset_tests.c diff --git a/src/tests/common/fdset_tests.h b/src/tests/common/fdset_tests.h index d29e1a9..d29e1a9 100644..100755 --- a/src/tests/common/fdset_tests.h +++ b/src/tests/common/fdset_tests.h diff --git a/src/tests/common/skiplist_tests.c b/src/tests/common/skiplist_tests.c index 4fe99ec..4fe99ec 100644..100755 --- a/src/tests/common/skiplist_tests.c +++ b/src/tests/common/skiplist_tests.c diff --git a/src/tests/common/skiplist_tests.h b/src/tests/common/skiplist_tests.h index ff91706..ff91706 100644..100755 --- a/src/tests/common/skiplist_tests.h +++ b/src/tests/common/skiplist_tests.h diff --git a/src/tests/common/slab_tests.c b/src/tests/common/slab_tests.c index 5724a23..5724a23 100644..100755 --- a/src/tests/common/slab_tests.c +++ b/src/tests/common/slab_tests.c diff --git a/src/tests/common/slab_tests.h b/src/tests/common/slab_tests.h index 4d45fb8..4d45fb8 100644..100755 --- a/src/tests/common/slab_tests.h +++ b/src/tests/common/slab_tests.h diff --git a/src/tests/files/sample_conf b/src/tests/files/sample_conf index b15fce5..b15fce5 100644..100755 --- a/src/tests/files/sample_conf +++ b/src/tests/files/sample_conf diff --git a/src/tests/knot/conf_tests.c b/src/tests/knot/conf_tests.c index 61520ea..61520ea 100644..100755 --- a/src/tests/knot/conf_tests.c +++ b/src/tests/knot/conf_tests.c diff --git a/src/tests/knot/conf_tests.h b/src/tests/knot/conf_tests.h index dfd2fd7..dfd2fd7 100644..100755 --- a/src/tests/knot/conf_tests.h +++ b/src/tests/knot/conf_tests.h diff --git a/src/tests/knot/dthreads_tests.c b/src/tests/knot/dthreads_tests.c index 982329b..982329b 100644..100755 --- a/src/tests/knot/dthreads_tests.c +++ b/src/tests/knot/dthreads_tests.c diff --git a/src/tests/knot/dthreads_tests.h b/src/tests/knot/dthreads_tests.h index e41bdc5..e41bdc5 100644..100755 --- a/src/tests/knot/dthreads_tests.h +++ b/src/tests/knot/dthreads_tests.h diff --git a/src/tests/knot/journal_tests.c b/src/tests/knot/journal_tests.c index 89466ea..89466ea 100644..100755 --- a/src/tests/knot/journal_tests.c +++ b/src/tests/knot/journal_tests.c diff --git a/src/tests/knot/journal_tests.h b/src/tests/knot/journal_tests.h index beec8ca..beec8ca 100644..100755 --- a/src/tests/knot/journal_tests.h +++ b/src/tests/knot/journal_tests.h diff --git a/src/tests/knot/server_tests.c b/src/tests/knot/server_tests.c index 5ae04d8..5ae04d8 100644..100755 --- a/src/tests/knot/server_tests.c +++ b/src/tests/knot/server_tests.c diff --git a/src/tests/knot/server_tests.h b/src/tests/knot/server_tests.h index 43ad0c1..43ad0c1 100644..100755 --- a/src/tests/knot/server_tests.h +++ b/src/tests/knot/server_tests.h diff --git a/src/tests/libknot/files/parsed_data b/src/tests/libknot/files/parsed_data Binary files differindex 4027c92..4027c92 100644..100755 --- a/src/tests/libknot/files/parsed_data +++ b/src/tests/libknot/files/parsed_data diff --git a/src/tests/libknot/files/parsed_data_queries b/src/tests/libknot/files/parsed_data_queries Binary files differindex 5857c87..5857c87 100644..100755 --- a/src/tests/libknot/files/parsed_data_queries +++ b/src/tests/libknot/files/parsed_data_queries diff --git a/src/tests/libknot/files/raw_data b/src/tests/libknot/files/raw_data Binary files differindex f94236b..f94236b 100644..100755 --- a/src/tests/libknot/files/raw_data +++ b/src/tests/libknot/files/raw_data diff --git a/src/tests/libknot/files/raw_data_queries b/src/tests/libknot/files/raw_data_queries Binary files differindex 9062d5a..9062d5a 100644..100755 --- a/src/tests/libknot/files/raw_data_queries +++ b/src/tests/libknot/files/raw_data_queries diff --git a/src/tests/libknot/libknot/cuckoo_tests.c b/src/tests/libknot/libknot/cuckoo_tests.c index 8d22e36..8d22e36 100644..100755 --- a/src/tests/libknot/libknot/cuckoo_tests.c +++ b/src/tests/libknot/libknot/cuckoo_tests.c diff --git a/src/tests/libknot/libknot/cuckoo_tests.h b/src/tests/libknot/libknot/cuckoo_tests.h index b6b0db8..b6b0db8 100644..100755 --- a/src/tests/libknot/libknot/cuckoo_tests.h +++ b/src/tests/libknot/libknot/cuckoo_tests.h diff --git a/src/tests/libknot/libknot/dname_table_tests.c b/src/tests/libknot/libknot/dname_table_tests.c index 991f1c6..991f1c6 100644..100755 --- a/src/tests/libknot/libknot/dname_table_tests.c +++ b/src/tests/libknot/libknot/dname_table_tests.c diff --git a/src/tests/libknot/libknot/dname_table_tests.h b/src/tests/libknot/libknot/dname_table_tests.h index f3088e9..f3088e9 100644..100755 --- a/src/tests/libknot/libknot/dname_table_tests.h +++ b/src/tests/libknot/libknot/dname_table_tests.h diff --git a/src/tests/libknot/libknot/dname_tests.c b/src/tests/libknot/libknot/dname_tests.c index 35ac230..35ac230 100644..100755 --- a/src/tests/libknot/libknot/dname_tests.c +++ b/src/tests/libknot/libknot/dname_tests.c diff --git a/src/tests/libknot/libknot/dname_tests.h b/src/tests/libknot/libknot/dname_tests.h index a7d75aa..a7d75aa 100644..100755 --- a/src/tests/libknot/libknot/dname_tests.h +++ b/src/tests/libknot/libknot/dname_tests.h diff --git a/src/tests/libknot/libknot/edns_tests.c b/src/tests/libknot/libknot/edns_tests.c index 4d1a37a..4d1a37a 100644..100755 --- a/src/tests/libknot/libknot/edns_tests.c +++ b/src/tests/libknot/libknot/edns_tests.c diff --git a/src/tests/libknot/libknot/edns_tests.h b/src/tests/libknot/libknot/edns_tests.h index 4553234..4553234 100644..100755 --- a/src/tests/libknot/libknot/edns_tests.h +++ b/src/tests/libknot/libknot/edns_tests.h diff --git a/src/tests/libknot/libknot/node_tests.c b/src/tests/libknot/libknot/node_tests.c index b252982..b252982 100644..100755 --- a/src/tests/libknot/libknot/node_tests.c +++ b/src/tests/libknot/libknot/node_tests.c diff --git a/src/tests/libknot/libknot/node_tests.h b/src/tests/libknot/libknot/node_tests.h index a90179f..a90179f 100644..100755 --- a/src/tests/libknot/libknot/node_tests.h +++ b/src/tests/libknot/libknot/node_tests.h diff --git a/src/tests/libknot/libknot/nsec3_tests.c b/src/tests/libknot/libknot/nsec3_tests.c index 5864b05..5864b05 100644..100755 --- a/src/tests/libknot/libknot/nsec3_tests.c +++ b/src/tests/libknot/libknot/nsec3_tests.c diff --git a/src/tests/libknot/libknot/nsec3_tests.h b/src/tests/libknot/libknot/nsec3_tests.h index 10e7ed9..10e7ed9 100644..100755 --- a/src/tests/libknot/libknot/nsec3_tests.h +++ b/src/tests/libknot/libknot/nsec3_tests.h diff --git a/src/tests/libknot/libknot/packet_tests.c b/src/tests/libknot/libknot/packet_tests.c index 8e6597b..8e6597b 100644..100755 --- a/src/tests/libknot/libknot/packet_tests.c +++ b/src/tests/libknot/libknot/packet_tests.c diff --git a/src/tests/libknot/libknot/packet_tests.h b/src/tests/libknot/libknot/packet_tests.h index 5a8ce03..5a8ce03 100644..100755 --- a/src/tests/libknot/libknot/packet_tests.h +++ b/src/tests/libknot/libknot/packet_tests.h diff --git a/src/tests/libknot/libknot/query_tests.c b/src/tests/libknot/libknot/query_tests.c index e056faa..e056faa 100644..100755 --- a/src/tests/libknot/libknot/query_tests.c +++ b/src/tests/libknot/libknot/query_tests.c diff --git a/src/tests/libknot/libknot/query_tests.h b/src/tests/libknot/libknot/query_tests.h index 037ecab..037ecab 100644..100755 --- a/src/tests/libknot/libknot/query_tests.h +++ b/src/tests/libknot/libknot/query_tests.h diff --git a/src/tests/libknot/libknot/rdata_tests.c b/src/tests/libknot/libknot/rdata_tests.c index 663124a..663124a 100644..100755 --- a/src/tests/libknot/libknot/rdata_tests.c +++ b/src/tests/libknot/libknot/rdata_tests.c diff --git a/src/tests/libknot/libknot/rdata_tests.h b/src/tests/libknot/libknot/rdata_tests.h index 1f43c91..1f43c91 100644..100755 --- a/src/tests/libknot/libknot/rdata_tests.h +++ b/src/tests/libknot/libknot/rdata_tests.h diff --git a/src/tests/libknot/libknot/response_tests.c b/src/tests/libknot/libknot/response_tests.c index 9c477c8..9c477c8 100644..100755 --- a/src/tests/libknot/libknot/response_tests.c +++ b/src/tests/libknot/libknot/response_tests.c diff --git a/src/tests/libknot/libknot/response_tests.h b/src/tests/libknot/libknot/response_tests.h index c9a117b..c9a117b 100644..100755 --- a/src/tests/libknot/libknot/response_tests.h +++ b/src/tests/libknot/libknot/response_tests.h diff --git a/src/tests/libknot/libknot/rrset_tests.c b/src/tests/libknot/libknot/rrset_tests.c index 41284df..41284df 100644..100755 --- a/src/tests/libknot/libknot/rrset_tests.c +++ b/src/tests/libknot/libknot/rrset_tests.c diff --git a/src/tests/libknot/libknot/rrset_tests.h b/src/tests/libknot/libknot/rrset_tests.h index b0787d6..b0787d6 100644..100755 --- a/src/tests/libknot/libknot/rrset_tests.h +++ b/src/tests/libknot/libknot/rrset_tests.h diff --git a/src/tests/libknot/libknot/tsig_tests.c b/src/tests/libknot/libknot/tsig_tests.c index 53c90aa..53c90aa 100644..100755 --- a/src/tests/libknot/libknot/tsig_tests.c +++ b/src/tests/libknot/libknot/tsig_tests.c diff --git a/src/tests/libknot/libknot/tsig_tests.h b/src/tests/libknot/libknot/tsig_tests.h index 8ea15f6..8ea15f6 100644..100755 --- a/src/tests/libknot/libknot/tsig_tests.h +++ b/src/tests/libknot/libknot/tsig_tests.h diff --git a/src/tests/libknot/libknot/zone_tests.c b/src/tests/libknot/libknot/zone_tests.c index f348ebf..f348ebf 100644..100755 --- a/src/tests/libknot/libknot/zone_tests.c +++ b/src/tests/libknot/libknot/zone_tests.c diff --git a/src/tests/libknot/libknot/zone_tests.h b/src/tests/libknot/libknot/zone_tests.h index 5539709..5539709 100644..100755 --- a/src/tests/libknot/libknot/zone_tests.h +++ b/src/tests/libknot/libknot/zone_tests.h diff --git a/src/tests/libknot/libknot/zone_tree_tests.c b/src/tests/libknot/libknot/zone_tree_tests.c index 80fa8f4..80fa8f4 100644..100755 --- a/src/tests/libknot/libknot/zone_tree_tests.c +++ b/src/tests/libknot/libknot/zone_tree_tests.c diff --git a/src/tests/libknot/libknot/zone_tree_tests.h b/src/tests/libknot/libknot/zone_tree_tests.h index 4cea88c..4cea88c 100644..100755 --- a/src/tests/libknot/libknot/zone_tree_tests.h +++ b/src/tests/libknot/libknot/zone_tree_tests.h diff --git a/src/tests/libknot/libknot/zonedb_tests.c b/src/tests/libknot/libknot/zonedb_tests.c index 7b45587..7b45587 100644..100755 --- a/src/tests/libknot/libknot/zonedb_tests.c +++ b/src/tests/libknot/libknot/zonedb_tests.c diff --git a/src/tests/libknot/libknot/zonedb_tests.h b/src/tests/libknot/libknot/zonedb_tests.h index 0c4f8ef..0c4f8ef 100644..100755 --- a/src/tests/libknot/libknot/zonedb_tests.h +++ b/src/tests/libknot/libknot/zonedb_tests.h diff --git a/src/tests/libknot/realdata/files/parsed_data b/src/tests/libknot/realdata/files/parsed_data Binary files differindex fe22b90..fe22b90 100644..100755 --- a/src/tests/libknot/realdata/files/parsed_data +++ b/src/tests/libknot/realdata/files/parsed_data diff --git a/src/tests/libknot/realdata/files/parsed_data_queries b/src/tests/libknot/realdata/files/parsed_data_queries Binary files differindex 5857c87..5857c87 100644..100755 --- a/src/tests/libknot/realdata/files/parsed_data_queries +++ b/src/tests/libknot/realdata/files/parsed_data_queries diff --git a/src/tests/libknot/realdata/files/raw_data b/src/tests/libknot/realdata/files/raw_data Binary files differindex 502005e..502005e 100644..100755 --- a/src/tests/libknot/realdata/files/raw_data +++ b/src/tests/libknot/realdata/files/raw_data diff --git a/src/tests/libknot/realdata/files/raw_data_queries b/src/tests/libknot/realdata/files/raw_data_queries Binary files differindex 9062d5a..9062d5a 100644..100755 --- a/src/tests/libknot/realdata/files/raw_data_queries +++ b/src/tests/libknot/realdata/files/raw_data_queries diff --git a/src/tests/libknot/realdata/libknot/dname_tests_realdata.c b/src/tests/libknot/realdata/libknot/dname_tests_realdata.c index d0216c7..d0216c7 100644..100755 --- a/src/tests/libknot/realdata/libknot/dname_tests_realdata.c +++ b/src/tests/libknot/realdata/libknot/dname_tests_realdata.c diff --git a/src/tests/libknot/realdata/libknot/dname_tests_realdata.h b/src/tests/libknot/realdata/libknot/dname_tests_realdata.h index a7d75aa..a7d75aa 100644..100755 --- a/src/tests/libknot/realdata/libknot/dname_tests_realdata.h +++ b/src/tests/libknot/realdata/libknot/dname_tests_realdata.h diff --git a/src/tests/libknot/realdata/libknot/edns_tests_realdata.c b/src/tests/libknot/realdata/libknot/edns_tests_realdata.c index 257d480..257d480 100644..100755 --- a/src/tests/libknot/realdata/libknot/edns_tests_realdata.c +++ b/src/tests/libknot/realdata/libknot/edns_tests_realdata.c diff --git a/src/tests/libknot/realdata/libknot/edns_tests_realdata.h b/src/tests/libknot/realdata/libknot/edns_tests_realdata.h index cfa64b0..cfa64b0 100644..100755 --- a/src/tests/libknot/realdata/libknot/edns_tests_realdata.h +++ b/src/tests/libknot/realdata/libknot/edns_tests_realdata.h diff --git a/src/tests/libknot/realdata/libknot/node_tests_realdata.c b/src/tests/libknot/realdata/libknot/node_tests_realdata.c index 91209c9..91209c9 100644..100755 --- a/src/tests/libknot/realdata/libknot/node_tests_realdata.c +++ b/src/tests/libknot/realdata/libknot/node_tests_realdata.c diff --git a/src/tests/libknot/realdata/libknot/node_tests_realdata.h b/src/tests/libknot/realdata/libknot/node_tests_realdata.h index a90179f..a90179f 100644..100755 --- a/src/tests/libknot/realdata/libknot/node_tests_realdata.h +++ b/src/tests/libknot/realdata/libknot/node_tests_realdata.h diff --git a/src/tests/libknot/realdata/libknot/packet_tests_realdata.c b/src/tests/libknot/realdata/libknot/packet_tests_realdata.c index 94aac89..94aac89 100644..100755 --- a/src/tests/libknot/realdata/libknot/packet_tests_realdata.c +++ b/src/tests/libknot/realdata/libknot/packet_tests_realdata.c diff --git a/src/tests/libknot/realdata/libknot/packet_tests_realdata.h b/src/tests/libknot/realdata/libknot/packet_tests_realdata.h index c0e0479..c0e0479 100644..100755 --- a/src/tests/libknot/realdata/libknot/packet_tests_realdata.h +++ b/src/tests/libknot/realdata/libknot/packet_tests_realdata.h diff --git a/src/tests/libknot/realdata/libknot/rdata_tests_realdata.c b/src/tests/libknot/realdata/libknot/rdata_tests_realdata.c index 0d39bfb..0d39bfb 100644..100755 --- a/src/tests/libknot/realdata/libknot/rdata_tests_realdata.c +++ b/src/tests/libknot/realdata/libknot/rdata_tests_realdata.c diff --git a/src/tests/libknot/realdata/libknot/rdata_tests_realdata.h b/src/tests/libknot/realdata/libknot/rdata_tests_realdata.h index 570b2b1..570b2b1 100644..100755 --- a/src/tests/libknot/realdata/libknot/rdata_tests_realdata.h +++ b/src/tests/libknot/realdata/libknot/rdata_tests_realdata.h diff --git a/src/tests/libknot/realdata/libknot/response_tests_realdata.c b/src/tests/libknot/realdata/libknot/response_tests_realdata.c index 0413238..0413238 100644..100755 --- a/src/tests/libknot/realdata/libknot/response_tests_realdata.c +++ b/src/tests/libknot/realdata/libknot/response_tests_realdata.c diff --git a/src/tests/libknot/realdata/libknot/response_tests_realdata.h b/src/tests/libknot/realdata/libknot/response_tests_realdata.h index 731604b..731604b 100644..100755 --- a/src/tests/libknot/realdata/libknot/response_tests_realdata.h +++ b/src/tests/libknot/realdata/libknot/response_tests_realdata.h diff --git a/src/tests/libknot/realdata/libknot/rrset_tests_realdata.c b/src/tests/libknot/realdata/libknot/rrset_tests_realdata.c index cb59f4c..cb59f4c 100644..100755 --- a/src/tests/libknot/realdata/libknot/rrset_tests_realdata.c +++ b/src/tests/libknot/realdata/libknot/rrset_tests_realdata.c diff --git a/src/tests/libknot/realdata/libknot/rrset_tests_realdata.h b/src/tests/libknot/realdata/libknot/rrset_tests_realdata.h index cc3b705..cc3b705 100644..100755 --- a/src/tests/libknot/realdata/libknot/rrset_tests_realdata.h +++ b/src/tests/libknot/realdata/libknot/rrset_tests_realdata.h diff --git a/src/tests/libknot/realdata/libknot/zone_tests_realdata.c b/src/tests/libknot/realdata/libknot/zone_tests_realdata.c index 9c92b72..9c92b72 100644..100755 --- a/src/tests/libknot/realdata/libknot/zone_tests_realdata.c +++ b/src/tests/libknot/realdata/libknot/zone_tests_realdata.c diff --git a/src/tests/libknot/realdata/libknot/zone_tests_realdata.h b/src/tests/libknot/realdata/libknot/zone_tests_realdata.h index 5539709..5539709 100644..100755 --- a/src/tests/libknot/realdata/libknot/zone_tests_realdata.h +++ b/src/tests/libknot/realdata/libknot/zone_tests_realdata.h diff --git a/src/tests/libknot/realdata/libknot/zonedb_tests_realdata.c b/src/tests/libknot/realdata/libknot/zonedb_tests_realdata.c index 96d1517..96d1517 100644..100755 --- a/src/tests/libknot/realdata/libknot/zonedb_tests_realdata.c +++ b/src/tests/libknot/realdata/libknot/zonedb_tests_realdata.c diff --git a/src/tests/libknot/realdata/libknot/zonedb_tests_realdata.h b/src/tests/libknot/realdata/libknot/zonedb_tests_realdata.h index 0c4f8ef..0c4f8ef 100644..100755 --- a/src/tests/libknot/realdata/libknot/zonedb_tests_realdata.h +++ b/src/tests/libknot/realdata/libknot/zonedb_tests_realdata.h diff --git a/src/tests/libknot/realdata/libknot_tests_loader_realdata.c b/src/tests/libknot/realdata/libknot_tests_loader_realdata.c index e972855..e972855 100644..100755 --- a/src/tests/libknot/realdata/libknot_tests_loader_realdata.c +++ b/src/tests/libknot/realdata/libknot_tests_loader_realdata.c diff --git a/src/tests/libknot/realdata/libknot_tests_loader_realdata.h b/src/tests/libknot/realdata/libknot_tests_loader_realdata.h index 8f57944..8f57944 100644..100755 --- a/src/tests/libknot/realdata/libknot_tests_loader_realdata.h +++ b/src/tests/libknot/realdata/libknot_tests_loader_realdata.h diff --git a/src/tests/libknot/realdata/unittests_libknot_realdata.c b/src/tests/libknot/realdata/unittests_libknot_realdata.c index e557c43..e557c43 100644..100755 --- a/src/tests/libknot/realdata/unittests_libknot_realdata.c +++ b/src/tests/libknot/realdata/unittests_libknot_realdata.c diff --git a/src/tests/libknot/unittests_libknot.c b/src/tests/libknot/unittests_libknot.c index d522e1d..d522e1d 100644..100755 --- a/src/tests/libknot/unittests_libknot.c +++ b/src/tests/libknot/unittests_libknot.c diff --git a/src/tests/unittests_main.c b/src/tests/unittests_main.c index 21eae14..21eae14 100644..100755 --- a/src/tests/unittests_main.c +++ b/src/tests/unittests_main.c diff --git a/src/tests/xfr_tests.c b/src/tests/xfr_tests.c index db6c486..db6c486 100644..100755 --- a/src/tests/xfr_tests.c +++ b/src/tests/xfr_tests.c diff --git a/src/tests/xfr_tests.h b/src/tests/xfr_tests.h index 29de11d..29de11d 100644..100755 --- a/src/tests/xfr_tests.h +++ b/src/tests/xfr_tests.h diff --git a/src/zcompile/LICENSE b/src/zcompile/LICENSE index 55faacf..55faacf 100644..100755 --- a/src/zcompile/LICENSE +++ b/src/zcompile/LICENSE diff --git a/src/zcompile/parser-descriptor.c b/src/zcompile/parser-descriptor.c index bc3ee16..bc3ee16 100644..100755 --- a/src/zcompile/parser-descriptor.c +++ b/src/zcompile/parser-descriptor.c diff --git a/src/zcompile/parser-descriptor.h b/src/zcompile/parser-descriptor.h index 48c6f02..48c6f02 100644..100755 --- a/src/zcompile/parser-descriptor.h +++ b/src/zcompile/parser-descriptor.h diff --git a/src/zcompile/parser-util.c b/src/zcompile/parser-util.c index 955a7b0..955a7b0 100644..100755 --- a/src/zcompile/parser-util.c +++ b/src/zcompile/parser-util.c diff --git a/src/zcompile/parser-util.h b/src/zcompile/parser-util.h index 57258dc..57258dc 100644..100755 --- a/src/zcompile/parser-util.h +++ b/src/zcompile/parser-util.h diff --git a/src/zcompile/tests/unittests_zp_main.c b/src/zcompile/tests/unittests_zp_main.c index 5d8c5e9..5d8c5e9 100644..100755 --- a/src/zcompile/tests/unittests_zp_main.c +++ b/src/zcompile/tests/unittests_zp_main.c diff --git a/src/zcompile/tests/zcompile_tests.c b/src/zcompile/tests/zcompile_tests.c index 5d3dce6..5d3dce6 100644..100755 --- a/src/zcompile/tests/zcompile_tests.c +++ b/src/zcompile/tests/zcompile_tests.c diff --git a/src/zcompile/zcompile-error.c b/src/zcompile/zcompile-error.c index 9357cde..9357cde 100644..100755 --- a/src/zcompile/zcompile-error.c +++ b/src/zcompile/zcompile-error.c diff --git a/src/zcompile/zcompile-error.h b/src/zcompile/zcompile-error.h index c6d999c..c6d999c 100644..100755 --- a/src/zcompile/zcompile-error.h +++ b/src/zcompile/zcompile-error.h diff --git a/src/zcompile/zcompile.c b/src/zcompile/zcompile.c index e2f05e3..e2f05e3 100644..100755 --- a/src/zcompile/zcompile.c +++ b/src/zcompile/zcompile.c diff --git a/src/zcompile/zcompile.h b/src/zcompile/zcompile.h index d19ef4c..d19ef4c 100644..100755 --- a/src/zcompile/zcompile.h +++ b/src/zcompile/zcompile.h diff --git a/src/zcompile/zcompile_main.c b/src/zcompile/zcompile_main.c index 983376a..983376a 100644..100755 --- a/src/zcompile/zcompile_main.c +++ b/src/zcompile/zcompile_main.c diff --git a/src/zcompile/zlexer.l b/src/zcompile/zlexer.l index 58e6439..58e6439 100644..100755 --- a/src/zcompile/zlexer.l +++ b/src/zcompile/zlexer.l diff --git a/src/zcompile/zparser.y b/src/zcompile/zparser.y index c35060e..c35060e 100644..100755 --- a/src/zcompile/zparser.y +++ b/src/zcompile/zparser.y diff --git a/tests/querytcp.c b/tests/querytcp.c index 7e1418f..7e1418f 100644..100755 --- a/tests/querytcp.c +++ b/tests/querytcp.c |