Commit 54296612 authored by Lubos Slovak's avatar Lubos Slovak

libknot: Fixed includes of moved files.

parent 57163622
......@@ -18,7 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "common/errors.h"
#include "common-knot/errors.h"
#include "libknot/errcode.h"
/*!
......
......@@ -21,7 +21,7 @@
#include <assert.h>
#include "libknot/errcode.h"
#include "common/evsched.h"
#include "common-knot/evsched.h"
/*! \brief Some implementations of timercmp >= are broken, this is for compat.*/
static inline int timercmp_ge(struct timeval *a, struct timeval *b) {
......
......@@ -31,7 +31,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <sys/time.h>
#include "common/heap.h"
#include "common-knot/heap.h"
/* Forward decls. */
struct evsched;
......
......@@ -18,7 +18,7 @@
#include <string.h>
#include <unistd.h>
#include <time.h>
#include "common/fdset.h"
#include "common-knot/fdset.h"
#include "libknot/common.h"
/* Workarounds for clock_gettime() not available on some platforms. */
......
......@@ -8,8 +8,8 @@
#include <stdint.h>
#include <assert.h>
#include <string.h>
#include "common/hattrie/hat-trie.h"
#include "common/hhash.h"
#include "common-knot/hattrie/hat-trie.h"
#include "common-knot/hhash.h"
/* number of child nodes for used alphabet */
#define NODE_CHILDS (TRIE_MAXCHAR+1)
......
......@@ -26,7 +26,7 @@ extern "C" {
#include <stdbool.h>
#include "libknot/common.h"
#include "libknot/mempattern.h"
#include "common/hhash.h"
#include "common-knot/hhash.h"
/* Hat-trie defines. */
#define TRIE_ZEROBUCKETS 0 /* Do not use hash buckets (pure trie). */
......
/* This is MurmurHash3. The original C++ code was placed in the public domain
* by its author, Austin Appleby. */
#include "common/hattrie/murmurhash3.h"
#include "common-knot/hattrie/murmurhash3.h"
static inline uint32_t fmix(uint32_t h)
{
......
......@@ -37,7 +37,7 @@
* ------
***/
#include "common/heap.h"
#include "common-knot/heap.h"
#include <string.h>
#include <stdlib.h>
......
......@@ -2,10 +2,10 @@
#include <assert.h>
#include <stdbool.h>
#include "common/hhash.h"
#include "common/binsearch.h"
#include "common-knot/hhash.h"
#include "common-knot/binsearch.h"
#include "libknot/errcode.h"
#include "common/hattrie/murmurhash3.h"
#include "common-knot/hattrie/murmurhash3.h"
#include "libknot/common.h"
/* UCW array sorting defines. */
......@@ -14,7 +14,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/array-sort.h"
#include "common-knot/array-sort.h"
/* Hopscotch internal defines. */
#define HOP_NEXT(x) __builtin_ctz((x))
......
......@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
#include "common/lists.h"
#include "common-knot/lists.h"
/**
* add_tail - append a node to a list
......
......@@ -22,8 +22,8 @@
#include <unistd.h>
#include <sys/time.h>
#include "common/log.h"
#include "common/lists.h"
#include "common-knot/log.h"
#include "common-knot/lists.h"
#include "knot/conf/conf.h"
/*! Log source table. */
......
......@@ -11,7 +11,7 @@
#undef LOCAL_DEBUG
#include "common/mempool.h"
#include "common-knot/mempool.h"
#include "libknot/mempattern.h"
#include <string.h>
......
......@@ -16,7 +16,7 @@
#include <stdio.h>
#include <ctype.h>
#include "common/print.h"
#include "common-knot/print.h"
void array_printf(const uint8_t *data, const unsigned length,
printf_t print_handler, const char type)
......
......@@ -16,7 +16,7 @@
#include <stdio.h>
#include "common/ref.h"
#include "common-knot/ref.h"
void ref_init(ref_t *p, ref_destructor_t dtor)
{
......
......@@ -21,8 +21,8 @@
#include <stdlib.h>
#include <sys/mman.h>
#include "common/slab/alloc-common.h"
#include "common/slab/slab.h"
#include "common-knot/slab/alloc-common.h"
#include "common-knot/slab/slab.h"
/*
* Magic constants.
......
......@@ -18,7 +18,7 @@
#include <string.h>
#include <netdb.h>
#include "common/sockaddr.h"
#include "common-knot/sockaddr.h"
#include "libknot/errcode.h"
#include "libknot/consts.h"
......
......@@ -32,8 +32,8 @@
#include <stdint.h>
#include <stdio.h>
#include "common/log.h"
#include "common/print.h"
#include "common-knot/log.h"
#include "common-knot/print.h"
/*
* Debug macros
......
......@@ -33,11 +33,11 @@
#include <sys/stat.h>
#include <sys/types.h>
#include "common/sockaddr.h"
#include "common-knot/sockaddr.h"
#include "knot/conf/conf.h"
#include "knot/conf/includes.h"
#include "knot/conf/extra.h"
#include "common/log.h"
#include "common-knot/log.h"
#include "libknotd_la-cf-parse.h" /* Automake generated header. */
/* Imported symbols. */
......
......@@ -30,7 +30,7 @@
#include <stdlib.h>
#include <pwd.h>
#include <grp.h>
#include "common/sockaddr.h"
#include "common-knot/sockaddr.h"
#include "libknot/dname.h"
#include "libknot/binary.h"
#include "libknot/rrtype/opt.h"
......
......@@ -38,11 +38,11 @@
#include "libknot/rrtype/tsig.h"
#include "libknot/dnssec/key.h"
#include "libknot/dnssec/policy.h"
#include "common/lists.h"
#include "common/log.h"
#include "common-knot/lists.h"
#include "common-knot/log.h"
#include "knot/updates/acl.h"
#include "common/sockaddr.h"
#include "common/hattrie/hat-trie.h"
#include "common-knot/sockaddr.h"
#include "common-knot/hattrie/hat-trie.h"
#include "knot/nameserver/query_module.h"
/* Constants. */
......
......@@ -23,8 +23,8 @@
#include "knot/other/debug.h"
#include "knot/conf/logconf.h"
#include "knot/conf/conf.h"
#include "common/log.h"
#include "common/lists.h"
#include "common-knot/log.h"
#include "common-knot/lists.h"
#include "knot/knot.h"
int log_reconfigure(const struct conf_t *conf, void *data)
......
......@@ -16,8 +16,8 @@
#include <sys/stat.h>
#include "knot/ctl/remote.h"
#include "common/log.h"
#include "common/fdset.h"
#include "common-knot/log.h"
#include "common-knot/fdset.h"
#include "knot/knot.h"
#include "knot/conf/conf.h"
#include "knot/server/net.h"
......
......@@ -23,7 +23,7 @@
#include "common/base32hex.h"
#include "common/debug.h"
#include "libknot/descriptor.h"
#include "common/hhash.h"
#include "common-knot/hhash.h"
#include "libknot/dnssec/bitmap.h"
#include "libknot/util/utils.h"
#include "libknot/packet/wire.h"
......
......@@ -23,7 +23,7 @@
#include "common/debug.h"
#include "libknot/descriptor.h"
#include "libknot/errcode.h"
#include "common/hattrie/hat-trie.h"
#include "common-knot/hattrie/hat-trie.h"
#include "libknot/common.h"
#include "libknot/dname.h"
#include "libknot/rrset.h"
......
......@@ -30,8 +30,8 @@
#include <signal.h>
#include <stdint.h>
#include "common/print.h"
#include "common/log.h"
#include "common-knot/print.h"
#include "common-knot/log.h"
#include "libknot/errcode.h"
#include "knot/other/debug.h"
......
......@@ -22,7 +22,7 @@
#include "knot/zone/zonefile.h"
#include "common/debug.h"
#include "libknot/descriptor.h"
#include "common/lists.h"
#include "common-knot/lists.h"
/* AXFR context. @note aliasing the generic xfr_proc */
struct axfr_proc {
......
......@@ -27,7 +27,7 @@
#include "libknot/common.h"
#include "libknot/packet/wire.h"
#include "knot/updates/acl.h"
#include "common/evsched.h"
#include "common-knot/evsched.h"
#include "knot/other/debug.h"
#include "knot/server/server.h"
#include "knot/nameserver/internet.h"
......
......@@ -41,7 +41,7 @@
#ifndef _QUERY_MODULE_H
#define _QUERY_MODULE_H
#include "common/lists.h"
#include "common-knot/lists.h"
#include "libknot/mempattern.h"
#include "libknot/consts.h"
#include "libknot/packet/pkt.h"
......
......@@ -18,7 +18,7 @@
#include "knot/nameserver/process_query.h"
#include "knot/nameserver/process_answer.h"
#include "common/lists.h"
#include "common-knot/lists.h"
struct request;
......
......@@ -48,8 +48,8 @@
#define KNOTD_SEMCHECK_DEBUG
#endif
#include "common/log.h"
#include "common/print.h"
#include "common-knot/log.h"
#include "common-knot/print.h"
/******************************************************************************/
......
......@@ -31,7 +31,7 @@
#include "knot/knot.h"
#include "knot/server/dthreads.h"
#include "common/log.h"
#include "common-knot/log.h"
/* BSD cpu set compatibility. */
#if defined(HAVE_CPUSET_BSD)
......
......@@ -24,7 +24,7 @@
#include <sys/mman.h>
#include <assert.h>
#include "common/crc.h"
#include "common-knot/crc.h"
#include "libknot/common.h"
#include "knot/other/debug.h"
#include "knot/server/journal.h"
......
......@@ -30,7 +30,7 @@
#define _KNOTD_NET_H_
/* POSIX only. */
#include "common/sockaddr.h"
#include "common-knot/sockaddr.h"
/*!
* \brief Create unbound socket of given family and type.
......
......@@ -24,10 +24,10 @@
#include "knot/knot.h"
#include "libknot/consts.h"
#include "libknot/packet/wire.h"
#include "common/hattrie/murmurhash3.h"
#include "common-knot/hattrie/murmurhash3.h"
#include "libknot/dnssec/random.h"
#include "libknot/descriptor.h"
#include "common/errors.h"
#include "common-knot/errors.h"
#include "knot/zone/zone.h"
/* Hopscotch defines. */
......
......@@ -29,7 +29,7 @@
#include <stdint.h>
#include <pthread.h>
#include "common/sockaddr.h"
#include "common-knot/sockaddr.h"
#include "libknot/packet/pkt.h"
/* Defaults */
......
......@@ -36,9 +36,9 @@
#ifndef _KNOTD_SERVER_H_
#define _KNOTD_SERVER_H_
#include "common/evsched.h"
#include "common/lists.h"
#include "common/fdset.h"
#include "common-knot/evsched.h"
#include "common-knot/lists.h"
#include "common-knot/fdset.h"
#include "knot/server/dthreads.h"
#include "knot/server/net.h"
#include "knot/server/rrl.h"
......
......@@ -31,9 +31,9 @@
#include <cap-ng.h>
#endif /* HAVE_CAP_NG_H */
#include "common/sockaddr.h"
#include "common/fdset.h"
#include "common/mempool.h"
#include "common-knot/sockaddr.h"
#include "common-knot/fdset.h"
#include "common-knot/mempool.h"
#include "knot/knot.h"
#include "knot/server/tcp-handler.h"
#include "libknot/packet/wire.h"
......
......@@ -36,9 +36,9 @@
#include <cap-ng.h>
#endif /* HAVE_CAP_NG_H */
#include "common/sockaddr.h"
#include "common-knot/sockaddr.h"
#include "libknot/mempattern.h"
#include "common/mempool.h"
#include "common-knot/mempool.h"
#include "knot/knot.h"
#include "knot/server/udp-handler.h"
#include "knot/server/server.h"
......
......@@ -30,8 +30,8 @@
#ifndef _KNOTD_ACL_H_
#define _KNOTD_ACL_H_
#include "common/lists.h"
#include "common/sockaddr.h"
#include "common-knot/lists.h"
#include "common-knot/sockaddr.h"
#include "libknot/mempattern.h"
#include "libknot/rrtype/tsig.h"
......
......@@ -26,7 +26,7 @@
#include "libknot/common.h"
#include "knot/updates/changesets.h"
#include "knot/zone/zonefile.h"
#include "common/lists.h"
#include "common-knot/lists.h"
#include "libknot/descriptor.h"
#include "libknot/util/utils.h"
#include "libknot/rrtype/soa.h"
......
......@@ -22,7 +22,7 @@
#include "libknot/common.h"
#include "libknot/descriptor.h"
#include "libknot/mempattern.h"
#include "common/mempool.h"
#include "common-knot/mempool.h"
#include "libknot/rrset.h"
#include "libknot/rrtype/soa.h"
#include "common/debug.h"
......
......@@ -29,7 +29,7 @@
#include "libknot/rrset.h"
#include "knot/zone/node.h"
#include "common/lists.h"
#include "common-knot/lists.h"
#include "libknot/mempattern.h"
/*----------------------------------------------------------------------------*/
......
......@@ -29,7 +29,7 @@
#include "libknot/rrtype/soa.h"
#include "libknot/mempattern.h"
#include "libknot/descriptor.h"
#include "common/lists.h"
#include "common-knot/lists.h"
/* ----------------------------- prereq check ------------------------------- */
......
......@@ -16,7 +16,7 @@
#include <config.h>
#include "common/lists.h"
#include "common-knot/lists.h"
#include "knot/worker/queue.h"
#include "knot/worker/task.h"
......
......@@ -16,7 +16,7 @@
#pragma once
#include "common/lists.h"
#include "common-knot/lists.h"
#include "knot/worker/task.h"
/*!
......
......@@ -21,7 +21,7 @@
#include "libknot/rrset.h"
#include "common/base32hex.h"
#include "libknot/descriptor.h"
#include "common/hattrie/hat-trie.h"
#include "common-knot/hattrie/hat-trie.h"
#include "knot/dnssec/zone-nsec.h"
#include "knot/dnssec/zone-sign.h"
#include "knot/zone/zone-tree.h"
......
......@@ -26,7 +26,7 @@
#pragma once
#include "common/lists.h"
#include "common-knot/lists.h"
#include "libknot/rrtype/nsec3param.h"
#include "knot/zone/node.h"
#include "knot/zone/zone-tree.h"
......
......@@ -18,7 +18,7 @@
#include "knot/zone/estimator.h"
#include "libknot/dname.h"
#include "common/lists.h"
#include "common-knot/lists.h"
#include "knot/zone/node.h"
#include "zscanner/zscanner.h"
#include "libknot/descriptor.h"
......
......@@ -27,7 +27,7 @@
#ifndef _KNOT_ESTIMATOR_H_
#define _KNOT_ESTIMATOR_H_
#include "common/hattrie/hat-trie.h"
#include "common-knot/hattrie/hat-trie.h"
#include "zscanner/zscanner.h"
// Mutiplicative constant, needed because of malloc's fragmentation
......
......@@ -17,8 +17,8 @@
#include <assert.h>
#include <time.h>
#include "common/evsched.h"
#include "common/mempool.h"
#include "common-knot/evsched.h"
#include "common-knot/mempool.h"
#include "knot/server/server.h"
#include "knot/server/udp-handler.h"
#include "knot/server/tcp-handler.h"
......
......@@ -19,7 +19,7 @@
#include <pthread.h>
#include <stdbool.h>
#include "common/evsched.h"
#include "common-knot/evsched.h"
#include "knot/worker/pool.h"
#include "knot/worker/task.h"
......
......@@ -31,7 +31,7 @@
#include "libknot/rrtype/nsec.h"
#include "libknot/rrtype/nsec3.h"
#include "common/base32hex.h"
#include "common/crc.h"
#include "common-knot/crc.h"
#include "libknot/descriptor.h"
#include "libknot/mempattern.h"
#include "knot/dnssec/zone-nsec.h"
......
......@@ -14,7 +14,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "common/log.h"
#include "common-knot/log.h"
#include "knot/server/journal.h"
#include "knot/zone/zone-diff.h"
#include "knot/zone/zone-load.h"
......
......@@ -21,7 +21,7 @@
#include "knot/zone/zone-tree.h"
#include "knot/zone/node.h"
#include "common/debug.h"
#include "common/hattrie/hat-trie.h"
#include "common-knot/hattrie/hat-trie.h"
/*----------------------------------------------------------------------------*/
/* API functions */
......
......@@ -29,7 +29,7 @@
#ifndef _KNOT_ZONE_TREE_H_
#define _KNOT_ZONE_TREE_H_
#include "common/hattrie/hat-trie.h"
#include "common-knot/hattrie/hat-trie.h"
#include "knot/zone/node.h"
/*----------------------------------------------------------------------------*/
......
......@@ -20,8 +20,8 @@
#include <sys/stat.h>
#include "libknot/descriptor.h"
#include "common/evsched.h"
#include "common/lists.h"
#include "common-knot/evsched.h"
#include "common-knot/lists.h"
#include "knot/zone/node.h"
#include "knot/zone/zone.h"
#include "knot/zone/zonefile.h"
......
......@@ -28,8 +28,8 @@
#include <stdbool.h>
#include <stdint.h>
#include "common/evsched.h"
#include "common/ref.h"
#include "common-knot/evsched.h"
#include "common-knot/ref.h"
#include "knot/conf/conf.h"
#include "knot/server/journal.h"
#include "knot/updates/acl.h"
......
......@@ -29,7 +29,7 @@
#include "knot/zone/node.h"
#include "common/debug.h"
#include "libknot/mempattern.h"
#include "common/mempool.h"
#include "common-knot/mempool.h"
/*----------------------------------------------------------------------------*/
......
......@@ -34,7 +34,7 @@
#include "knot/zone/zone.h"
#include "knot/zone/contents.h"
#include "libknot/dname.h"
#include "common/hhash.h"
#include "common-knot/hhash.h"
/*
* Zone DB represents a list of managed zones.
......
......@@ -26,7 +26,7 @@
#include <unistd.h>
#include <inttypes.h>
#include "common/crc.h"
#include "common-knot/crc.h"
#include "libknot/common.h"
#include "knot/zone/semantic-check.h"
#include "knot/zone/contents.h"
......
......@@ -15,7 +15,7 @@
*/
#include "libknot/errcode.h"
#include "common/errors.h"
#include "common-knot/errors.h"
const error_table_t knot_error_msgs[] = {
{ KNOT_EOK, "OK" },
......
......@@ -28,7 +28,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef _KNOTD_COMMON_ERRCODE_H_
#define _KNOTD_COMMON_ERRCODE_H_
#include "common/errors.h"
#include "common-knot/errors.h"
/* errno -> Knot error mapping.
* \note offset is required, otherwise it would interfere with TSIG errors.
......
......@@ -24,9 +24,9 @@
#endif /* HAVE_MALLOC_TRIM */
#include "libknot/mempattern.h"
#include "common/log.h"
#include "common/slab/alloc-common.h"
#include "common/mempool.h"
#include "common-knot/log.h"
#include "common-knot/slab/alloc-common.h"
#include "common-knot/mempool.h"
static void *mm_malloc(void *ctx, size_t n)
{
......
......@@ -22,11 +22,11 @@
#include <netinet/in.h> // sockaddr_in (BSD)
#include "libknot/libknot.h"
#include "common/lists.h" // list
#include "common/print.h" // time_diff
#include "common-knot/lists.h" // list
#include "common-knot/print.h" // time_diff
#include "libknot/errcode.h" // KNOT_EOK
#include "libknot/descriptor.h" // KNOT_RRTYPE_
#include "common/sockaddr.h" // sockaddr_set_raw
#include "common-knot/sockaddr.h" // sockaddr_set_raw
#include "utils/common/msg.h" // WARN
#include "utils/common/netio.h" // get_socktype
#include "utils/common/exec.h" // print_packet
......
......@@ -22,7 +22,7 @@
#include <stdlib.h> // free
#include <locale.h> // setlocale
#include "common/lists.h" // list
#include "common-knot/lists.h" // list
#include "libknot/errcode.h" // KNOT_EOK
#include "libknot/descriptor.h" // KNOT_CLASS_IN
#include "utils/common/msg.h" // WARN
......
......@@ -22,7 +22,7 @@
#include <stdlib.h> // free
#include <locale.h> // setlocale
#include "common/lists.h" // list
#include "common-knot/lists.h" // list
#include "libknot/errcode.h" // KNOT_EOK
#include "libknot/descriptor.h" // KNOT_CLASS_IN
#include "utils/common/msg.h" // WARN
......
......@@ -24,8 +24,8 @@
#include "utils/common/params.h"
#include "common/base32hex.h"
#include "libknot/errcode.h"
#include "common/hex.h"
#include "common/strtonum.h"
#include "common-knot/hex.h"
#include "common-knot/strtonum.h"
#include "libknot/dnssec/crypto.h"
#define PROGRAM_NAME "knsec3hash"
......
......@@ -26,7 +26,7 @@
#include "libknot/errcode.h"
#include "libknot/descriptor.h"
#include "libknot/mempattern.h"
#include "common/mempool.h"
#include "common-knot/mempool.h"
#include "libknot/libknot.h"
#define DEFAULT_RETRIES_NSUPDATE 3
......
......@@ -30,7 +30,7 @@
#include <stdint.h>
#include "libknot/libknot.h"
#include "common/lists.h" // list
#include "common-knot/lists.h" // list
#include "zscanner/zscanner.h" // zs_scanner_t
#include "utils/common/netio.h" // server_t
#include "utils/common/params.h" // protocol_t
......