sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-11-04 00:00:51 -05:00
Code Issues Projects Releases Wiki Activity

kernel-pfroute: use only a single PF_ROUTE socket for both events and queries

Browse Source
This commit is contained in:
Martin Willi 2013-04-18 16:08:12 +02:00
parent e8002956c9
commit 0e107f03ac
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
View File

@ -206,11 +206,6 @@ struct private_kernel_pfroute_net_t
*/ */
int socket; int socket;
/**
* PF_ROUTE socket to receive events
*/
int socket_events;
/** /**
* sequence number for messages sent to the kernel * sequence number for messages sent to the kernel
*/ */
@ -455,7 +450,7 @@ static job_requeue_t receive_events(private_kernel_pfroute_net_t *this)
bool oldstate; bool oldstate;
oldstate = thread_cancelability(TRUE); oldstate = thread_cancelability(TRUE);
len = recvfrom(this->socket_events, buf, sizeof(buf), 0, NULL, 0); len = recvfrom(this->socket, buf, sizeof(buf), 0, NULL, 0);
thread_cancelability(oldstate); thread_cancelability(oldstate);
if (len < 0) if (len < 0)
@ -760,14 +755,10 @@ METHOD(kernel_net_t, destroy, void,
enumerator_t *enumerator; enumerator_t *enumerator;
addr_entry_t *addr; addr_entry_t *addr;
if (this->socket > 0) if (this->socket != -1)
{ {
close(this->socket); close(this->socket);
} }
if (this->socket_events)
{
close(this->socket_events);
}
enumerator = this->addrs->create_enumerator(this->addrs); enumerator = this->addrs->create_enumerator(this->addrs);
while (enumerator->enumerate(enumerator, NULL, (void**)&addr)) while (enumerator->enumerate(enumerator, NULL, (void**)&addr))
{ {
@ -787,7 +778,6 @@ METHOD(kernel_net_t, destroy, void,
kernel_pfroute_net_t *kernel_pfroute_net_create() kernel_pfroute_net_t *kernel_pfroute_net_create()
{ {
private_kernel_pfroute_net_t *this; private_kernel_pfroute_net_t *this;
bool register_for_events = TRUE;
INIT(this, INIT(this,
.public = { .public = {
@ -811,37 +801,31 @@ kernel_pfroute_net_t *kernel_pfroute_net_create()
.mutex_pfroute = mutex_create(MUTEX_TYPE_DEFAULT), .mutex_pfroute = mutex_create(MUTEX_TYPE_DEFAULT),
); );
if (streq(hydra->daemon, "starter"))
{ /* starter has no threads, so we do not register for kernel events */
register_for_events = FALSE;
}
/* create a PF_ROUTE socket to communicate with the kernel */ /* create a PF_ROUTE socket to communicate with the kernel */
this->socket = socket(PF_ROUTE, SOCK_RAW, AF_UNSPEC); this->socket = socket(PF_ROUTE, SOCK_RAW, AF_UNSPEC);
if (this->socket < 0) if (this->socket == -1)
{ {
DBG1(DBG_KNL, "unable to create PF_ROUTE socket"); DBG1(DBG_KNL, "unable to create PF_ROUTE socket");
destroy(this); destroy(this);
return NULL; return NULL;
} }
if (register_for_events) if (streq(hydra->daemon, "starter"))
{ {
/* create a PF_ROUTE socket to receive events */ /* starter has no threads, so we do not register for kernel events */
this->socket_events = socket(PF_ROUTE, SOCK_RAW, AF_UNSPEC); if (shutdown(this->socket, SHUT_RD) != 0)
if (this->socket_events < 0)
{ {
DBG1(DBG_KNL, "unable to create PF_ROUTE event socket"); DBG1(DBG_KNL, "closing read end of PF_ROUTE socket failed: %s",
destroy(this); strerror(errno));
return NULL;
} }
}
else
{
lib->processor->queue_job(lib->processor, lib->processor->queue_job(lib->processor,
(job_t*)callback_job_create_with_prio( (job_t*)callback_job_create_with_prio(
(callback_job_cb_t)receive_events, this, NULL, (callback_job_cb_t)receive_events, this, NULL,
(callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL)); (callback_job_cancel_t)return_false, JOB_PRIO_CRITICAL));
} }
if (init_address_list(this) != SUCCESS) if (init_address_list(this) != SUCCESS)
{ {
DBG1(DBG_KNL, "unable to get interface list"); DBG1(DBG_KNL, "unable to get interface list");