sign_zone: accept zone contents instead of zone

src/knot/ctl/remote.c

@@ -194,10 +194,12 @@ static int remote_sign_zone(server_t *server, const knot_zone_t *zone)
 
 	// add missing signatures
 
+	rcu_read_lock();
 	const char *keydir = conf()->dnssec_keydir;
+	rcu_read_unlock();
 	assert(keydir);
 
-	result = knot_zone_sign(zone, keydir);
+	result = knot_zone_sign(zone->contents, keydir);
 	if (result != KNOT_EOK) {
 		log_server_error("Could not resing zone '%s' (%s).\n",
 				 zone_name, knot_strerror(result));

src/libknot/zone/sign.c

@@ -22,16 +22,16 @@
 #include <sys/types.h>
 #include <time.h>
 
-#include "common/hattrie/hat-trie.h"
 #include "common/descriptor.h"
 #include "common/errcode.h"
-#include "sign.h"
-#include "zone.h"
-#include "node.h"
+#include "common/hattrie/hat-trie.h"
 #include "libknot/dname.h"
 #include "libknot/rrset.h"
-#include "libknot/sign/key.h"
 #include "libknot/sign/dnssec.h"
+#include "libknot/sign/key.h"
+#include "node.h"
+#include "sign.h"
+#include "zone-contents.h"
 
 #define MAX_RR_WIREFORMAT_SIZE (64 * 1024 * sizeof(uint8_t))
 #define MAX_ZONE_KEYS 8
@@ -405,7 +405,7 @@ static int init_sign_contexts(knot_zone_keys_t *keys)
 	return KNOT_EOK;
 }
 
-int knot_zone_sign(const knot_zone_t *zone, const char *keydir)
+int knot_zone_sign(knot_zone_contents_t *zone, const char *keydir)
 {
 	assert(zone);
 	assert(keydir);
@@ -415,7 +415,7 @@ int knot_zone_sign(const knot_zone_t *zone, const char *keydir)
 	knot_zone_keys_t zone_keys;
 	memset(&zone_keys, '\0', sizeof(zone_keys));
 
-	result = load_zone_keys(keydir, zone->name, &zone_keys);
+	result = load_zone_keys(keydir, zone->apex->owner, &zone_keys);
 	if (result != KNOT_EOK) {
 		fprintf(stderr, "load_zone_keys() failed\n");
 		return result;
@@ -432,7 +432,7 @@ int knot_zone_sign(const knot_zone_t *zone, const char *keydir)
 		return KNOT_EOK;
 	}
 
-	knot_zone_tree_t *tree = knot_zone_contents_get_nodes(zone->contents);
+	knot_zone_tree_t *tree = knot_zone_contents_get_nodes(zone);
 	bool sorted = false;
 
 	hattrie_iter_t *it = hattrie_iter_begin(tree, sorted);

src/libknot/zone/sign.h

@@ -16,8 +16,8 @@
 #ifndef _KNOT_ZONE_SIGN_H_
 #define _KNOT_ZONE_SIGN_H_
 
-#include "zone.h"
+#include "zone-contents.h"
 
-int knot_zone_sign(const knot_zone_t *zone, const char *keydir);
+int knot_zone_sign(knot_zone_contents_t *zone, const char *keydir);
 
 #endif // _KNOT_ZONE_SIGN_H_