From 30cb3bd4d56ab4c932ee20dbef3fe7ee52d32e49 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 26 Jan 2023 16:19:22 +0100 Subject: [PATCH] kernel-pfroute: Always listen for events The starter-specific code path isn't necessary anymore since d8fdd1018e16 ("starter: Don't flush SAs in the kernel"). --- .../plugins/kernel_pfroute/kernel_pfroute_net.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c index acc22902c5..b933b7c92e 100644 --- a/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c +++ b/src/libcharon/plugins/kernel_pfroute/kernel_pfroute_net.c @@ -2114,21 +2114,9 @@ kernel_pfroute_net_t *kernel_pfroute_net_create() destroy(this); return NULL; } + lib->watcher->add(lib->watcher, this->socket, WATCHER_READ, + (watcher_cb_t)receive_events, this); - if (streq(lib->ns, "starter")) - { - /* starter has no threads, so we do not register for kernel events */ - if (shutdown(this->socket, SHUT_RD) != 0) - { - DBG1(DBG_KNL, "closing read end of PF_ROUTE socket failed: %s", - strerror(errno)); - } - } - else - { - lib->watcher->add(lib->watcher, this->socket, WATCHER_READ, - (watcher_cb_t)receive_events, this); - } if (init_address_list(this) != SUCCESS) { DBG1(DBG_KNL, "unable to get interface list"); -- 2.47.2