module API+ABI: remove one level of indirection

... for layers and props.  This breaks C module API+ABI.

It seemed weird to repeatedly call a function that returns a pointer
to a structure in which we find the function we want to actually call.
We've never used changing these functions AFAIK, and the target
functions could easily be written to change their behavior instead
(i.e. move the indirection *inside* the function).

When breaking this, I also removed these two (_layers and _props)
from the dynamic symbols (to be) exported from the C modules.
They always pointed to memory belonging inside the module,
and they seem quite sensible to be set up by the _init symbol instead.

1 files changed, 7 insertions, 10 deletions

diff --git a/modules/dnstap/dnstap.c b/modules/dnstap/dnstap.c
index 09184260..57c22c18 100644
--- a/modules/dnstap/dnstap.c
+++ b/modules/dnstap/dnstap.c
@@ -211,6 +211,13 @@ static int dnstap_log(kr_layer_t *ctx) {
 
 KR_EXPORT
 int dnstap_init(struct kr_module *module) {
+	static kr_layer_api_t layer = {
+		.finish = &dnstap_log,
+	};
+	/* Store module reference */
+	layer.data = module;
+	module->layer = &layer;
+
 	/* allocated memory for internal data */
 	struct dnstap_data *data = malloc(sizeof(*data));
 	if (!data) {
@@ -368,15 +375,5 @@ int dnstap_config(struct kr_module *module, const char *conf) {
 	return kr_ok();
 }
 
-KR_EXPORT
-const kr_layer_api_t *dnstap_layer(struct kr_module *module) {
-	static kr_layer_api_t _layer = {
-		.finish = &dnstap_log,
-	};
-	/* Store module reference */
-	_layer.data = module;
-	return &_layer;
-}
-
 KR_MODULE_EXPORT(dnstap)