network: use sd_event stored in Manager

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 8fc6ca6404a371e21f77f0b78ace53fe0995ab1d..2f93a6ea46c2adc9409692657711cd09cd51097d 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -1377,7 +1377,7 @@ static int ipv4_dad_configure(Link *link, Address *address) {
         if (r < 0)
                 return r;
 
-        r = sd_ipv4acd_attach_event(address->acd, NULL, 0);
+        r = sd_ipv4acd_attach_event(address->acd, link->manager->event, 0);
         if (r < 0)
                 return r;
 

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index a20f06d6c36de66ea6bd005d2e5cc78c989e12d8..d4a8f98570fafc555cb990cbbbc4a7ba2c538100 100644 (file)
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -623,7 +623,7 @@ static int configure_dhcpv4_duplicate_address_detection(Link *link) {
         if (r < 0)
                 return r;
 
-        r = sd_ipv4acd_attach_event(link->network->dhcp_acd, NULL, 0);
+        r = sd_ipv4acd_attach_event(link->network->dhcp_acd, link->manager->event, 0);
         if (r < 0)
                 return r;
 

diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index ce9f6ac300300e6f1a591aeedbb48643c897d0a4..ea331c95db45d34b9d58d258ba63d6a05da30f63 100644 (file)
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -1400,7 +1400,7 @@ int dhcp6_configure(Link *link) {
         if (r < 0)
                 return log_link_error_errno(link, r, "DHCP6 CLIENT: Failed to create DHCP6 client: %m");
 
-        r = sd_dhcp6_client_attach_event(client, NULL, 0);
+        r = sd_dhcp6_client_attach_event(client, link->manager->event, 0);
         if (r < 0)
                 return log_link_error_errno(link, r, "DHCP6 CLIENT: Failed to attach event: %m");
 

diff --git a/src/network/networkd-lldp-rx.c b/src/network/networkd-lldp-rx.c
index a97bdeda19dcf45d4107a673031738bc3d3e58e0..65a8a314d602adf6412fdf74bc7b5d9492a8f52e 100644 (file)
--- a/src/network/networkd-lldp-rx.c
+++ b/src/network/networkd-lldp-rx.c
@@ -9,6 +9,7 @@
 #include "networkd-link.h"
 #include "networkd-lldp-rx.h"
 #include "networkd-lldp-tx.h"
+#include "networkd-manager.h"
 #include "networkd-network.h"
 #include "string-table.h"
 #include "string-util.h"
@@ -76,7 +77,7 @@ int link_lldp_rx_configure(Link *link) {
                 if (r < 0)
                         return r;
 
-                r = sd_lldp_attach_event(link->lldp, NULL, 0);
+                r = sd_lldp_attach_event(link->lldp, link->manager->event, 0);
                 if (r < 0)
                         return r;
         }

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index a60c42528bab24cf3d602bf687d90819931a629f..2599ec22324628263c13d3daebb65bb0899ff58c 100644 (file)
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -1234,7 +1234,7 @@ int ndisc_configure(Link *link) {
                 if (r < 0)
                         return r;
 
-                r = sd_ndisc_attach_event(link->ndisc, NULL, 0);
+                r = sd_ndisc_attach_event(link->ndisc, link->manager->event, 0);
                 if (r < 0)
                         return r;
         }

diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c
index dbdbdef80d6a9e95540cf64c4eb6928c3f46608d..bf906d517b67204eadc02abb77e1c68d2c883a8c 100644 (file)
--- a/src/network/networkd-radv.c
+++ b/src/network/networkd-radv.c
@@ -624,7 +624,7 @@ int radv_configure(Link *link) {
         if (r < 0)
                 return r;
 
-        r = sd_radv_attach_event(link->radv, NULL, 0);
+        r = sd_radv_attach_event(link->radv, link->manager->event, 0);
         if (r < 0)
                 return r;