Commit b6347be9 authored by Marek Vavruša's avatar Marek Vavruša

Merge branch 'master' into resolver_compat

Conflicts:
	Knot.files
	src/knot/nameserver/update.c
	src/knot/nameserver/update.h
	src/knot/server/tcp-handler.c
	src/knot/zone/events.c
	src/knot/zone/zone.c
	src/knot/zone/zone.h
	src/libknot/packet/net.c
	src/libknot/rdataset.c
	src/utils/nsupdate/nsupdate_params.h
parent 4c01e33e
......@@ -24,23 +24,15 @@ man/Makefile.am
patches/Makefile.am
samples/Makefile.am
src/Makefile.am
src/common-knot/array-sort.h
src/common-knot/binsearch.h
src/common-knot/crc.h
src/common-knot/evsched.c
src/common-knot/evsched.h
src/common-knot/fdset.c
src/common-knot/fdset.h
src/common-knot/hattrie/hat-trie.c
src/common-knot/hattrie/hat-trie.h
src/common-knot/hattrie/murmurhash3.c
src/common-knot/hattrie/murmurhash3.h
src/common-knot/heap.c
src/common-knot/heap.h
src/common-knot/hex.c
src/common-knot/hex.h
src/common-knot/hhash.c
src/common-knot/hhash.h
src/common-knot/ref.c
src/common-knot/ref.h
src/common-knot/slab/alloc-common.h
......@@ -50,15 +42,19 @@ 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
......@@ -73,6 +69,10 @@ 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
......@@ -230,6 +230,8 @@ src/libknot/packet/net.h
src/libknot/packet/pkt.c
src/libknot/packet/pkt.h
src/libknot/packet/wire.h
src/libknot/processing/layer.c
src/libknot/processing/layer.h
src/libknot/processing/overlay.c
src/libknot/processing/overlay.h
src/libknot/processing/process.c
......@@ -340,7 +342,7 @@ tests/slab.c
tests/wire.c
tests/worker_pool.c
tests/worker_queue.c
tests/zone-update.c
tests/zone_events.c
tests/zone_update.c
tests/zonedb.c
tests/ztree.c
......@@ -62,23 +62,15 @@ knsec3hash_SOURCES = \
# static: shared (not in libknot)
libknots_la_SOURCES = \
common-knot/array-sort.h \
common-knot/binsearch.h \
common-knot/crc.h \
common-knot/evsched.c \
common-knot/evsched.h \
common-knot/fdset.c \
common-knot/fdset.h \
common-knot/hattrie/hat-trie.c \
common-knot/hattrie/hat-trie.h \
common-knot/hattrie/murmurhash3.c \
common-knot/hattrie/murmurhash3.h \
common-knot/heap.c \
common-knot/heap.h \
common-knot/hex.c \
common-knot/hex.h \
common-knot/hhash.c \
common-knot/hhash.h \
common-knot/ref.c \
common-knot/ref.h \
common-knot/slab/alloc-common.h \
......@@ -91,6 +83,8 @@ libknots_la_SOURCES = \
# static: common shared (also in libknot)
libknotcs_la_SOURCES = \
common/array-sort.h \
common/binsearch.h \
common/print.c \
common/print.h \
common/strlcpy.c \
......@@ -112,6 +106,12 @@ libknotcs_la_SOURCES = \
common/mem.h \
common/mempool.c \
common/mempool.h \
common/hhash.c \
common/hhash.h \
common/trie/hat-trie.c \
common/trie/hat-trie.h \
common/trie/murmurhash3.c \
common/trie/murmurhash3.h \
common/log.c \
common/log.h
......
......@@ -2,10 +2,10 @@
#include <assert.h>
#include <stdbool.h>
#include "common-knot/hhash.h"
#include "common-knot/binsearch.h"
#include "common/hhash.h"
#include "common/binsearch.h"
#include "common/trie/murmurhash3.h"
#include "libknot/errcode.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-knot/array-sort.h"
#include "common/array-sort.h"
/* Hopscotch internal defines. */
#define HOP_NEXT(x) __builtin_ctz((x))
......
......@@ -8,8 +8,8 @@
#include <stdint.h>
#include <assert.h>
#include <string.h>
#include "common-knot/hattrie/hat-trie.h"
#include "common-knot/hhash.h"
#include "common/trie/hat-trie.h"
#include "common/hhash.h"
/* number of child nodes for used alphabet */
#define NODE_CHILDS (TRIE_MAXCHAR+1)
......
......@@ -25,7 +25,7 @@ extern "C" {
#include <stdbool.h>
#include "libknot/common.h"
#include "libknot/mempattern.h"
#include "common-knot/hhash.h"
#include "common/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-knot/hattrie/murmurhash3.h"
#include "common/trie/murmurhash3.h"
static inline uint32_t fmix(uint32_t h)
{
......
......@@ -41,7 +41,7 @@
#include "common/log.h"
#include "knot/updates/acl.h"
#include "common/sockaddr.h"
#include "common-knot/hattrie/hat-trie.h"
#include "common/trie/hat-trie.h"
#include "knot/nameserver/query_module.h"
/* Constants. */
......
......@@ -26,7 +26,7 @@
#pragma once
#include "common-knot/hattrie/hat-trie.h"
#include "common/trie/hat-trie.h"
#include "zscanner/scanner.h"
// Mutiplicative constant, needed because of malloc's fragmentation
......
......@@ -23,7 +23,6 @@
#include "common/base32hex.h"
#include "common/debug.h"
#include "libknot/descriptor.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-knot/hattrie/hat-trie.h"
#include "common/trie/hat-trie.h"
#include "libknot/common.h"
#include "libknot/dname.h"
#include "libknot/rrset.h"
......
......@@ -24,7 +24,7 @@
#include "knot/knot.h"
#include "libknot/consts.h"
#include "libknot/packet/wire.h"
#include "common-knot/hattrie/murmurhash3.h"
#include "common/trie/murmurhash3.h"
#include "libknot/dnssec/random.h"
#include "libknot/descriptor.h"
#include "common/errors.h"
......
......@@ -21,7 +21,7 @@
#include "libknot/rrset.h"
#include "common/base32hex.h"
#include "libknot/descriptor.h"
#include "common-knot/hattrie/hat-trie.h"
#include "common/trie/hat-trie.h"
#include "knot/dnssec/zone-nsec.h"
#include "knot/dnssec/zone-sign.h"
#include "knot/zone/zone-tree.h"
......
......@@ -21,7 +21,7 @@
#include "knot/zone/zone-tree.h"
#include "knot/zone/node.h"
#include "common/debug.h"
#include "common-knot/hattrie/hat-trie.h"
#include "common/trie/hat-trie.h"
/*----------------------------------------------------------------------------*/
/* API functions */
......
......@@ -28,7 +28,7 @@
#pragma once
#include "common-knot/hattrie/hat-trie.h"
#include "common/trie/hat-trie.h"
#include "knot/zone/node.h"
/*----------------------------------------------------------------------------*/
......
......@@ -38,7 +38,7 @@
static void free_ddns_queue(zone_t *z)
{
struct knot_request_data *n = NULL;
struct knot_request *n = NULL;
node_t *nxt = NULL;
WALK_LIST_DELSAFE(n, nxt, z->ddns_queue) {
close(n->fd);
......@@ -249,11 +249,11 @@ int zone_update_enqueue(zone_t *zone, knot_pkt_t *pkt, struct process_query_para
{
/* Create serialized request. */
struct knot_request_data *req = malloc(sizeof(struct knot_request_data));
struct knot_request *req = malloc(sizeof(struct knot_request));
if (req == NULL) {
return KNOT_ENOMEM;
}
memset(req, 0, sizeof(struct knot_request_data));
memset(req, 0, sizeof(struct knot_request));
/* Copy socket and request. */
req->fd = dup(param->socket);
......
......@@ -33,7 +33,7 @@
#include "knot/zone/zone.h"
#include "knot/zone/contents.h"
#include "libknot/dname.h"
#include "common-knot/hhash.h"
#include "common/hhash.h"
/*
* Zone DB represents a list of managed zones.
......
......@@ -18,7 +18,7 @@
#include <time.h>
#include <tap/basic.h>
#include "common-knot/hattrie/hat-trie.h"
#include "common/trie/hat-trie.h"
#include "common/mem.h"
/* Constants. */
......@@ -97,7 +97,7 @@ static bool str_key_find_leq(hattrie_t *trie, char **keys, size_t i, size_t size
#define ASORT_PREFIX(X) str_key_##X
#define ASORT_KEY_TYPE char*
#define ASORT_LT(x, y) (strcmp((x), (y)) < 0)
#include "common-knot/array-sort.h"
#include "common/array-sort.h"
int main(int argc, char *argv[])
{
......
......@@ -18,7 +18,7 @@
#include <assert.h>
#include <tap/basic.h>
#include "common-knot/hhash.h"
#include "common/hhash.h"
#include "libknot/mempattern.h"
#include "common/mempool.h"
#include "libknot/common.h"
......
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