diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2007-05-14 14:18:41 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2007-05-14 14:18:41 +0000 |
| commit | 82a35b739ab487714efe6001ecb1d5789d83074c (patch) | |
| tree | f5348dd2c041df8b884da04bf627f96d517509e3 /lib/libnetgraph | |
| parent | 79df5e05ee582e4948c7cecbf834f725fd1e8b18 (diff) | |
| download | src-82a35b739ab487714efe6001ecb1d5789d83074c.tar.gz src-82a35b739ab487714efe6001ecb1d5789d83074c.zip | |
Notes
Diffstat (limited to 'lib/libnetgraph')
| -rw-r--r-- | lib/libnetgraph/internal.h | 2 | ||||
| -rw-r--r-- | lib/libnetgraph/msg.c | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/libnetgraph/internal.h b/lib/libnetgraph/internal.h index 0c947e5eab6d..748ca7bb7571 100644 --- a/lib/libnetgraph/internal.h +++ b/lib/libnetgraph/internal.h @@ -44,7 +44,7 @@ #include <sys/param.h> #include <sys/time.h> #include <sys/socket.h> -#include <sys/select.h> +#include <poll.h> #include <sys/linker.h> #include <stddef.h> diff --git a/lib/libnetgraph/msg.c b/lib/libnetgraph/msg.c index 48447d953265..534d1d181d48 100644 --- a/lib/libnetgraph/msg.c +++ b/lib/libnetgraph/msg.c @@ -235,16 +235,17 @@ NgDeliverMsg(int cs, const char *path, /* Wait for reply if there should be one. */ if (msg->header.cmd & NGM_HASREPLY) { - fd_set rfds; + struct pollfd rfds; int n; - FD_ZERO(&rfds); - FD_SET(cs, &rfds); - n = select(cs + 1, &rfds, NULL, NULL, NULL); + rfds.fd = cs; + rfds.events = POLLIN; + rfds.revents = 0; + n = poll(&rfds, 1, INFTIM); if (n == -1) { errnosv = errno; if (_gNgDebugLevel >= 1) - NGLOG("select"); + NGLOG("poll"); rtn = -1; } } |