proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 11:18:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: correctly handle EOF when using poll()

Browse Source 
Descriptor owner should handle EOF, not thread.c

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-05-16 18:17:23 +00:00
parent c5761c2b5b
commit 6ccdc60d96
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/thread.c
View File

@ -1211,14 +1211,13 @@ check_pollfds(struct thread_master *m, fd_set *readfd, int num)
ready++; ready++;
/* POLLIN / POLLOUT process event */ /* POLLIN / POLLOUT process event */
if (m->handler.pfds[i].revents & POLLIN) if (m->handler.pfds[i].revents & (POLLIN | POLLHUP))
thread_process_fds_helper(m, m->read[m->handler.pfds[i].fd], NULL, POLLIN, i); thread_process_fds_helper(m, m->read[m->handler.pfds[i].fd], NULL, POLLIN, i);
if (m->handler.pfds[i].revents & POLLOUT) if (m->handler.pfds[i].revents & POLLOUT)
thread_process_fds_helper(m, m->write[m->handler.pfds[i].fd], NULL, POLLOUT, i); thread_process_fds_helper(m, m->write[m->handler.pfds[i].fd], NULL, POLLOUT, i);
/* remove fd from list on POLLNVAL */ /* remove fd from list on POLLNVAL */
if (m->handler.pfds[i].revents & POLLNVAL || if (m->handler.pfds[i].revents & POLLNVAL)
m->handler.pfds[i].revents & POLLHUP)
{ {
memmove(m->handler.pfds+i, memmove(m->handler.pfds+i,
m->handler.pfds+i+1, m->handler.pfds+i+1,