sharpetronics/strongswan
1
0
Fork 0
mirror of https://github.com/strongswan/strongswan.git synced 2025-10-07 00:01:49 -04:00
Code Issues Projects Releases Wiki Activity

kernel-pfroute: allow only one thread to do a route look up simultaneously

Browse Source 
Otherwise we mess up the sequence number another thread is waiting for.
This commit is contained in:
Martin Willi 2013-05-06 16:40:19 +02:00
parent 5c12700f9a
commit c9a323c1d9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -668,7 +668,7 @@ static job_requeue_t receive_events(private_kernel_pfroute_net_t *this)
memcpy(this->reply, &msg, msg.rtm.rtm_msglen); memcpy(this->reply, &msg, msg.rtm.rtm_msglen);
} }
/* signal on any event, add_ip()/del_ip() might wait for it */ /* signal on any event, add_ip()/del_ip() might wait for it */
this->condvar->signal(this->condvar); this->condvar->broadcast(this->condvar);
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
return JOB_REQUEUE_DIRECT; return JOB_REQUEUE_DIRECT;
@ -1122,6 +1122,10 @@ METHOD(kernel_net_t, get_nexthop, host_t*,
} }
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
while (this->waiting_seq)
{
this->condvar->wait(this->condvar, this->mutex);
}
this->waiting_seq = msg.hdr.rtm_seq; this->waiting_seq = msg.hdr.rtm_seq;
if (send(this->socket, &msg, msg.hdr.rtm_msglen, 0) == msg.hdr.rtm_msglen) if (send(this->socket, &msg, msg.hdr.rtm_msglen, 0) == msg.hdr.rtm_msglen)
{ {
@ -1154,6 +1158,9 @@ METHOD(kernel_net_t, get_nexthop, host_t*,
{ {
DBG1(DBG_KNL, "PF_ROUTE lookup failed: %s", strerror(errno)); DBG1(DBG_KNL, "PF_ROUTE lookup failed: %s", strerror(errno));
} }
/* signal completion of query to a waiting thread */
this->waiting_seq = 0;
this->condvar->signal(this->condvar);
this->mutex->unlock(this->mutex); this->mutex->unlock(this->mutex);
return hop; return hop;