From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 1 Feb 2023 23:25:17 +0000 (+0000)
Subject: networkd: Pass daemon to all functions called by the bus
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eaeca0f9f44f0c791f21add7162ee6c7eea5ee4a;p=network.git

networkd: Pass daemon to all functions called by the bus

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/networkd/bus.c b/src/networkd/bus.c
index eab123ce..e854f7ba 100644
--- a/src/networkd/bus.c
+++ b/src/networkd/bus.c
@@ -59,7 +59,7 @@ static int nw_bus_on_connect(sd_bus_message* m, void* data, sd_bus_error* error)
 	return 0;
 }
 
-int nw_bus_connect(sd_bus* bus, sd_event* loop) {
+int nw_bus_connect(sd_bus* bus, sd_event* loop, struct nw_daemon* daemon) {
 	int r;
 
 	// Create a bus object
@@ -124,7 +124,7 @@ int nw_bus_connect(sd_bus* bus, sd_event* loop) {
 	}
 
 	// Register the implementation
-	r = nw_bus_register_implementation(bus, &daemon_implementation, NULL);
+	r = nw_bus_register_implementation(bus, &daemon_implementation, daemon);
 	if (r)
 		return r;
 
diff --git a/src/networkd/bus.h b/src/networkd/bus.h
index 05846e51..55e65b81 100644
--- a/src/networkd/bus.h
+++ b/src/networkd/bus.h
@@ -28,7 +28,9 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 
-int nw_bus_connect(sd_bus* bus, sd_event* loop);
+#include "daemon.h"
+
+int nw_bus_connect(sd_bus* bus, sd_event* loop, struct nw_daemon* daemon);
 
 struct nw_bus_implementation {
 	const char* path;
diff --git a/src/networkd/daemon.c b/src/networkd/daemon.c
index 86731d15..a478e601 100644
--- a/src/networkd/daemon.c
+++ b/src/networkd/daemon.c
@@ -227,7 +227,7 @@ static int nw_daemon_setup(struct nw_daemon* daemon) {
 		return r;
 
 	// Connect to the system bus
-	r = nw_bus_connect(daemon->bus, daemon->loop);
+	r = nw_bus_connect(daemon->bus, daemon->loop, daemon);
 	if (r)
 		return r;