Showing this to a wider audience,
This was initially prompted by a diff to replace calloc with
reallocarray. As noted by guenther, there is a problem with the
comparisons between width, rpcsock and pingsock; this, plus the fd_set
allocation inconvenience would be easily fixed by moving from select to
poll.
I do not use YP so tests are more than welcome.
Comments / ok?
Index: ypbind.c
===================================================================
RCS file: /cvs/src/usr.sbin/ypbind/ypbind.c,v
retrieving revision 1.66
diff -u -p -p -u -r1.66 ypbind.c
--- ypbind.c 21 Mar 2016 00:49:36 -0000 1.66
+++ ypbind.c 1 Jul 2016 21:33:53 -0000
@@ -53,6 +53,7 @@
#include <rpcsvc/yp.h>
#include <rpcsvc/ypclnt.h>
#include <ifaddrs.h>
+#include <poll.h>
#define SERVERSDIR "/etc/yp"
#define BINDINGDIR "/var/yp/binding"
@@ -336,10 +337,8 @@ main(int argc, char *argv[])
{
char path[PATH_MAX];
struct sockaddr_in sin;
- struct timeval tv;
- fd_set *fdsrp = NULL;
- int fdsrl = 0;
- int width, lockfd, lsock;
+ struct pollfd *pfd = NULL;
+ int width = 0, lockfd, lsock;
socklen_t len;
int evil = 0, one = 1;
DIR *dirp;
@@ -530,44 +529,32 @@ main(int argc, char *argv[])
checkwork();
while (1) {
- extern int __svc_fdsetsize;
- extern void *__svc_fdset;
-
- if (fdsrp == NULL || fdsrl != __svc_fdsetsize) {
- free(fdsrp);
-
- fdsrl = __svc_fdsetsize;
- width = __svc_fdsetsize;
- if (rpcsock > __svc_fdsetsize)
- width = rpcsock;
- if (pingsock > __svc_fdsetsize)
- width = pingsock;
- fdsrp = calloc(howmany(width+1, NFDBITS),
sizeof(fd_mask));
- if (fdsrp == NULL)
- errx(1, "no memory");
- }
-
- bcopy(__svc_fdset, fdsrp, howmany(fdsrl+1, NFDBITS) *
- sizeof(fd_mask));
- FD_SET(rpcsock, fdsrp);
- FD_SET(pingsock, fdsrp);
+ if (pfd == NULL || width != svc_max_pollfd + 2) {
+ width = svc_max_pollfd + 2;
+ pfd = reallocarray(pfd, width, sizeof *pfd);
+ if (pfd == NULL)
+ err(1, NULL);
+ }
- tv.tv_sec = 1;
- tv.tv_usec = 0;
+ pfd[0].fd = rpcsock;
+ pfd[0].events = POLLIN;
+ pfd[1].fd = pingsock;
+ pfd[1].events = POLLIN;
+ memcpy(pfd + 2, svc_pollfd, svc_max_pollfd);
- switch (select(width+1, fdsrp, NULL, NULL, &tv)) {
+ switch (poll(pfd, width, 1000)) {
case 0:
checkwork();
break;
case -1:
- perror("select\n");
+ perror("poll");
break;
default:
- if (FD_ISSET(rpcsock, fdsrp))
+ if (pfd[0].revents & POLLIN)
handle_replies();
- if (FD_ISSET(pingsock, fdsrp))
+ if (pfd[1].revents & POLLIN)
handle_ping();
- svc_getreqset2(fdsrp, width);
+ svc_getreq_poll(pfd + 2, svc_max_pollfd);
if (check)
checkwork();
break;
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
