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

kernel-netlink: use watcher to receive kernel events for net/ipsec

Browse Source
This commit is contained in:
Martin Willi
2013-07-18 16:00:30 +02:00
parent 5f755cef46
commit f4f77d7467
2 changed files with 24 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
+12 -18
View File
@@ -37,11 +37,9 @@
#include <hydra.h> #include <hydra.h>
#include <utils/debug.h> #include <utils/debug.h>
#include <threading/thread.h>
#include <threading/mutex.h> #include <threading/mutex.h>
#include <collections/hashtable.h> #include <collections/hashtable.h>
#include <collections/linked_list.h> #include <collections/linked_list.h>
#include <processing/jobs/callback_job.h>
/** Required for Linux 2.6.26 kernel and later */ /** Required for Linux 2.6.26 kernel and later */
#ifndef XFRM_STATE_AF_UNSPEC #ifndef XFRM_STATE_AF_UNSPEC
@@ -972,40 +970,37 @@ static void process_mapping(private_kernel_netlink_ipsec_t *this,
/** /**
* Receives events from kernel * Receives events from kernel
*/ */
static job_requeue_t receive_events(private_kernel_netlink_ipsec_t *this) static bool receive_events(private_kernel_netlink_ipsec_t *this, int fd,
watcher_event_t event)
{ {
char response[1024]; char response[1024];
struct nlmsghdr *hdr = (struct nlmsghdr*)response; struct nlmsghdr *hdr = (struct nlmsghdr*)response;
struct sockaddr_nl addr; struct sockaddr_nl addr;
socklen_t addr_len = sizeof(addr); socklen_t addr_len = sizeof(addr);
int len; int len;
bool oldstate;
oldstate = thread_cancelability(TRUE);
len = recvfrom(this->socket_xfrm_events, response, sizeof(response), 0,
(struct sockaddr*)&addr, &addr_len);
thread_cancelability(oldstate);
len = recvfrom(this->socket_xfrm_events, response, sizeof(response),
MSG_DONTWAIT, (struct sockaddr*)&addr, &addr_len);
if (len < 0) if (len < 0)
{ {
switch (errno) switch (errno)
{ {
case EINTR: case EINTR:
/* interrupted, try again */ /* interrupted, try again */
return JOB_REQUEUE_DIRECT; return TRUE;
case EAGAIN: case EAGAIN:
/* no data ready, select again */ /* no data ready, select again */
return JOB_REQUEUE_DIRECT; return TRUE;
default: default:
DBG1(DBG_KNL, "unable to receive from xfrm event socket"); DBG1(DBG_KNL, "unable to receive from xfrm event socket");
sleep(1); sleep(1);
return JOB_REQUEUE_FAIR; return TRUE;
} }
} }
if (addr.nl_pid != 0) if (addr.nl_pid != 0)
{ /* not from kernel. not interested, try another one */ { /* not from kernel. not interested, try another one */
return JOB_REQUEUE_DIRECT; return TRUE;
} }
while (NLMSG_OK(hdr, len)) while (NLMSG_OK(hdr, len))
@@ -1031,7 +1026,7 @@ static job_requeue_t receive_events(private_kernel_netlink_ipsec_t *this)
} }
hdr = NLMSG_NEXT(hdr, len); hdr = NLMSG_NEXT(hdr, len);
} }
return JOB_REQUEUE_DIRECT; return TRUE;
} }
METHOD(kernel_ipsec_t, get_features, kernel_feature_t, METHOD(kernel_ipsec_t, get_features, kernel_feature_t,
@@ -2605,6 +2600,7 @@ METHOD(kernel_ipsec_t, destroy, void,
if (this->socket_xfrm_events > 0) if (this->socket_xfrm_events > 0)
{ {
lib->watcher->remove(lib->watcher, this->socket_xfrm_events);
close(this->socket_xfrm_events); close(this->socket_xfrm_events);
} }
DESTROY_IF(this->socket_xfrm); DESTROY_IF(this->socket_xfrm);
@@ -2707,10 +2703,8 @@ kernel_netlink_ipsec_t *kernel_netlink_ipsec_create()
destroy(this); destroy(this);
return NULL; return NULL;
} }
lib->processor->queue_job(lib->processor, lib->watcher->add(lib->watcher, this->socket_xfrm_events, WATCHER_READ,
(job_t*)callback_job_create_with_prio( (watcher_cb_t)receive_events, this);
(callback_job_cb_t)receive_events, this, NULL,
(callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
} }
return &this->public; return &this->public;
src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
+12 -17
View File
@@ -50,7 +50,6 @@
#include <hydra.h> #include <hydra.h>
#include <utils/debug.h> #include <utils/debug.h>
#include <threading/thread.h>
#include <threading/mutex.h> #include <threading/mutex.h>
#include <threading/rwlock.h> #include <threading/rwlock.h>
#include <threading/rwlock_condvar.h> #include <threading/rwlock_condvar.h>
@@ -1079,40 +1078,37 @@ static void process_route(private_kernel_netlink_net_t *this, struct nlmsghdr *h
/** /**
* Receives events from kernel * Receives events from kernel
*/ */
static job_requeue_t receive_events(private_kernel_netlink_net_t *this) static bool receive_events(private_kernel_netlink_net_t *this, int fd,
watcher_event_t event)
{ {
char response[1024]; char response[1024];
struct nlmsghdr *hdr = (struct nlmsghdr*)response; struct nlmsghdr *hdr = (struct nlmsghdr*)response;
struct sockaddr_nl addr; struct sockaddr_nl addr;
socklen_t addr_len = sizeof(addr); socklen_t addr_len = sizeof(addr);
int len; int len;
bool oldstate;
oldstate = thread_cancelability(TRUE);
len = recvfrom(this->socket_events, response, sizeof(response), 0,
(struct sockaddr*)&addr, &addr_len);
thread_cancelability(oldstate);
len = recvfrom(this->socket_events, response, sizeof(response),
MSG_DONTWAIT, (struct sockaddr*)&addr, &addr_len);
if (len < 0) if (len < 0)
{ {
switch (errno) switch (errno)
{ {
case EINTR: case EINTR:
/* interrupted, try again */ /* interrupted, try again */
return JOB_REQUEUE_DIRECT; return TRUE;
case EAGAIN: case EAGAIN:
/* no data ready, select again */ /* no data ready, select again */
return JOB_REQUEUE_DIRECT; return TRUE;
default: default:
DBG1(DBG_KNL, "unable to receive from rt event socket"); DBG1(DBG_KNL, "unable to receive from rt event socket");
sleep(1); sleep(1);
return JOB_REQUEUE_FAIR; return TRUE;
} }
} }
if (addr.nl_pid != 0) if (addr.nl_pid != 0)
{ /* not from kernel. not interested, try another one */ { /* not from kernel. not interested, try another one */
return JOB_REQUEUE_DIRECT; return TRUE;
} }
while (NLMSG_OK(hdr, len)) while (NLMSG_OK(hdr, len))
@@ -1140,7 +1136,7 @@ static job_requeue_t receive_events(private_kernel_netlink_net_t *this)
} }
hdr = NLMSG_NEXT(hdr, len); hdr = NLMSG_NEXT(hdr, len);
} }
return JOB_REQUEUE_DIRECT; return TRUE;
} }
/** enumerator over addresses */ /** enumerator over addresses */
@@ -2175,6 +2171,7 @@ METHOD(kernel_net_t, destroy, void,
} }
if (this->socket_events > 0) if (this->socket_events > 0)
{ {
lib->watcher->remove(lib->watcher, this->socket_events);
close(this->socket_events); close(this->socket_events);
} }
enumerator = this->routes->create_enumerator(this->routes); enumerator = this->routes->create_enumerator(this->routes);
@@ -2314,10 +2311,8 @@ kernel_netlink_net_t *kernel_netlink_net_create()
return NULL; return NULL;
} }
lib->processor->queue_job(lib->processor, lib->watcher->add(lib->watcher, this->socket_events, WATCHER_READ,
(job_t*)callback_job_create_with_prio( (watcher_cb_t)receive_events, this);
(callback_job_cb_t)receive_events, this, NULL,
(callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
} }
if (init_address_list(this) != SUCCESS) if (init_address_list(this) != SUCCESS)