Commit 62b6e6d0 authored by Jan Včelák's avatar Jan Včelák 🚀

move libknot/zone/* into knot/zone/

issue #1
parent 32593220
......@@ -121,12 +121,24 @@ src/knot/stat/stat.c
src/knot/stat/stat.h
src/knot/zone/estimator.c
src/knot/zone/estimator.h
src/knot/zone/node.c
src/knot/zone/node.h
src/knot/zone/semantic-check.c
src/knot/zone/semantic-check.h
src/knot/zone/zone-contents.c
src/knot/zone/zone-contents.h
src/knot/zone/zone-diff.c
src/knot/zone/zone-diff.h
src/knot/zone/zone-dump.c
src/knot/zone/zone-dump.h
src/knot/zone/zone-load.c
src/knot/zone/zone-load.h
src/knot/zone/zone-tree.c
src/knot/zone/zone-tree.h
src/knot/zone/zone.c
src/knot/zone/zone.h
src/knot/zone/zonedb.c
src/knot/zone/zonedb.h
src/libknot/binary.c
src/libknot/binary.h
src/libknot/common.h
......@@ -140,6 +152,10 @@ src/libknot/dnssec/crypto.h
src/libknot/dnssec/key.c
src/libknot/dnssec/key.h
src/libknot/dnssec/nsec-bitmap.h
src/libknot/dnssec/nsec-chain.c
src/libknot/dnssec/nsec-chain.h
src/libknot/dnssec/nsec3-chain.c
src/libknot/dnssec/nsec3-chain.h
src/libknot/dnssec/nsec3.c
src/libknot/dnssec/nsec3.h
src/libknot/dnssec/policy.c
......@@ -205,18 +221,6 @@ src/libknot/util/tolower.c
src/libknot/util/tolower.h
src/libknot/util/utils.c
src/libknot/util/utils.h
src/libknot/zone/node.c
src/libknot/zone/node.h
src/libknot/zone/zone-contents.c
src/libknot/zone/zone-contents.h
src/libknot/zone/zone-diff.c
src/libknot/zone/zone-diff.h
src/libknot/zone/zone-tree.c
src/libknot/zone/zone-tree.h
src/libknot/zone/zone.c
src/libknot/zone/zone.h
src/libknot/zone/zonedb.c
src/libknot/zone/zonedb.h
src/utils/common/exec.c
src/utils/common/exec.h
src/utils/common/msg.c
......@@ -297,7 +301,3 @@ tests/tap/macros.h
tests/wire.c
tests/zonedb.c
tests/ztree.c
src/libknot/dnssec/nsec-chain.c
src/libknot/dnssec/nsec3-chain.c
src/libknot/dnssec/nsec-chain.h
src/libknot/dnssec/nsec3-chain.h
......@@ -114,18 +114,6 @@ libknot_la_SOURCES = \
libknot/packet/compr.c \
libknot/packet/compr.h \
libknot/packet/wire.h \
libknot/zone/zone.c \
libknot/zone/zone-contents.c \
libknot/zone/zone-tree.c \
libknot/zone/zone-tree.h \
libknot/zone/node.h \
libknot/zone/zone.h \
libknot/zone/zone-contents.h \
libknot/zone/zonedb.c \
libknot/zone/zonedb.h \
libknot/zone/node.c \
libknot/zone/zone-diff.h \
libknot/zone/zone-diff.c \
libknot/nameserver/nsec_proofs.h \
libknot/nameserver/nsec_proofs.c \
libknot/nameserver/name-server.h \
......@@ -301,7 +289,19 @@ libknotd_la_SOURCES = \
knot/zone/zone-dump.c \
knot/zone/zone-dump.h \
knot/zone/zone-load.c \
knot/zone/zone-load.h
knot/zone/zone-load.h \
knot/zone/node.c \
knot/zone/node.h \
knot/zone/zone-contents.c \
knot/zone/zone-contents.h \
knot/zone/zone-diff.c \
knot/zone/zone-diff.h \
knot/zone/zone-tree.c \
knot/zone/zone-tree.h \
knot/zone/zone.c \
knot/zone/zone.h \
knot/zone/zonedb.c \
knot/zone/zonedb.h
libknotd_la_LIBADD = libknot.la libknots.la @LIBOBJS@
libknots_la_LIBADD = zscanner/libzscanner.la @LIBOBJS@
......
......@@ -24,7 +24,7 @@
#include "libknot/packet/pkt.h"
#include "libknot/rrset.h"
#include "libknot/consts.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zonedb.h"
#include "libknot/common.h"
#include "libknot/packet/wire.h"
#include "knot/server/zones.h"
......
......@@ -30,9 +30,9 @@
#include <stdint.h>
#include <string.h>
#include "libknot/zone/zone.h"
#include "knot/zone/zone.h"
#include "libknot/packet/pkt.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zonedb.h"
#include "common/lists.h"
#include "common/sockaddr.h"
#include "libknot/nameserver/name-server.h"
......
......@@ -31,7 +31,7 @@
#include <pthread.h>
#include "common/sockaddr.h"
#include "libknot/packet/pkt.h"
#include "libknot/zone/zone.h"
#include "knot/zone/zone.h"
/* Defaults */
#define RRL_SLIP_MAX 100
......
......@@ -31,7 +31,7 @@
#include "knot/conf/conf.h"
#include "knot/stat/stat.h"
#include "libknot/nameserver/name-server.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zonedb.h"
#include "libknot/dname.h"
#include "libknot/dnssec/crypto.h"
#include "libknot/dnssec/random.h"
......
......@@ -41,7 +41,7 @@
#include "knot/server/socket.h"
#include "knot/server/dthreads.h"
#include "knot/server/rrl.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zonedb.h"
#include "common/evsched.h"
#include "common/lists.h"
......
......@@ -29,9 +29,9 @@
#include "libknot/dnssec/random.h"
#include "libknot/nameserver/name-server.h"
#include "libknot/rdata.h"
#include "libknot/zone/zone.h"
#include "libknot/zone/zone.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zone.h"
#include "knot/zone/zone.h"
#include "knot/zone/zonedb.h"
#include "zscanner/descriptor.h"
static const size_t XFRIN_BOOTSTRAP_DELAY = 2000; /*!< AXFR bootstrap avg. delay */
......
......@@ -27,7 +27,7 @@
#include "knot/conf/conf.h"
#include "libknot/nameserver/name-server.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zonedb.h"
/*!
* \brief Update zone database according to configuration.
......
......@@ -39,10 +39,10 @@
#include "libknot/updates/ddns.h"
#include "libknot/updates/xfr-in.h"
#include "libknot/packet/wire.h"
#include "libknot/zone/zone-contents.h"
#include "libknot/zone/zone-diff.h"
#include "libknot/zone/zone.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zone-contents.h"
#include "knot/zone/zone-diff.h"
#include "knot/zone/zone.h"
#include "knot/zone/zonedb.h"
#include "zscanner/descriptor.h"
/* Forward declarations. */
......
......@@ -33,12 +33,12 @@
#include "common/acl.h"
#include "common/evsched.h"
#include "libknot/nameserver/name-server.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zonedb.h"
#include "knot/conf/conf.h"
#include "knot/server/notify.h"
#include "knot/server/server.h"
#include "knot/server/journal.h"
#include "libknot/zone/zone.h"
#include "knot/zone/zone.h"
#include "libknot/updates/xfr-in.h"
/* Constants. */
......
......@@ -20,7 +20,7 @@
#include "knot/zone/estimator.h"
#include "libknot/dname.h"
#include "common/lists.h"
#include "libknot/zone/node.h"
#include "knot/zone/node.h"
#include "zscanner/scanner.h"
#include "common/descriptor.h"
......
......@@ -22,7 +22,7 @@
#include <urcu.h>
#include "libknot/common.h"
#include "libknot/zone/node.h"
#include "knot/zone/node.h"
#include "libknot/rrset.h"
#include "common/descriptor.h"
#include "libknot/util/debug.h"
......@@ -98,7 +98,6 @@ knot_node_t *knot_node_new(const knot_dname_t *owner, knot_node_t *parent,
return ret;
}
int knot_node_add_rrset_no_merge(knot_node_t *node, knot_rrset_t *rrset)
{
if (node == NULL) {
......@@ -270,7 +269,6 @@ const knot_rrset_t **knot_node_rrsets_no_copy(const knot_node_t *node)
return (const knot_rrset_t **)knot_node_get_rrsets_no_copy(node);
}
/*----------------------------------------------------------------------------*/
const knot_node_t *knot_node_parent(const knot_node_t *node)
......@@ -682,4 +680,3 @@ int knot_node_shallow_copy(const knot_node_t *from, knot_node_t **to)
return KNOT_EOK;
}
......@@ -27,8 +27,8 @@
#ifndef _KNOT_SEMANTIC_CHECK_H_
#define _KNOT_SEMANTIC_CHECK_H_
#include "libknot/zone/node.h"
#include "libknot/zone/zone-contents.h"
#include "knot/zone/node.h"
#include "knot/zone/zone-contents.h"
/*!
*\brief Internal error constants. General errors are added for convenience,
......
......@@ -17,7 +17,7 @@
#include <config.h>
#include <assert.h>
#include "libknot/zone/zone-contents.h"
#include "knot/zone/zone-contents.h"
#include "libknot/util/debug.h"
#include "libknot/rrset.h"
#include "common/base32hex.h"
......@@ -25,7 +25,7 @@
#include "common/hattrie/hat-trie.h"
#include "libknot/dnssec/zone-nsec.h"
#include "libknot/dnssec/zone-sign.h"
#include "libknot/zone/zone-tree.h"
#include "knot/zone/zone-tree.h"
#include "libknot/packet/wire.h"
#include "libknot/consts.h"
#include "libknot/rdata.h"
......
......@@ -27,11 +27,11 @@
#ifndef _KNOT_ZONE_CONTENTS_H_
#define _KNOT_ZONE_CONTENTS_H_
#include "libknot/zone/node.h"
#include "knot/zone/node.h"
#include "libknot/dname.h"
#include "libknot/dnssec/nsec3.h"
#include "libknot/zone/zone-tree.h"
#include "knot/zone/zone-tree.h"
struct knot_zone;
......
......@@ -21,7 +21,7 @@
#include "libknot/util/debug.h"
#include "common/errcode.h"
#include "libknot/zone/zone-diff.h"
#include "knot/zone/zone-diff.h"
#include "libknot/nameserver/name-server.h"
#include "common/descriptor.h"
#include "libknot/rdata.h"
......
......@@ -19,7 +19,7 @@
#include <stdint.h>
#include "libknot/zone/zone-contents.h"
#include "knot/zone/zone-contents.h"
#include "libknot/updates/changesets.h"
/*!
......
......@@ -27,7 +27,7 @@
#ifndef _KNOTD_ZONEDUMP_H_
#define _KNOTD_ZONEDUMP_H_
#include "libknot/zone/zone.h"
#include "knot/zone/zone.h"
/*!
* \brief Dumps given zone to text file.
......
......@@ -30,7 +30,7 @@
#include "common/crc.h"
#include "libknot/common.h"
#include "knot/zone/semantic-check.h"
#include "libknot/zone/zone-contents.h"
#include "knot/zone/zone-contents.h"
#include "libknot/dnssec/zone-nsec.h"
#include "knot/other/debug.h"
#include "knot/zone/zone-load.h"
......
......@@ -29,7 +29,7 @@
#include <stdio.h>
#include "libknot/zone/zone.h"
#include "knot/zone/zone.h"
#include "knot/zone/semantic-check.h"
#include "zscanner/zscanner.h"
......
......@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <stdio.h>
#include "libknot/zone/node.h"
#include "knot/zone/node.h"
#include "libknot/util/debug.h"
#include "common/hattrie/hat-trie.h"
......
......@@ -30,7 +30,7 @@
#define _KNOT_ZONE_TREE_H_
#include "common/hattrie/hat-trie.h"
#include "libknot/zone/node.h"
#include "knot/zone/node.h"
/*----------------------------------------------------------------------------*/
......
......@@ -22,12 +22,12 @@
#include <urcu.h>
#include "libknot/common.h"
#include "libknot/zone/zone.h"
#include "libknot/zone/node.h"
#include "knot/zone/zone.h"
#include "knot/zone/node.h"
#include "libknot/dname.h"
#include "libknot/util/debug.h"
#include "libknot/util/utils.h"
#include "libknot/zone/zone-contents.h"
#include "knot/zone/zone-contents.h"
/*! \brief Adaptor for knot_zone_deep_free() */
static void knot_zone_dtor(struct ref_t *p) {
......
......@@ -29,14 +29,14 @@
#include <time.h>
#include "libknot/zone/node.h"
#include "knot/zone/node.h"
#include "libknot/dname.h"
#include "libknot/dnssec/nsec3.h"
#include "common/ref.h"
#include "libknot/zone/zone-tree.h"
#include "knot/zone/zone-tree.h"
#include "libknot/zone/zone-contents.h"
#include "knot/zone/zone-contents.h"
/*----------------------------------------------------------------------------*/
/*!
......
......@@ -21,11 +21,11 @@
#include <urcu.h>
#include "libknot/common.h"
#include "libknot/zone/zone.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zone.h"
#include "knot/zone/zonedb.h"
#include "libknot/dname.h"
#include "libknot/packet/wire.h"
#include "libknot/zone/node.h"
#include "knot/zone/node.h"
#include "libknot/util/debug.h"
#include "common/mempattern.h"
#include "common/mempool.h"
......@@ -86,7 +86,7 @@ int knot_zonedb_del(knot_zonedb_t *db, const knot_dname_t *zone_name)
if (db == NULL || zone_name == NULL) {
return KNOT_EINVAL;
}
/* Can't guess maximum label count now. */
db->maxlabels = KNOT_DNAME_MAXLABELS;
/* Attempt to remove zone. */
......@@ -152,7 +152,7 @@ knot_zone_t *knot_zonedb_find_suffix(knot_zonedb_t *db, const knot_dname_t *dnam
if (db == NULL || dname == NULL) {
return NULL;
}
/* We know we have at most N label zones, so let's compare only those
* N last labels. */
int zone_labels = knot_dname_labels(dname, NULL);
......@@ -183,7 +183,7 @@ knot_zone_t *knot_zonedb_find_suffix(knot_zonedb_t *db, const knot_dname_t *dnam
knot_zone_contents_t *knot_zonedb_expire_zone(knot_zonedb_t *db,
const knot_dname_t *zone_name)
{
if (db == NULL || zone_name == NULL) {
return NULL;
}
......
......@@ -30,8 +30,8 @@
#ifndef _KNOT_ZONEDB_H_
#define _KNOT_ZONEDB_H_
#include "libknot/zone/zone.h"
#include "libknot/zone/node.h"
#include "knot/zone/zone.h"
#include "knot/zone/node.h"
#include "libknot/dname.h"
#include "common/hhash.h"
......
......@@ -30,7 +30,7 @@
#include <stdint.h>
#include <string.h>
#include <limits.h>
#include "libknot/zone/node.h"
#include "knot/zone/node.h"
#include "libknot/rrset.h"
#include "common/descriptor.h"
......
......@@ -31,7 +31,7 @@
#include <stdbool.h>
#include <stdint.h>
#include "libknot/zone/zone-contents.h"
#include "knot/zone/zone-contents.h"
#include "libknot/updates/changesets.h"
/*!
......
......@@ -21,8 +21,8 @@
#include "libknot/dname.h"
#include "libknot/rdata.h"
#include "libknot/packet/wire.h"
#include "libknot/zone/zone-contents.h"
#include "libknot/zone/zone-diff.h"
#include "knot/zone/zone-contents.h"
#include "knot/zone/zone-diff.h"
#include "libknot/dnssec/nsec-chain.h"
#include "libknot/dnssec/zone-sign.h"
#include "libknot/dnssec/zone-nsec.h"
......
......@@ -25,7 +25,7 @@
#include "libknot/dnssec/zone-nsec.h"
#include "libknot/dnssec/zone-sign.h"
#include "libknot/util/debug.h"
#include "libknot/zone/zone.h"
#include "knot/zone/zone.h"
static int init_dnssec_structs(const knot_zone_t *zone,
knot_zone_keys_t *zone_keys,
......
......@@ -28,7 +28,7 @@
#ifndef _KNOT_DNSSEC_ZONE_EVENTS_H_
#define _KNOT_DNSSEC_ZONE_EVENTS_H_
#include "libknot/zone/zone.h"
#include "knot/zone/zone.h"
#include "libknot/updates/changesets.h"
#include "libknot/dnssec/policy.h"
/*!
......
......@@ -34,8 +34,8 @@
#include "libknot/util/debug.h"
#include "libknot/util/utils.h"
#include "libknot/packet/wire.h"
#include "libknot/zone/zone-contents.h"
#include "libknot/zone/zone-diff.h"
#include "knot/zone/zone-contents.h"
#include "knot/zone/zone-diff.h"
/*!
* \brief Deletes NSEC3 chain if NSEC should be used.
......
......@@ -31,7 +31,7 @@
#include <stdbool.h>
#include "libknot/updates/changesets.h"
#include "libknot/zone/zone-contents.h"
#include "knot/zone/zone-contents.h"
#include "libknot/dnssec/policy.h"
#include "libknot/dnssec/zone-keys.h"
#include "libknot/dnssec/nsec-bitmap.h"
......
......@@ -35,8 +35,8 @@
#include "libknot/rrset.h"
#include "libknot/updates/changesets.h"
#include "libknot/util/debug.h"
#include "libknot/zone/node.h"
#include "libknot/zone/zone-contents.h"
#include "knot/zone/node.h"
#include "knot/zone/zone-contents.h"
/*- private API - common functions -------------------------------------------*/
......
......@@ -30,8 +30,8 @@
#define _KNOT_DNSSEC_ZONE_SIGN_H_
#include "libknot/updates/changesets.h"
#include "libknot/zone/zone.h"
#include "libknot/zone/zone-contents.h"
#include "knot/zone/zone.h"
#include "knot/zone/zone-contents.h"
#include "libknot/dnssec/zone-keys.h"
#include "libknot/dnssec/policy.h"
......
......@@ -39,10 +39,6 @@
#include "libknot/tsig-op.h"
#include "libknot/util/tolower.h"
#include "libknot/util/utils.h"
#include "libknot/zone/node.h"
#include "libknot/zone/zone.h"
#include "libknot/zone/zonedb.h"
#include "libknot/rdata.h"
#endif
......
......@@ -28,7 +28,7 @@
#define _KNOT_AXFR_H_
#include "libknot/packet/pkt.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zonedb.h"
#include "libknot/nameserver/name-server.h"
struct query_data;
......
......@@ -28,7 +28,7 @@
#define _KNOT_INTERNET_H_
#include "libknot/packet/pkt.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zonedb.h"
#include "libknot/nameserver/name-server.h"
/* Query data (from query processing). */
......
......@@ -28,7 +28,7 @@
#define _KNOT_IXFR_H_
#include "libknot/packet/pkt.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zonedb.h"
#include "libknot/nameserver/name-server.h"
struct query_data;
......
......@@ -39,7 +39,7 @@
#include <string.h>
#include <sys/time.h>
#include "libknot/zone/zonedb.h"
#include "knot/zone/zonedb.h"
#include "libknot/edns.h"
#include "libknot/consts.h"
#include "libknot/tsig.h"
......
......@@ -28,7 +28,7 @@
#define _KNOT_UPDATE_H_
#include "libknot/packet/pkt.h"
#include "libknot/zone/zonedb.h"
#include "knot/zone/zonedb.h"
#include "libknot/nameserver/name-server.h"
struct query_data;
......
......@@ -33,11 +33,10 @@
#include "libknot/dname.h"
#include "libknot/rrset.h"
#include "libknot/edns.h"
#include "libknot/zone/node.h"
#include "libknot/zone/zone.h"
#include "libknot/packet/wire.h"
#include "libknot/tsig.h"
#include "libknot/packet/compr.h"
#include "common/mempattern.h"
/* Number of packet sections (ANSWER, AUTHORITY, ADDITIONAL). */
#define KNOT_PKT_SECTIONS 3
......
......@@ -28,7 +28,7 @@
#define _KNOT_CHANGESETS_H_
#include "libknot/rrset.h"
#include "libknot/zone/node.h"
#include "knot/zone/node.h"
#include "common/lists.h"
#include "common/mempattern.h"
......
......@@ -28,7 +28,7 @@
#define _KNOT_DDNS_H_
#include "libknot/updates/changesets.h"
#include "libknot/zone/zone.h"
#include "knot/zone/zone.h"
#include "libknot/packet/pkt.h"
#include "libknot/rrset.h"
#include "libknot/dname.h"
......
......@@ -27,7 +27,7 @@
#include "libknot/util/debug.h"
#include "libknot/packet/pkt.h"
#include "libknot/dname.h"
#include "libknot/zone/zone.h"
#include "knot/zone/zone.h"
#include "libknot/dnssec/zone-nsec.h"
#include "libknot/dnssec/zone-sign.h"
#include "libknot/dnssec/random.h"
......
......@@ -31,7 +31,7 @@
#include <string.h>
#include "libknot/dname.h"
#include "libknot/zone/zone.h"
#include "knot/zone/zone.h"
#include "libknot/packet/pkt.h"
#include "libknot/nameserver/name-server.h"
#include "libknot/updates/changesets.h"
......
......@@ -64,8 +64,8 @@
#endif
#include "libknot/rrset.h"
#include "libknot/zone/node.h"
#include "libknot/zone/zone.h"
#include "knot/zone/node.h"
#include "knot/zone/zone.h"
#include "libknot/util/utils.h"
#include "common/print.h"
......
......@@ -32,6 +32,7 @@
#include "common/errcode.h"
#include "common/mempattern.h"
#include "common/descriptor.h"
#include "libknot/common.h"
#include "libknot/libknot.h"
/* Declarations of cmd parse functions. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment