Commit 9bc85457 authored by Daniel Salzman's avatar Daniel Salzman

descriptor: remove old descriptors completely

parent 43009dce
......@@ -47,8 +47,6 @@ src/libknot/util/tolower.h
src/libknot/util/tolower.c
src/libknot/util/utils.h
src/libknot/util/utils.c
src/libknot/util/descriptor.h
src/libknot/util/descriptor.c
src/libknot/util/endian.h
src/libknot/zone/zonedb.h
src/libknot/zone/zonedb.c
......
......@@ -201,8 +201,8 @@ libknots_la_SOURCES = \
common/libtap/tap_unit.h \
common/mempattern.h \
common/mempattern.c \
common/descriptor_new.h \
common/descriptor_new.c \
common/descriptor.h \
common/descriptor.c \
common/lists.c \
common/base64.c \
common/base64.h \
......
......@@ -14,7 +14,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "libknot/util/utils.h" // knot_lookup_table_t
#include <stdio.h> // snprintf
......
......@@ -34,7 +34,6 @@
#include <urcu.h>
#include "libknot/dname.h"
#include "libknot/util/descriptor.h"
#include "libknot/tsig.h"
#include "common/lists.h"
#include "common/log.h"
......
......@@ -33,7 +33,7 @@
#endif
#include "knot/common.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "knot/ctl/process.h"
#include "knot/ctl/remote.h"
#include "knot/conf/conf.h"
......
......@@ -25,7 +25,7 @@
#include "knot/server/zones.h"
#include "libknot/util/wire.h"
#include "libknot/packet/query.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "libknot/packet/response.h"
#include "libknot/nameserver/name-server.h"
#include "libknot/tsig-op.h"
......
......@@ -19,7 +19,7 @@
#include "knot/server/notify.h"
#include "libknot/dname.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "libknot/packet/packet.h"
#include "libknot/rrset.h"
#include "libknot/packet/response.h"
......
......@@ -26,7 +26,7 @@
#include "libknot/util/wire.h"
#include "common/hattrie/murmurhash3.h"
#include "common/prng.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "common/errors.h"
/* Hopscotch defines. */
......
......@@ -40,7 +40,7 @@
#include "libknot/tsig-op.h"
#include "common/evsched.h"
#include "common/prng.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "libknot/rrset.h"
/* Constants */
......
......@@ -36,7 +36,7 @@
#include "libknot/nameserver/name-server.h"
#include "libknot/updates/changesets.h"
#include "libknot/tsig-op.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "libknot/packet/response.h"
#include "libknot/zone/zone-diff.h"
#include "libknot/updates/ddns.h"
......
......@@ -10,7 +10,7 @@
#include "libknot/libknot.h"
#include "common/base32hex.h"
#include "common/crc.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "common/mempattern.h"
#include "semantic-check.h"
......
......@@ -19,7 +19,7 @@
#include <config.h>
#include <inttypes.h>
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "knot/conf/conf.h"
#include "knot/server/zones.h"
#include "libknot/libknot.h"
......
......@@ -28,7 +28,6 @@
#define _KNOT_CONSTS_H_
#include <stdint.h>
#include "util/descriptor.h"
/*
* OPCODEs
......@@ -84,18 +83,6 @@ typedef enum knot_tsig_rcode {
KNOT_TSIG_RCODE_BADTIME = 18
} knot_tsig_rcode_t;
/*
* CLASSes
*/
//typedef enum knot_class {
// KNOT_CLASS_IN = 1, /* Class IN */
// KNOT_CLASS_CS = 2, /* Class CS */
// KNOT_CLASS_CH = 3, /* Class CHAOS */
// KNOT_CLASS_HS = 4, /* Class HS */
// KNOT_CLASS_NONE = 254, /* Class NONE rfc2136 */
// KNOT_CLASS_ANY = 255 /* Class ANY */
//} knot_class_t;
/*
* Other
*/
......
......@@ -20,7 +20,7 @@
#include "edns.h"
#include "common.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "util/debug.h"
/*! \brief Various EDNS constatns. */
......
......@@ -28,7 +28,6 @@
#define _KNOT_LIBKNOT_H_
#include "consts.h"
#include "util/descriptor.h"
#include "dname.h"
#include "edns.h"
#include "zone/node.h"
......
......@@ -31,7 +31,7 @@
#include "packet/response.h"
#include "packet/query.h"
#include "consts.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "updates/changesets.h"
#include "updates/ddns.h"
#include "tsig-op.h"
......
......@@ -24,7 +24,7 @@
#include "nsec3.h"
#include "common.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "util/utils.h"
#include "util/tolower.h"
#include "util/debug.h"
......
......@@ -20,7 +20,7 @@
#include "packet/packet.h"
#include "util/debug.h"
#include "common.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "util/wire.h"
#include "tsig.h"
......
......@@ -18,7 +18,6 @@
#include "packet/response.h"
#include "util/wire.h"
#include "util/descriptor.h"
#include "common.h"
#include "util/debug.h"
#include "rrset.h"
......
......@@ -30,7 +30,7 @@
#include "common/errcode.h" // KNOT_EOK
#include "common/base64.h" // base64
#include "common/base32hex.h" // base32hex
#include "common/descriptor_new.h" // KNOT_RRTYPE
#include "common/descriptor.h" // KNOT_RRTYPE
#include "libknot/util/utils.h" // knot_wire_read_u16
#define TAB_WIDTH 8
......
......@@ -23,7 +23,7 @@
#include "common.h"
#include "common/mempattern.h"
#include "rrset.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "util/debug.h"
#include "util/utils.h"
#include "packet/response.h"
......
......@@ -21,7 +21,7 @@
#include <time.h>
#include "common.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "common/base64.h"
#include "tsig.h"
#include "tsig-op.h"
......
......@@ -20,7 +20,7 @@
#include "updates/changesets.h"
#include "libknot/common.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "rrset.h"
#include "util/debug.h"
......
......@@ -26,7 +26,7 @@
#include "common/mempattern.h"
#include "nameserver/name-server.h" // ns_serial_compare() - TODO: extract
#include "updates/xfr-in.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
/*----------------------------------------------------------------------------*/
// Copied from XFR - maybe extract somewhere else
......
......@@ -30,7 +30,7 @@
#include "updates/changesets.h"
#include "tsig.h"
#include "tsig-op.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
/*----------------------------------------------------------------------------*/
/* Non-API functions */
......
......@@ -23,7 +23,7 @@
#include "util/utils.h"
#include "util/debug.h"
#include "libknot/rrset.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "common/print.h"
void knot_rdata_dump(const knot_rrset_t *rrset, size_t rdata_pos)
......
This diff is collapsed.
This diff is collapsed.
......@@ -20,7 +20,7 @@
#include "util/debug.h"
#include "libknot/rrset.h"
#include "common/base32hex.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "common/hattrie/hat-trie.h"
#include "libknot/zone/zone-tree.h"
#include "consts.h"
......
......@@ -22,7 +22,7 @@
#include "common/errcode.h"
#include "zone-diff.h"
#include "libknot/nameserver/name-server.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
struct zone_diff_param {
const knot_zone_contents_t *contents;
......
......@@ -20,7 +20,7 @@
#include <stdint.h>
#include <string.h>
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#define BUF_LEN 256
......
......@@ -23,7 +23,7 @@
#include "libknot/packet/response.h"
#include "libknot/packet/query.h"
#include "libknot/nameserver/name-server.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "common/prng.h"
/* Enable time-dependent tests. */
......
......@@ -18,7 +18,7 @@
#include <stdint.h>
#include "tests/libknot/libknot/rrset_tests.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "common/errcode.h"
#include "common/print.h"
#include "libknot/rrset.h"
......
......@@ -22,7 +22,7 @@
#include "libknot/libknot.h"
#include "common/lists.h" // list
#include "common/errcode.h" // KNOT_EOK
#include "common/descriptor_new.h" // KNOT_RRTYPE_
#include "common/descriptor.h" // KNOT_RRTYPE_
#include "utils/common/msg.h" // WARN
#include "utils/common/params.h" // params_t
#include "utils/common/netio.h" // send_msg
......
......@@ -26,7 +26,7 @@
#include <unistd.h> // close
#include "utils/common/msg.h" // WARN
#include "common/descriptor_new.h" // KNOT_CLASS_IN
#include "common/descriptor.h" // KNOT_CLASS_IN
#include "common/errcode.h" // KNOT_E
server_t* server_create(const char *name, const char *service)
......
......@@ -25,7 +25,7 @@
#include "libknot/libknot.h"
#include "common/errcode.h" // KNOT_EOK
#include "common/mempattern.h" // strcdup
#include "common/descriptor_new.h" // KNOT_RRTYPE_
#include "common/descriptor.h" // KNOT_RRTYPE_
#include "utils/common/msg.h" // WARN
#include "utils/common/resolv.h" // parse_nameserver
#include "utils/common/token.h" // token
......
......@@ -24,7 +24,7 @@
#include "libknot/libknot.h"
#include "common/lists.h" // list
#include "common/errcode.h" // KNOT_EOK
#include "common/descriptor_new.h" // KNOT_RRTYPE_
#include "common/descriptor.h" // KNOT_RRTYPE_
#include "utils/common/msg.h" // WARN
#include "utils/common/netio.h" // get_socktype
#include "utils/common/exec.h" // print_packet
......
......@@ -23,7 +23,7 @@
#include "common/lists.h" // list
#include "common/errcode.h" // KNOT_EOK
#include "common/descriptor_new.h" // KNOT_CLASS_IN
#include "common/descriptor.h" // KNOT_CLASS_IN
#include "utils/common/msg.h" // WARN
#include "utils/common/params.h" // parse_class
#include "utils/common/resolv.h" // get_nameservers
......
......@@ -23,7 +23,7 @@
#include "common/lists.h" // list
#include "common/errcode.h" // KNOT_EOK
#include "common/descriptor_new.h" // KNOT_CLASS_IN
#include "common/descriptor.h" // KNOT_CLASS_IN
#include "utils/common/msg.h" // WARN
#include "utils/dig/dig_params.h" // dig_params_t
#include "utils/common/resolv.h" // get_nameservers
......
......@@ -30,7 +30,7 @@
#include "utils/common/token.h"
#include "common/errcode.h"
#include "common/mempattern.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "libknot/libknot.h"
/* Declarations of cmd parse functions. */
......
......@@ -24,7 +24,7 @@
#include "utils/common/msg.h"
#include "utils/common/netio.h"
#include "common/errcode.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "libknot/libknot.h"
#define DEFAULT_RETRIES_NSUPDATE 3
......
......@@ -29,7 +29,7 @@
#include <stdint.h> // uint32_t
#include "common/descriptor_new.h" // KNOT_CLASS_IN
#include "common/descriptor.h" // KNOT_CLASS_IN
#include "zscanner/scanner.h" // scanner_t
/*! \brief Settings block size in bytes. */
......
......@@ -31,7 +31,7 @@
#include <arpa/inet.h> // inet_pton
#include "common/errcode.h" // error codes
#include "common/descriptor_new.h" // KNOT_RRTYPE_A
#include "common/descriptor.h" // KNOT_RRTYPE_A
#include "zscanner/file_loader.h" // file_loader
#include "zscanner/scanner_functions.h" // Base64
......
......@@ -29,7 +29,7 @@
#include <arpa/inet.h> // inet_pton
#include "common/errcode.h" // error codes
#include "common/descriptor_new.h" // KNOT_RRTYPE_A
#include "common/descriptor.h" // KNOT_RRTYPE_A
#include "zscanner/file_loader.h" // file_loader
#include "zscanner/scanner_functions.h" // Base64
......
......@@ -20,7 +20,7 @@
#include <stdlib.h>
#include "common/errcode.h"
#include "common/descriptor_new.h"
#include "common/descriptor.h"
#include "zscanner/scanner.h"
const uint8_t digit_to_num[] = {
......
......@@ -20,7 +20,7 @@
#include <stdio.h> // printf
#include "common/errcode.h" // knot_strerror
#include "common/descriptor_new.h" // knot_rrtype_to_string
#include "common/descriptor.h" // knot_rrtype_to_string
#include "zscanner/scanner.h" // scanner_t
#define ERROR_CODE_TO_STRING(code) [code - ZSCANNER_UNCOVERED_STATE] = #code
......
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