From: Jan Moskyto Matejka <mq@ucw.cz>
Date: Fri, 18 Mar 2016 10:44:28 +0000 (+0100)
Subject: Unix: Substituted select -> poll also in congestion checker
X-Git-Tag: v1.6.0~17^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c92f69272de3795f7289969e815d99a93d0d9b3;p=thirdparty%2Fbird.git

Unix: Substituted select -> poll also in congestion checker

It does strange things when even one fd larger than FD_SETSIZE is
passed to select().
---

diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c
index b769de583..eb1c1cadc 100644
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@ -1679,19 +1679,12 @@ sk_maybe_write(sock *s)
 int
 sk_rx_ready(sock *s)
 {
-  fd_set rd, wr;
-  struct timeval timo;
   int rv;
-
-  FD_ZERO(&rd);
-  FD_ZERO(&wr);
-  FD_SET(s->fd, &rd);
-
-  timo.tv_sec = 0;
-  timo.tv_usec = 0;
+  struct pollfd pfd = { .fd = s->fd };
+  pfd.events |= POLLIN;
 
  redo:
-  rv = select(s->fd+1, &rd, &wr, NULL, &timo);
+  rv = poll(&pfd, 1, 0);
 
   if ((rv < 0) && (errno == EINTR || errno == EAGAIN))
     goto redo;