|
 |
42131c |
diff -up libtirpc-0.2.4/src/rtime.c.orig libtirpc-0.2.4/src/rtime.c
|
|
|
42131c |
--- libtirpc-0.2.4/src/rtime.c.orig 2013-12-09 15:59:51.000000000 -0500
|
|
|
42131c |
+++ libtirpc-0.2.4/src/rtime.c 2017-02-25 12:29:25.227847702 -0500
|
|
|
42131c |
@@ -46,6 +46,7 @@
|
|
|
42131c |
#include <unistd.h>
|
|
|
42131c |
#include <errno.h>
|
|
|
42131c |
#include <sys/types.h>
|
|
|
42131c |
+#include <sys/poll.h>
|
|
|
42131c |
#include <sys/socket.h>
|
|
|
42131c |
#include <sys/time.h>
|
|
|
42131c |
#include <netinet/in.h>
|
|
|
42131c |
@@ -67,7 +68,8 @@ rtime(addrp, timep, timeout)
|
|
|
42131c |
struct timeval *timeout;
|
|
|
42131c |
{
|
|
|
42131c |
int s;
|
|
|
42131c |
- fd_set readfds;
|
|
|
42131c |
+ struct pollfd fd;
|
|
|
42131c |
+ int milliseconds;
|
|
|
42131c |
int res;
|
|
|
42131c |
unsigned long thetime;
|
|
|
42131c |
struct sockaddr_in from;
|
|
|
42131c |
@@ -94,31 +96,32 @@ rtime(addrp, timep, timeout)
|
|
|
42131c |
addrp->sin_port = serv->s_port;
|
|
|
42131c |
|
|
|
42131c |
if (type == SOCK_DGRAM) {
|
|
|
42131c |
- res = sendto(s, (char *)&thetime, sizeof(thetime), 0,
|
|
|
42131c |
+ res = sendto(s, (char *)&thetime, sizeof(thetime), 0,
|
|
|
42131c |
(struct sockaddr *)addrp, sizeof(*addrp));
|
|
|
42131c |
if (res < 0) {
|
|
|
42131c |
do_close(s);
|
|
|
42131c |
- return(-1);
|
|
|
42131c |
+ return(-1);
|
|
|
42131c |
}
|
|
|
42131c |
- do {
|
|
|
42131c |
- FD_ZERO(&readfds);
|
|
|
42131c |
- FD_SET(s, &readfds);
|
|
|
42131c |
- res = select(_rpc_dtablesize(), &readfds,
|
|
|
42131c |
- (fd_set *)NULL, (fd_set *)NULL, timeout);
|
|
|
42131c |
- } while (res < 0 && errno == EINTR);
|
|
|
42131c |
+
|
|
|
42131c |
+ milliseconds = (timeout->tv_sec * 1000) + (timeout->tv_usec / 1000);
|
|
|
42131c |
+ fd.fd = s;
|
|
|
42131c |
+ fd.events = POLLIN;
|
|
|
42131c |
+ do
|
|
|
42131c |
+ res = poll (&fd, 1, milliseconds);
|
|
|
42131c |
+ while (res < 0 && errno == EINTR);
|
|
|
42131c |
if (res <= 0) {
|
|
|
42131c |
if (res == 0) {
|
|
|
42131c |
errno = ETIMEDOUT;
|
|
|
42131c |
}
|
|
|
42131c |
do_close(s);
|
|
|
42131c |
- return(-1);
|
|
|
42131c |
+ return(-1);
|
|
|
42131c |
}
|
|
|
42131c |
fromlen = sizeof(from);
|
|
|
42131c |
- res = recvfrom(s, (char *)&thetime, sizeof(thetime), 0,
|
|
|
42131c |
+ res = recvfrom(s, (char *)&thetime, sizeof(thetime), 0,
|
|
|
42131c |
(struct sockaddr *)&from, &fromlen);
|
|
|
42131c |
do_close(s);
|
|
|
42131c |
if (res < 0) {
|
|
|
42131c |
- return(-1);
|
|
|
42131c |
+ return(-1);
|
|
|
42131c |
}
|
|
|
42131c |
} else {
|
|
|
42131c |
if (connect(s, (struct sockaddr *)addrp, sizeof(*addrp)) < 0) {
|
|
|
42131c |
diff -up libtirpc-0.2.4/src/svc_vc.c.orig libtirpc-0.2.4/src/svc_vc.c
|
|
|
42131c |
--- libtirpc-0.2.4/src/svc_vc.c.orig 2017-02-25 12:26:55.430978326 -0500
|
|
|
42131c |
+++ libtirpc-0.2.4/src/svc_vc.c 2017-02-25 12:29:25.227847702 -0500
|
|
|
42131c |
@@ -260,14 +260,8 @@ makefd_xprt(fd, sendsize, recvsize)
|
|
|
42131c |
struct cf_conn *cd;
|
|
|
42131c |
const char *netid;
|
|
|
42131c |
struct __rpc_sockinfo si;
|
|
|
42131c |
-
|
|
|
42131c |
- assert(fd != -1);
|
|
|
42131c |
|
|
|
42131c |
- if (fd >= FD_SETSIZE) {
|
|
|
42131c |
- warnx("svc_vc: makefd_xprt: fd too high\n");
|
|
|
42131c |
- xprt = NULL;
|
|
|
42131c |
- goto done;
|
|
|
42131c |
- }
|
|
|
42131c |
+ assert(fd != -1);
|
|
|
42131c |
|
|
|
42131c |
xprt = mem_alloc(sizeof(SVCXPRT));
|
|
|
42131c |
if (xprt == NULL) {
|
|
|
42131c |
@@ -340,6 +334,8 @@ again:
|
|
|
42131c |
*/
|
|
|
42131c |
|
|
|
42131c |
newxprt = makefd_xprt(sock, r->sendsize, r->recvsize);
|
|
|
42131c |
+ if (!newxprt)
|
|
|
42131c |
+ return (FALSE);
|
|
|
42131c |
|
|
|
42131c |
if (!__rpc_set_netbuf(&newxprt->xp_rtaddr, &addr, len))
|
|
|
42131c |
return (FALSE);
|