denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel-pfkey: Always register for events

Browse Source 
The starter-specific code path isn't necessary anymore since
d8fdd1018e ("starter: Don't flush SAs in the kernel").
This commit is contained in:
Tobias Brunner
2023-02-16 13:25:35 +01:00
parent 30cb3bd4d5
commit e323539428
1 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
-9
View File
@@ -3303,7 +3303,6 @@ METHOD(kernel_ipsec_t, destroy, void,
kernel_pfkey_ipsec_t *kernel_pfkey_ipsec_create() kernel_pfkey_ipsec_t *kernel_pfkey_ipsec_create()
{ {
private_kernel_pfkey_ipsec_t *this; private_kernel_pfkey_ipsec_t *this;
bool register_for_events = TRUE;
int rcv_buffer; int rcv_buffer;
INIT(this, INIT(this,
@@ -3339,11 +3338,6 @@ kernel_pfkey_ipsec_t *kernel_pfkey_ipsec_create()
FALSE, lib->ns), FALSE, lib->ns),
); );
if (streq(lib->ns, "starter"))
{ /* starter has no threads, so we do not register for kernel events */
register_for_events = FALSE;
}
/* create a PF_KEY socket to communicate with the kernel */ /* create a PF_KEY socket to communicate with the kernel */
this->socket = socket(PF_KEY, SOCK_RAW, PF_KEY_V2); this->socket = socket(PF_KEY, SOCK_RAW, PF_KEY_V2);
if (this->socket <= 0) if (this->socket <= 0)
@@ -3353,8 +3347,6 @@ kernel_pfkey_ipsec_t *kernel_pfkey_ipsec_create()
return NULL; return NULL;
} }
if (register_for_events)
{
/* create a PF_KEY socket for ACQUIRE & EXPIRE */ /* create a PF_KEY socket for ACQUIRE & EXPIRE */
this->socket_events = socket(PF_KEY, SOCK_RAW, PF_KEY_V2); this->socket_events = socket(PF_KEY, SOCK_RAW, PF_KEY_V2);
if (this->socket_events <= 0) if (this->socket_events <= 0)
@@ -3387,7 +3379,6 @@ kernel_pfkey_ipsec_t *kernel_pfkey_ipsec_create()
lib->watcher->add(lib->watcher, this->socket_events, WATCHER_READ, lib->watcher->add(lib->watcher, this->socket_events, WATCHER_READ,
(watcher_cb_t)receive_events, this); (watcher_cb_t)receive_events, this);
}
return &this->public; return &this->public;
} }