Skip to content
Snippets Groups Projects
Commit ac4a8e17 authored by Daniel Salzman's avatar Daniel Salzman
Browse files

Small fixes + coding style

parent 750e6b18
Branches
Tags
No related merge requests found
......@@ -236,16 +236,16 @@ libknotd_la_SOURCES = \
knot/nameserver/nsec_proofs.h \
knot/nameserver/process_query.c \
knot/nameserver/process_query.h \
knot/nameserver/process_answer.c \
knot/nameserver/process_answer.h \
knot/nameserver/process_answer.c \
knot/nameserver/process_answer.h \
knot/nameserver/requestor.c \
knot/nameserver/requestor.h \
knot/nameserver/query_module.c \
knot/nameserver/query_module.h \
knot/nameserver/update.c \
knot/nameserver/update.h \
knot/nameserver/notify.c \
knot/nameserver/notify.h \
knot/nameserver/notify.c \
knot/nameserver/notify.h \
knot/nameserver/tsig_ctx.c \
knot/nameserver/tsig_ctx.h \
knot/modules/synth_record.c \
......@@ -328,8 +328,8 @@ libknotd_la_SOURCES += \
knot/modules/dnstap.c \
knot/modules/dnstap.h
kdig_LDADD += dnstap/libdnstap.la
khost_LDADD += dnstap/libdnstap.la
kdig_LDADD += dnstap/libdnstap.la
khost_LDADD += dnstap/libdnstap.la
libknotd_la_LIBADD += dnstap/libdnstap.la
endif
......
......@@ -257,7 +257,7 @@ static int remote_c_zonestatus(server_t *s, remote_cmdargs_t* a)
next_name = zone_events_get_name(next_type);
next_time = next_time - time(NULL);
if (next_time < 0) {
memcpy(when, "pending", 5);
memcpy(when, "pending", strlen("pending"));
} else if (snprintf(when, sizeof(when), "in %ldh%ldm%lds",
(next_time / 3600),
(next_time % 3600) / 60,
......@@ -269,7 +269,7 @@ static int remote_c_zonestatus(server_t *s, remote_cmdargs_t* a)
memcpy(when, "idle", strlen("idle"));
}
/* Workaround, some platforms ignore 'size' with snprintf() */
/* Prepare zone info. */
char buf[512] = { '\0' };
char dnssec_buf[128] = { '\0' };
int n = snprintf(buf, sizeof(buf),
......@@ -636,10 +636,11 @@ int remote_answer(int sock, server_t *s, knot_pkt_t *pkt)
}
static int zones_verify_tsig_query(const knot_pkt_t *query,
const knot_tsig_key_t *key,
uint16_t *rcode, uint16_t *tsig_rcode,
uint64_t *tsig_prev_time_signed)
const knot_tsig_key_t *key,
uint16_t *rcode, uint16_t *tsig_rcode,
uint64_t *tsig_prev_time_signed)
{
assert(query != NULL);
assert(key != NULL);
assert(rcode != NULL);
assert(tsig_rcode != NULL);
......
......@@ -142,8 +142,7 @@ static int connect_nsec_nodes(zone_node_t *a, zone_node_t *b,
dbg_dnssec_detail("Adding new NSEC to changeset.\n");
// Add new NSEC to the changeset (no matter if old was removed)
return changeset_add_rrset(data->changeset, new_nsec,
CHANGESET_ADD);
return changeset_add_rrset(data->changeset, new_nsec, CHANGESET_ADD);
}
/* - API - iterations ------------------------------------------------------- */
......@@ -219,8 +218,7 @@ int knot_nsec_changeset_remove(const zone_node_t *n,
}
if (nsec) {
// update changeset
result = changeset_add_rrset(changeset, nsec,
CHANGESET_REMOVE);
result = changeset_add_rrset(changeset, nsec, CHANGESET_REMOVE);
if (result != KNOT_EOK) {
knot_rrset_free(&nsec, NULL);
return result;
......@@ -254,7 +252,7 @@ int knot_nsec_changeset_remove(const zone_node_t *n,
// store RRSIG
result = changeset_add_rrset(changeset, synth_rrsigs,
CHANGESET_REMOVE);
CHANGESET_REMOVE);
if (result != KNOT_EOK) {
knot_rrset_free(&synth_rrsigs, NULL);
return result;
......
......@@ -38,9 +38,9 @@
* \brief Parameters to be used in connect_nsec_nodes callback.
*/
typedef struct {
uint32_t ttl; // TTL for NSEC(3) records
changeset_t *changeset; // Changeset for NSEC(3) changes
const zone_contents_t *zone; // Updated zone
uint32_t ttl; // TTL for NSEC(3) records
changeset_t *changeset; // Changeset for NSEC(3) changes
const zone_contents_t *zone; // Updated zone
} nsec_chain_iterate_data_t;
/*!
......
......@@ -32,9 +32,9 @@ static int init_dnssec_structs(const zone_contents_t *zone,
knot_update_serial_t soa_up, bool force)
{
assert(zone);
assert(config);
assert(zone_keys);
assert(policy);
assert(config);
// Read zone keys from disk
bool nsec3_enabled = knot_is_nsec3_enabled(zone);
......@@ -170,7 +170,8 @@ int knot_dnssec_zone_sign_force(zone_contents_t *zone, const conf_zone_t *zone_c
return KNOT_EINVAL;
}
return zone_sign(zone, zone_config, out_ch, true, KNOT_SOA_SERIAL_UPDATE, refresh_at);
return zone_sign(zone, zone_config, out_ch, true, KNOT_SOA_SERIAL_UPDATE,
refresh_at);
}
int knot_dnssec_sign_changeset(const zone_contents_t *zone,
......@@ -179,7 +180,7 @@ int knot_dnssec_sign_changeset(const zone_contents_t *zone,
changeset_t *out_ch,
uint32_t *refresh_at)
{
if (!refresh_at || zone == NULL || in_ch == NULL || out_ch == NULL) {
if (zone == NULL || in_ch == NULL || out_ch == NULL || refresh_at == NULL) {
return KNOT_EINVAL;
}
......
......@@ -70,7 +70,6 @@ int knot_dnssec_zone_sign_force(zone_contents_t *zone, const conf_zone_t *zone_c
* \param in_ch Changeset created bvy DDNS or zone-diff
* \param out_ch New records will be added to this changeset.
* \param refresh_at Signature refresh time of the new signatures.
* \param new_serial New SOA serial.
*
* \return Error code, KNOT_EOK if successful.
*/
......
......@@ -275,7 +275,7 @@ static int remove_expired_rrsigs(const knot_rrset_t *covered,
if (to_remove != NULL && result == KNOT_EOK) {
result = changeset_add_rrset(changeset, to_remove,
CHANGESET_REMOVE);
CHANGESET_REMOVE);
}
if (to_remove != NULL && result != KNOT_EOK) {
......@@ -337,8 +337,7 @@ static int add_missing_rrsigs(const knot_rrset_t *covered,
}
if (to_add != NULL && result == KNOT_EOK) {
result = changeset_add_rrset(changeset, to_add,
CHANGESET_ADD);
result = changeset_add_rrset(changeset, to_add, CHANGESET_ADD);
}
if (to_add != NULL && result != KNOT_EOK) {
......@@ -376,8 +375,7 @@ static int remove_rrset_rrsigs(const knot_dname_t *owner, uint16_t type,
return KNOT_EOK;
}
ret = changeset_add_rrset(changeset, synth_rrsig,
CHANGESET_REMOVE);
ret = changeset_add_rrset(changeset, synth_rrsig, CHANGESET_REMOVE);
if (ret != KNOT_EOK) {
knot_rrset_free(&synth_rrsig, NULL);
}
......@@ -476,8 +474,8 @@ static int remove_standalone_rrsigs(const zone_node_t *node,
knot_rrset_free(&to_remove, NULL);
return ret;
}
ret = changeset_add_rrset(changeset,
to_remove, CHANGESET_REMOVE);
ret = changeset_add_rrset(changeset, to_remove,
CHANGESET_REMOVE);
if (ret != KNOT_EOK) {
knot_rrset_free(&to_remove, NULL);
return ret;
......@@ -803,7 +801,7 @@ done:
if (to_remove != NULL && result == KNOT_EOK) {
result = changeset_add_rrset(changeset, to_remove,
CHANGESET_REMOVE);
CHANGESET_REMOVE);
}
if (to_remove != NULL && result != KNOT_EOK) {
......@@ -883,8 +881,7 @@ static int add_missing_dnskeys(const knot_rrset_t *soa,
}
if (to_add != NULL && result == KNOT_EOK) {
result = changeset_add_rrset(changeset, to_add,
CHANGESET_ADD);
result = changeset_add_rrset(changeset, to_add, CHANGESET_ADD);
}
if (to_add != NULL && result != KNOT_EOK) {
......@@ -1412,25 +1409,28 @@ int knot_zone_sign_changeset(const zone_contents_t *zone,
}
// Create args for wrapper function - hattrie for duplicate sigs
changeset_signing_data_t args = { .zone = zone,
.zone_keys = zone_keys,
.policy = policy,
.changeset = out_ch,
.signed_tree = hattrie_create()};
changeset_signing_data_t args = {
.zone = zone,
.zone_keys = zone_keys,
.policy = policy,
.changeset = out_ch,
.signed_tree = hattrie_create()
};
if (args.signed_tree == NULL) {
return KNOT_ENOMEM;
}
// Sign all RRs that are new in changeset
int ret = changeset_apply((changeset_t *)in_ch,
CHANGESET_ADD,
sign_changeset_wrap, &args);
CHANGESET_ADD,
sign_changeset_wrap, &args);
// Sign all RRs that are removed in changeset
if (ret == KNOT_EOK) {
ret = changeset_apply((changeset_t *)in_ch,
CHANGESET_REMOVE,
sign_changeset_wrap, &args);
CHANGESET_REMOVE,
sign_changeset_wrap, &args);
}
knot_zone_clear_sorted_changes(args.signed_tree);
......@@ -1456,7 +1456,7 @@ int knot_zone_sign_nsecs_in_changeset(const knot_zone_keys_t *zone_keys,
.changeset = changeset };
return changeset_apply(changeset, CHANGESET_ADD,
add_rrsigs_for_nsec, &data);
add_rrsigs_for_nsec, &data);
}
/*!
......
......@@ -194,7 +194,7 @@ finish:
next_state = ratelimit_apply(next_state, pkt, ctx);
}
/* Before query processing code. */
/* After query processing code. */
if (plan) {
WALK_LIST(step, plan->stage[QPLAN_END]) {
next_state = step->process(next_state, pkt, qdata, step->ctx);
......
......@@ -238,7 +238,7 @@ int dt_compact(dt_unit_t *unit);
* \retval Number of online CPU's if success.
* \retval <0 on failure.
*/
int dt_online_cpus();
int dt_online_cpus(void);
/*!
* \brief Return optimal number of threads for instance.
......@@ -248,7 +248,7 @@ int dt_online_cpus();
*
* \return Number of threads.
*/
int dt_optimal_size();
int dt_optimal_size(void);
/*!
* \brief Return true if thread is cancelled.
......
......@@ -348,7 +348,7 @@ static int server_init_handler(server_t *server, int index, int thread_count,
h->thread_id = calloc(thread_count, sizeof(unsigned));
if (h->thread_id == NULL) {
free(h->thread_id);
free(h->thread_state);
dt_delete(&h->unit);
return KNOT_ENOMEM;
}
......@@ -472,7 +472,7 @@ static int reconfigure_threads(const struct conf_t *conf, server_t *server)
{
/* Estimate number of threads/manager. */
int ret = KNOT_EOK;
int tu_size = conf_udp_threads(conf);
int tu_size = conf_udp_threads(conf);
if ((unsigned)tu_size != server->tu_size) {
/* Free old handlers */
if (server->tu_size > 0) {
......
......@@ -49,7 +49,7 @@ typedef struct tcp_context {
unsigned client_threshold; /*!< Index of first TCP client. */
timev_t last_poll_time; /*!< Time of the last socket poll. */
fdset_t set; /*!< Set of server/client sockets. */
unsigned thread_id; /*!< Thread identifier. */
unsigned thread_id; /*!< Thread identifier. */
} tcp_context_t;
/*
......
......@@ -172,7 +172,7 @@ int zone_dump_text(zone_contents_t *zone, const struct sockaddr_storage *from, F
params.dump_rrsig = true;
params.dump_nsec = false;
ret = zone_contents_tree_apply_inorder(zone, node_dump_text,
&params);
&params);
if (ret != KNOT_EOK) {
return ret;
}
......@@ -185,7 +185,7 @@ int zone_dump_text(zone_contents_t *zone, const struct sockaddr_storage *from, F
params.dump_rrsig = false;
params.dump_nsec = true;
ret = zone_contents_nsec3_apply_inorder(zone, node_dump_text,
&params);
&params);
if (ret != KNOT_EOK) {
return ret;
}
......@@ -195,7 +195,7 @@ int zone_dump_text(zone_contents_t *zone, const struct sockaddr_storage *from, F
params.dump_rrsig = true;
params.dump_nsec = false;
ret = zone_contents_nsec3_apply_inorder(zone, node_dump_text,
&params);
&params);
if (ret != KNOT_EOK) {
return ret;
}
......@@ -206,7 +206,7 @@ int zone_dump_text(zone_contents_t *zone, const struct sockaddr_storage *from, F
params.dump_rrsig = false;
params.dump_nsec = true;
ret = zone_contents_tree_apply_inorder(zone, node_dump_text,
&params);
&params);
if (ret != KNOT_EOK) {
return ret;
}
......
......@@ -101,9 +101,9 @@ int zone_tree_get(zone_tree_t *tree, const knot_dname_t *owner,
/*----------------------------------------------------------------------------*/
int zone_tree_find_less_or_equal(zone_tree_t *tree,
const knot_dname_t *owner,
const zone_node_t **found,
const zone_node_t **previous)
const knot_dname_t *owner,
const zone_node_t **found,
const zone_node_t **previous)
{
if (owner == NULL || found == NULL || previous == NULL) {
return KNOT_EINVAL;
......@@ -121,9 +121,9 @@ int zone_tree_find_less_or_equal(zone_tree_t *tree,
/*----------------------------------------------------------------------------*/
int zone_tree_get_less_or_equal(zone_tree_t *tree,
const knot_dname_t *owner,
zone_node_t **found,
zone_node_t **previous)
const knot_dname_t *owner,
zone_node_t **found,
zone_node_t **previous)
{
if (owner == NULL || found == NULL || previous == NULL) {
return KNOT_EINVAL;
......@@ -193,8 +193,8 @@ dbg_zone_exec_detail(
/*----------------------------------------------------------------------------*/
int zone_tree_remove(zone_tree_t *tree,
const knot_dname_t *owner,
zone_node_t **removed)
const knot_dname_t *owner,
zone_node_t **removed)
{
if (owner == NULL) {
return KNOT_EINVAL;
......@@ -222,8 +222,8 @@ int zone_tree_remove(zone_tree_t *tree,
/*----------------------------------------------------------------------------*/
int zone_tree_apply_inorder(zone_tree_t *tree,
zone_tree_apply_cb_t function,
void *data)
zone_tree_apply_cb_t function,
void *data)
{
if (function == NULL) {
return KNOT_EINVAL;
......@@ -251,8 +251,8 @@ int zone_tree_apply_inorder(zone_tree_t *tree,
/*----------------------------------------------------------------------------*/
int zone_tree_apply(zone_tree_t *tree,
zone_tree_apply_cb_t function,
void *data)
zone_tree_apply_cb_t function,
void *data)
{
if (function == NULL) {
return KNOT_EINVAL;
......
......@@ -88,8 +88,8 @@ int zone_tree_insert(zone_tree_t *tree, zone_node_t *node);
* \retval KNOT_ENOMEM
*/
int zone_tree_find(zone_tree_t *tree,
const knot_dname_t *owner,
const zone_node_t **found);
const knot_dname_t *owner,
const zone_node_t **found);
/*!
* \brief Finds node with the given owner in the zone tree.
......@@ -105,8 +105,8 @@ int zone_tree_find(zone_tree_t *tree,
* \retval KNOT_ENOMEM
*/
int zone_tree_get(zone_tree_t *tree,
const knot_dname_t *owner,
zone_node_t **found);
const knot_dname_t *owner,
zone_node_t **found);
/*!
* \brief Tries to find the given domain name in the zone tree and returns the
......@@ -128,9 +128,9 @@ int zone_tree_get(zone_tree_t *tree,
* \retval KNOT_ENOMEM
*/
int zone_tree_find_less_or_equal(zone_tree_t *tree,
const knot_dname_t *owner,
const zone_node_t **found,
const zone_node_t **previous);
const knot_dname_t *owner,
const zone_node_t **found,
const zone_node_t **previous);
/*!
* \brief Tries to find the given domain name in the zone tree and returns the
......@@ -155,9 +155,9 @@ int zone_tree_find_less_or_equal(zone_tree_t *tree,
* \retval KNOT_ENOMEM
*/
int zone_tree_get_less_or_equal(zone_tree_t *tree,
const knot_dname_t *owner,
zone_node_t **found,
zone_node_t **previous);
const knot_dname_t *owner,
zone_node_t **found,
zone_node_t **previous);
/*!
* \brief Removes node with the given owner from the zone tree and returns it.
......@@ -169,8 +169,8 @@ int zone_tree_get_less_or_equal(zone_tree_t *tree,
* \retval The removed node.
*/
int zone_tree_remove(zone_tree_t *tree,
const knot_dname_t *owner,
zone_node_t **removed);
const knot_dname_t *owner,
zone_node_t **removed);
/*!
* \brief Applies the given function to each node in the zone.
......@@ -190,8 +190,8 @@ int zone_tree_remove(zone_tree_t *tree,
* \retval KNOT_EINVAL
*/
int zone_tree_apply_inorder(zone_tree_t *tree,
zone_tree_apply_cb_t function,
void *data);
zone_tree_apply_cb_t function,
void *data);
/*!
* \brief Applies the given function to each node in the zone. No
......@@ -205,7 +205,7 @@ int zone_tree_apply_inorder(zone_tree_t *tree,
* \retval KNOT_EINVAL
*/
int zone_tree_apply(zone_tree_t *tree,
zone_tree_apply_cb_t function, void *data);
zone_tree_apply_cb_t function, void *data);
/*!
* \brief Destroys the zone tree, not touching the saved data.
......
......@@ -570,6 +570,8 @@ bool knot_rrset_equal(const knot_rrset_t *r1,
if (!knot_dname_is_equal(r1->owner, r2->owner)) {
return false;
}
} else if (r1->owner != r2->owner) { // At least one is NULL.
return false;
}
if (cmp == KNOT_RRSET_COMPARE_WHOLE) {
......
......@@ -37,75 +37,82 @@ static bool check_rrset(const knot_rrset_t *rrset,
int main(int argc, char *argv[])
{
plan(17);
plan(19);
// Test new
knot_dname_t *dummy_owner = knot_dname_from_str("test.");
assert(dummy_owner);
knot_rrset_t *rrset = knot_rrset_new(dummy_owner, KNOT_RRTYPE_TXT,
KNOT_CLASS_IN, NULL);
ok(rrset != NULL, "rrset: create.");
assert(rrset);
ok(check_rrset(rrset, dummy_owner, KNOT_RRTYPE_TXT, KNOT_CLASS_IN),
"rrset: set fields during create.");
// Test init
knot_dname_free(&dummy_owner, NULL);
dummy_owner = knot_dname_from_str("test2.");
assert(dummy_owner);
knot_dname_free(&rrset->owner, NULL);
knot_rrset_init(rrset, dummy_owner, KNOT_RRTYPE_A, KNOT_CLASS_CH);
ok(check_rrset(rrset, dummy_owner, KNOT_RRTYPE_A, KNOT_CLASS_CH),
"rrset: init.");
// Test copy
knot_rrset_t *copy = knot_rrset_copy(rrset, NULL);
ok(copy != NULL, "rrset: copy.");
ok(check_rrset(copy, rrset->owner, rrset->type, rrset->rclass),
"rrset: set fields during copy.");
ok(knot_rrset_copy(NULL, NULL) == NULL, "rrset: copy NULL.");
// Test equal - pointers
ok(knot_rrset_equal((knot_rrset_t *)0xdeadbeef, (knot_rrset_t *)0xdeadbeef,
KNOT_RRSET_COMPARE_PTR), "rrset: cmp equal pointers");
ok(!knot_rrset_equal((knot_rrset_t *)0xcafebabe, (knot_rrset_t *)0xdeadbeef,
KNOT_RRSET_COMPARE_PTR), "rrset: cmp different pointers");
// Test equal - header
ok(knot_rrset_equal(rrset, copy, KNOT_RRSET_COMPARE_HEADER),
"rrset: cmp equal headers");
copy->type = KNOT_RRTYPE_AAAA;
ok(!knot_rrset_equal(rrset, copy, KNOT_RRSET_COMPARE_HEADER),
"rrset: cmp headers - different type");
// Test equal - full, rdata empty
copy->type = rrset->type;
ok(knot_rrset_equal(rrset, copy, KNOT_RRSET_COMPARE_WHOLE),
"rrset: cmp headers - rdata");
knot_dname_free(&rrset->owner, NULL);
ok(!knot_rrset_equal(rrset, copy, KNOT_RRSET_COMPARE_HEADER),
"rrset: cmp NULL owner");
ok(knot_rrset_equal(rrset, rrset, KNOT_RRSET_COMPARE_HEADER),
"rrset: cmp NULL owners");
// Test clear
knot_rrset_clear(rrset, NULL);
ok(rrset->owner == NULL, "rrset: clear.");
// Test empty
ok(knot_rrset_empty(rrset), "rrset: empty.");
ok(knot_rrset_empty(NULL), "rrset: empty NULL.");
copy->rrs.rr_count = 1;
ok(!knot_rrset_empty(copy), "rrset: not empty.");
// Test init empty
knot_rrset_init_empty(rrset);
ok(check_rrset(rrset, NULL, 0, KNOT_CLASS_IN), "rrset: init empty.");
// "Test" freeing
knot_rrset_free(&rrset, NULL);
knot_rrset_free(&copy, NULL);
ok(rrset == NULL && copy == NULL, "rrset: free.");
return 0;
}
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