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

socket-default: Use poll(2) instead of select

Browse Source 
It is not only simpler, but also allows the use of arbitrary high fd numbers,
which silently fails with select().
This commit is contained in:
Martin Willi
2014-11-21 12:02:07 +01:00
parent 946cf367d4
commit ce13ba62cc
1 changed files with 20 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/socket_default/socket_default_socket.c
+20 -46
View File
@@ -150,66 +150,40 @@ METHOD(socket_t, receiver, status_t,
chunk_t data; chunk_t data;
packet_t *pkt; packet_t *pkt;
host_t *source = NULL, *dest = NULL; host_t *source = NULL, *dest = NULL;
int bytes_read = 0; int i, bytes_read = 0, selected = -1;
bool oldstate; bool oldstate;
fd_set rfds;
int max_fd = 0, selected = 0;
u_int16_t port = 0; u_int16_t port = 0;
struct pollfd pfd[] = {
{ .fd = this->ipv4, .events = POLLIN },
{ .fd = this->ipv4_natt, .events = POLLIN },
{ .fd = this->ipv6, .events = POLLIN },
{ .fd = this->ipv6_natt, .events = POLLIN },
};
int ports[] = {
/* port numbers assocaited to pollfds */
this->port, this->natt, this->port, this->natt,
};
FD_ZERO(&rfds);
if (this->ipv4 != -1)
{
FD_SET(this->ipv4, &rfds);
max_fd = max(max_fd, this->ipv4);
}
if (this->ipv4_natt != -1)
{
FD_SET(this->ipv4_natt, &rfds);
max_fd = max(max_fd, this->ipv4_natt);
}
if (this->ipv6 != -1)
{
FD_SET(this->ipv6, &rfds);
max_fd = max(max_fd, this->ipv6);
}
if (this->ipv6_natt != -1)
{
FD_SET(this->ipv6_natt, &rfds);
max_fd = max(max_fd, this->ipv6_natt);
}
DBG2(DBG_NET, "waiting for data on sockets"); DBG2(DBG_NET, "waiting for data on sockets");
oldstate = thread_cancelability(TRUE); oldstate = thread_cancelability(TRUE);
if (select(max_fd + 1, &rfds, NULL, NULL, NULL) <= 0) if (poll(pfd, countof(pfd), -1) <= 0)
{ {
thread_cancelability(oldstate); thread_cancelability(oldstate);
return FAILED; return FAILED;
} }
thread_cancelability(oldstate); thread_cancelability(oldstate);
if (this->ipv4 != -1 && FD_ISSET(this->ipv4, &rfds)) for (i = 0; i < countof(pfd); i++)
{ {
port = this->port; if (pfd[i].revents & POLLIN)
selected = this->ipv4; {
selected = pfd[i].fd;
port = ports[i];
break;
}
} }
if (this->ipv4_natt != -1 && FD_ISSET(this->ipv4_natt, &rfds)) if (selected != -1)
{
port = this->natt;
selected = this->ipv4_natt;
}
if (this->ipv6 != -1 && FD_ISSET(this->ipv6, &rfds))
{
port = this->port;
selected = this->ipv6;
}
if (this->ipv6_natt != -1 && FD_ISSET(this->ipv6_natt, &rfds))
{
port = this->natt;
selected = this->ipv6_natt;
}
if (selected)
{ {
struct msghdr msg; struct msghdr msg;
struct cmsghdr *cmsgptr; struct cmsghdr *cmsgptr;