Commit 3a9f15e9 authored by Lubos Slovak's avatar Lubos Slovak

public-libs: Moved common/ to libknot/internal/

parent f31e8ad8
......@@ -39,46 +39,6 @@ src/common-knot/strlcat.c
src/common-knot/strlcat.h
src/common-knot/strtonum.h
src/common-knot/trim.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/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/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/trie/hat-trie.c
src/common/trie/hat-trie.h
src/common/trie/murmurhash3.c
src/common/trie/murmurhash3.h
src/dnstap/Makefile.am
src/dnstap/convert.c
src/dnstap/convert.h
......@@ -206,6 +166,46 @@ src/knot/zone/zonedb.c
src/knot/zone/zonedb.h
src/knot/zone/zonefile.c
src/knot/zone/zonefile.h
src/libknot/internal/array-sort.h
src/libknot/internal/base32hex.c
src/libknot/internal/base32hex.h
src/libknot/internal/base64.c
src/libknot/internal/base64.h
src/libknot/internal/binsearch.h
src/libknot/internal/debug.h
src/libknot/internal/errors.c
src/libknot/internal/errors.h
src/libknot/internal/getline.c
src/libknot/internal/getline.h
src/libknot/internal/hhash.c
src/libknot/internal/hhash.h
src/libknot/internal/lists.c
src/libknot/internal/lists.h
src/libknot/internal/log.c
src/libknot/internal/log.h
src/libknot/internal/mem.c
src/libknot/internal/mem.h
src/libknot/internal/mempattern.c
src/libknot/internal/mempattern.h
src/libknot/internal/mempool.c
src/libknot/internal/mempool.h
src/libknot/internal/namedb/namedb.h
src/libknot/internal/namedb/namedb_lmdb.c
src/libknot/internal/namedb/namedb_lmdb.h
src/libknot/internal/namedb/namedb_trie.c
src/libknot/internal/namedb/namedb_trie.h
src/libknot/internal/net.c
src/libknot/internal/net.h
src/libknot/internal/print.c
src/libknot/internal/print.h
src/libknot/internal/sockaddr.c
src/libknot/internal/sockaddr.h
src/libknot/internal/strlcpy.c
src/libknot/internal/strlcpy.h
src/libknot/internal/trie/hat-trie.c
src/libknot/internal/trie/hat-trie.h
src/libknot/internal/trie/murmurhash3.c
src/libknot/internal/trie/murmurhash3.h
src/libknot/binary.c
src/libknot/binary.h
src/libknot/common.h
......
......@@ -80,46 +80,47 @@ libknots_la_SOURCES = \
# 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/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.c \
common/namedb/namedb_lmdb.h \
common/namedb/namedb_trie.c \
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
libknot/internal/array-sort.h \
libknot/internal/base32hex.c \
libknot/internal/base32hex.h \
libknot/internal/base64.c \
libknot/internal/base64.h \
libknot/internal/binsearch.h \
libknot/internal/debug.h \
libknot/internal/errors.c \
libknot/internal/errors.h \
libknot/internal/getline.c \
libknot/internal/getline.h \
libknot/internal/hhash.c \
libknot/internal/hhash.h \
libknot/internal/lists.c \
libknot/internal/lists.h \
libknot/internal/log.c \
libknot/internal/log.h \
libknot/internal/mem.c \
libknot/internal/mem.h \
libknot/internal/mempattern.c \
libknot/internal/mempattern.h \
libknot/internal/mempool.c \
libknot/internal/mempool.h \
libknot/internal/namedb/namedb.h \
libknot/internal/namedb/namedb_lmdb.c \
libknot/internal/namedb/namedb_lmdb.h \
libknot/internal/namedb/namedb_trie.c \
libknot/internal/namedb/namedb_trie.h \
libknot/internal/net.c \
libknot/internal/net.h \
libknot/internal/print.c \
libknot/internal/print.h \
libknot/internal/sockaddr.c \
libknot/internal/sockaddr.h \
libknot/internal/strlcpy.c \
libknot/internal/strlcpy.h \
libknot/internal/trie/hat-trie.c \
libknot/internal/trie/hat-trie.h \
libknot/internal/trie/murmurhash3.c \
libknot/internal/trie/murmurhash3.h
# static: utilities shared
libknotus_la_SOURCES = \
......
......@@ -33,11 +33,11 @@
#include <sys/stat.h>
#include <sys/types.h>
#include "common/sockaddr.h"
#include "libknot/internal/sockaddr.h"
#include "knot/conf/conf.h"
#include "knot/conf/includes.h"
#include "knot/conf/extra.h"
#include "common/log.h"
#include "libknot/internal/log.h"
#include "libknotd_la-cf-parse.h" /* Automake generated header. */
/* Imported symbols. */
......
......@@ -30,9 +30,9 @@
#include <stdlib.h>
#include <pwd.h>
#include <grp.h>
#include "common/sockaddr.h"
#include "libknot/internal/sockaddr.h"
#include "common-knot/strlcat.h"
#include "common/strlcpy.h"
#include "libknot/internal/strlcpy.h"
#include "libknot/dname.h"
#include "libknot/binary.h"
#include "libknot/rrtype/opt.h"
......
......@@ -26,8 +26,8 @@
#include <urcu.h>
#include "common-knot/strlcat.h"
#include "common/strlcpy.h"
#include "common/mem.h"
#include "libknot/internal/strlcpy.h"
#include "libknot/internal/mem.h"
#include "knot/conf/conf.h"
#include "knot/conf/extra.h"
#include "knot/knot.h"
......
......@@ -37,12 +37,12 @@
#include "libknot/rrtype/tsig.h"
#include "libknot/dnssec/key.h"
#include "libknot/dnssec/policy.h"
#include "common/lists.h"
#include "common/namedb/namedb.h"
#include "common/log.h"
#include "libknot/internal/lists.h"
#include "libknot/internal/namedb/namedb.h"
#include "libknot/internal/log.h"
#include "knot/updates/acl.h"
#include "common/sockaddr.h"
#include "common/trie/hat-trie.h"
#include "libknot/internal/sockaddr.h"
#include "libknot/internal/trie/hat-trie.h"
#include "knot/nameserver/query_module.h"
/* Constants. */
......
......@@ -18,8 +18,8 @@
#include "knot/ctl/estimator.h"
#include "libknot/dname.h"
#include "common/lists.h"
#include "common/mem.h"
#include "libknot/internal/lists.h"
#include "libknot/internal/mem.h"
#include "knot/zone/node.h"
#include "libknot/descriptor.h"
......
......@@ -26,7 +26,7 @@
#pragma once
#include "common/trie/hat-trie.h"
#include "libknot/internal/trie/hat-trie.h"
#include "zscanner/scanner.h"
// Mutiplicative constant, needed because of malloc's fragmentation
......
......@@ -26,7 +26,7 @@
#endif
#include "knot/knot.h"
#include "common/mem.h"
#include "libknot/internal/mem.h"
#include "libknot/descriptor.h"
#include "knot/ctl/process.h"
#include "knot/ctl/remote.h"
......
......@@ -29,7 +29,7 @@
#include <sys/types.h>
#include <pwd.h>
#include "common/mem.h"
#include "libknot/internal/mem.h"
#include "knot/knot.h"
#include "knot/ctl/process.h"
#include "knot/conf/conf.h"
......
......@@ -17,16 +17,16 @@
#include <assert.h>
#include <sys/stat.h>
#include "knot/ctl/remote.h"
#include "common/log.h"
#include "common/mem.h"
#include "libknot/internal/log.h"
#include "libknot/internal/mem.h"
#include "common-knot/fdset.h"
#include "knot/knot.h"
#include "knot/conf/conf.h"
#include "common/net.h"
#include "libknot/internal/net.h"
#include "knot/server/tcp-handler.h"
#include "libknot/packet/wire.h"
#include "libknot/descriptor.h"
#include "common/strlcpy.h"
#include "libknot/internal/strlcpy.h"
#include "libknot/tsig-op.h"
#include "libknot/rrtype/rdname.h"
#include "libknot/rrtype/soa.h"
......
......@@ -17,7 +17,7 @@
#include <assert.h>
#include <stdint.h>
#include "common/debug.h"
#include "libknot/internal/debug.h"
#include "knot/dnssec/nsec-chain.h"
#include "knot/dnssec/zone-sign.h"
#include "libknot/dnssec/rrset-sign.h"
......
......@@ -16,7 +16,7 @@
#include <assert.h>
#include "common/base32hex.h"
#include "libknot/internal/base32hex.h"
#include "knot/dnssec/nsec3-chain.h"
#include "libknot/dname.h"
#include "libknot/packet/wire.h"
......
......@@ -17,14 +17,14 @@
#include <assert.h>
#include <time.h>
#include "common/mem.h"
#include "libknot/internal/mem.h"
#include "knot/conf/conf.h"
#include "libknot/dnssec/policy.h"
#include "knot/dnssec/zone-events.h"
#include "knot/dnssec/zone-keys.h"
#include "knot/dnssec/zone-nsec.h"
#include "knot/dnssec/zone-sign.h"
#include "common/debug.h"
#include "libknot/internal/debug.h"
#include "knot/zone/zone.h"
static int init_dnssec_structs(const zone_contents_t *zone,
......
......@@ -19,8 +19,8 @@
#include <stdbool.h>
#include <inttypes.h>
#include "common/debug.h"
#include "common/mem.h"
#include "libknot/internal/debug.h"
#include "libknot/internal/mem.h"
#include "libknot/errcode.h"
#include "libknot/common.h"
#include "libknot/dname.h"
......
......@@ -30,7 +30,7 @@
#include <stdbool.h>
#include <stdint.h>
#include "common/lists.h"
#include "libknot/internal/lists.h"
#include "libknot/dname.h"
#include "libknot/dnssec/sign.h"
......
......@@ -20,8 +20,8 @@
#include <string.h>
#include <limits.h>
#include "common/base32hex.h"
#include "common/debug.h"
#include "libknot/internal/base32hex.h"
#include "libknot/internal/debug.h"
#include "libknot/descriptor.h"
#include "libknot/dnssec/bitmap.h"
#include "libknot/util/utils.h"
......
......@@ -20,10 +20,10 @@
#include <sys/types.h>
#include <time.h>
#include "common/debug.h"
#include "libknot/internal/debug.h"
#include "libknot/descriptor.h"
#include "libknot/errcode.h"
#include "common/trie/hat-trie.h"
#include "libknot/internal/trie/hat-trie.h"
#include "libknot/common.h"
#include "libknot/dname.h"
#include "libknot/rrset.h"
......
......@@ -29,8 +29,8 @@
#include <signal.h>
#include <stdint.h>
#include "common/print.h"
#include "common/log.h"
#include "libknot/internal/print.h"
#include "libknot/internal/log.h"
#include "libknot/errcode.h"
#include "knot/other/debug.h"
......
......@@ -20,9 +20,9 @@
#include "knot/nameserver/process_answer.h"
#include "knot/updates/apply.h"
#include "knot/zone/zonefile.h"
#include "common/debug.h"
#include "libknot/internal/debug.h"
#include "libknot/descriptor.h"
#include "common/lists.h"
#include "libknot/internal/lists.h"
/* AXFR context. @note aliasing the generic xfr_proc */
struct axfr_proc {
......
......@@ -14,7 +14,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "common/debug.h"
#include "libknot/internal/debug.h"
#include "libknot/descriptor.h"
#include "libknot/common.h"
#include "libknot/rrtype/rdname.h"
......
......@@ -20,7 +20,7 @@
#include "knot/nameserver/process_query.h"
#include "knot/nameserver/process_answer.h"
#include "knot/updates/apply.h"
#include "common/debug.h"
#include "libknot/internal/debug.h"
#include "libknot/descriptor.h"
#include "libknot/util/utils.h"
#include "libknot/rrtype/soa.h"
......
......@@ -32,7 +32,7 @@
#include "knot/other/debug.h"
#include "knot/server/server.h"
#include "knot/nameserver/internet.h"
#include "common/debug.h"
#include "libknot/internal/debug.h"
#include "knot/nameserver/process_query.h"
#include "knot/nameserver/tsig_ctx.h"
#include "knot/nameserver/process_answer.h"
......
......@@ -4,7 +4,7 @@
#include "knot/dnssec/zone-nsec.h"
#include "libknot/common.h"
#include "common/debug.h"
#include "libknot/internal/debug.h"
#define DNSSEC_ENABLED 1
......
......@@ -15,7 +15,7 @@
#include "knot/conf/conf.h"
#include "libknot/tsig-op.h"
#include "libknot/descriptor.h"
#include "common/debug.h"
#include "libknot/internal/debug.h"
/*! \brief Accessor to query-specific data. */
#define QUERY_DATA(ctx) ((struct query_data *)(ctx)->data)
......
#include "knot/nameserver/query_module.h"
#include "common/mempattern.h"
#include "libknot/internal/mempattern.h"
#include "libknot/errcode.h"
#include "common/strlcpy.h"
#include "libknot/internal/strlcpy.h"
/* Compiled-in module headers. */
#include "knot/modules/synth_record.h"
......
......@@ -40,8 +40,8 @@
#pragma once
#include "common/lists.h"
#include "common/mempattern.h"
#include "libknot/internal/lists.h"
#include "libknot/internal/mempattern.h"
#include "libknot/consts.h"
#include "libknot/packet/pkt.h"
......
......@@ -19,7 +19,7 @@
#include "knot/nameserver/process_query.h"
#include "knot/updates/apply.h"
#include "knot/dnssec/zone-sign.h"
#include "common/debug.h"
#include "libknot/internal/debug.h"
#include "knot/dnssec/zone-events.h"
#include "knot/updates/ddns.h"
#include "knot/updates/zone-update.h"
......
......@@ -38,8 +38,8 @@
#define KNOTD_SEMCHECK_DEBUG
#endif
#include "common/log.h"
#include "common/print.h"
#include "libknot/internal/log.h"
#include "libknot/internal/print.h"
/******************************************************************************/
......
......@@ -31,7 +31,7 @@
#include "knot/knot.h"
#include "knot/server/dthreads.h"
#include "common/log.h"
#include "libknot/internal/log.h"
/* BSD cpu set compatibility. */
#if defined(HAVE_CPUSET_BSD)
......
......@@ -24,10 +24,10 @@
#include "knot/knot.h"
#include "libknot/consts.h"
#include "libknot/packet/wire.h"
#include "common/trie/murmurhash3.h"
#include "libknot/internal/trie/murmurhash3.h"
#include "libknot/dnssec/random.h"
#include "libknot/descriptor.h"
#include "common/errors.h"
#include "libknot/internal/errors.h"
#include "knot/zone/zone.h"
/* Hopscotch defines. */
......
......@@ -28,7 +28,7 @@
#include <stdint.h>
#include <pthread.h>
#include "common/sockaddr.h"
#include "libknot/internal/sockaddr.h"
#include "libknot/packet/pkt.h"
/* Defaults */
......
......@@ -30,9 +30,9 @@
#pragma once
#include "common-knot/evsched.h"
#include "common/lists.h"
#include "libknot/internal/lists.h"
#include "common-knot/fdset.h"
#include "common/net.h"
#include "libknot/internal/net.h"
#include "knot/server/dthreads.h"
#include "knot/server/rrl.h"
#include "knot/worker/pool.h"
......
......@@ -31,10 +31,10 @@
#include <cap-ng.h>
#endif /* HAVE_CAP_NG_H */
#include "common/sockaddr.h"
#include "libknot/internal/sockaddr.h"
#include "common-knot/fdset.h"
#include "common/mempool.h"
#include "common/net.h"
#include "libknot/internal/mempool.h"
#include "libknot/internal/net.h"
#include "libknot/packet/wire.h"
#include "libknot/dnssec/crypto.h"
......
......@@ -36,9 +36,9 @@
#include <cap-ng.h>
#endif /* HAVE_CAP_NG_H */
#include "common/sockaddr.h"
#include "common/mempattern.h"
#include "common/mempool.h"
#include "libknot/internal/sockaddr.h"
#include "libknot/internal/mempattern.h"
#include "libknot/internal/mempool.h"
#include "knot/knot.h"
#include "knot/server/udp-handler.h"
#include "knot/server/server.h"
......
......@@ -29,9 +29,9 @@
#pragma once
#include "common/lists.h"
#include "common/sockaddr.h"
#include "common/mempattern.h"
#include "libknot/internal/lists.h"
#include "libknot/internal/sockaddr.h"
#include "libknot/internal/mempattern.h"
#include "libknot/rrtype/tsig.h"
struct conf_iface_t;
......
......@@ -22,7 +22,7 @@
#include "libknot/common.h"
#include "knot/updates/changesets.h"
#include "knot/zone/zonefile.h"
#include "common/lists.h"
#include "libknot/internal/lists.h"
#include "libknot/rrtype/soa.h"
#include "libknot/rrtype/rrsig.h"
......
......@@ -28,7 +28,7 @@
#include "libknot/rrset.h"
#include "knot/zone/contents.h"
#include "common/lists.h"
#include "libknot/internal/lists.h"
/*! \brief One zone change, from 'soa_from' to 'soa_to'. */
typedef struct {
......
......@@ -25,9 +25,9 @@
#include "libknot/common.h"
#include "libknot/consts.h"
#include "libknot/rrtype/soa.h"
#include "common/mempattern.h"
#include "libknot/internal/mempattern.h"
#include "libknot/descriptor.h"
#include "common/lists.h"
#include "libknot/internal/lists.h"
/* ----------------------------- prereq check ------------------------------- */
......
......@@ -15,8 +15,8 @@
*/
#include "knot/updates/zone-update.h"
#include "common/lists.h"
#include "common/mempool.h"
#include "libknot/internal/lists.h"
#include "libknot/internal/mempool.h"
static int add_to_node(zone_node_t *node, const zone_node_t *add_node,
knot_mm_ctx_t *mm)
......
......@@ -28,7 +28,7 @@
#include "knot/updates/changesets.h"
#include "knot/zone/contents.h"
#include "common/mempattern.h"
#include "libknot/internal/mempattern.h"
/*! \brief Structure for zone contents updating / querying \todo to be moved to new ZONE API */
typedef struct {
......
......@@ -16,7 +16,7 @@
#pragma once
#include "common/lists.h"
#include "libknot/internal/lists.h"
struct task;
typedef void (*task_cb)(struct task *);
......
......@@ -17,11 +17,11 @@
#include <assert.h>
#include "knot/zone/contents.h"
#include "common/debug.h"
#include "libknot/internal/debug.h"
#include "libknot/rrset.h"
#include "common/base32hex.h"
#include "libknot/internal/base32hex.h"
#include "libknot/descriptor.h"
#include "common/trie/hat-trie.h"
#include "libknot/internal/trie/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 "libknot/internal/lists.h"
#include "libknot/rrtype/nsec3param.h"
#include "knot/zone/node.h"
#include "knot/zone/zone-tree.h"
......
......@@ -19,7 +19,7 @@
#include "libknot/processing/requestor.h"
#include "common-knot/trim.h"
#include "common/mempool.h"
#include "libknot/internal/mempool.h"
#include "knot/server/udp-handler.h"
#include "knot/server/tcp-handler.h"
......
......@@ -23,7 +23,7 @@
#include "libknot/rdataset.h"
#include "libknot/rrtype/rrsig.h"
#include "libknot/descriptor.h"
#include "common/mempattern.h"
#include "libknot/internal/mempattern.h"
/*! \brief Clears allocated data in RRSet entry. */
static void rr_data_clear(struct rr_data *data, knot_mm_ctx_t *mm)
......
......@@ -30,10 +30,10 @@
#include "libknot/rrtype/soa.h"
#include "libknot/rrtype/nsec.h"
#include "libknot/rrtype/nsec3.h"
#include "common/base32hex.h"
#include "libknot/internal/base32hex.h"
#include "common-knot/crc.h"
#include "libknot/descriptor.h"
#include "common/mempattern.h"