File glibc-2.2-sunrpc.diff of Package glibc-utils.9247

Overview Repositories Revisions Requests Users Attributes Meta

File glibc-2.2-sunrpc.diff of Package glibc-utils.9247

For details see:
http://sourceware.org/bugzilla/show_bug.cgi?id=5379

Index: glibc-2.20/sunrpc/clnt_udp.c
===================================================================
--- glibc-2.20.orig/sunrpc/clnt_udp.c
+++ glibc-2.20/sunrpc/clnt_udp.c
@@ -308,6 +308,7 @@ clntudp_call (cl, proc, xargs, argsp, xr
   XDR *xdrs;
   int outlen = 0;
   int inlen;
+  int pollresult;
   socklen_t fromlen;
   struct pollfd fd;
   int milliseconds = (cu->cu_wait.tv_sec * 1000) +
@@ -378,37 +379,39 @@ send_again:
   anyup = 0;
   for (;;)
     {
-      switch (__poll (&fd, 1, milliseconds))
+      switch (pollresult = __poll (&fd, 1, milliseconds))
 	{
-
 	case 0:
-	  if (anyup == 0)
+	case -1:
+	  if (pollresult == 0 || errno == EINTR)
 	    {
-	      anyup = is_network_up (cu->cu_sock);
-	      if (!anyup)
-		return (cu->cu_error.re_status = RPC_CANTRECV);
+	      if (anyup == 0)
+		{
+		  anyup = is_network_up (cu->cu_sock);
+		  if (!anyup)
+		    return (cu->cu_error.re_status = RPC_CANTRECV);
+		}
+
+	      time_waited.tv_sec += cu->cu_wait.tv_sec;
+	      time_waited.tv_usec += cu->cu_wait.tv_usec;
+	      while (time_waited.tv_usec >= 1000000)
+		{
+		  time_waited.tv_sec++;
+		  time_waited.tv_usec -= 1000000;
+		}
+	      if ((time_waited.tv_sec < timeout.tv_sec) ||
+		  ((time_waited.tv_sec == timeout.tv_sec) &&
+		   (time_waited.tv_usec < timeout.tv_usec)))
+		{
+		  if (pollresult == 0)
+		    goto send_again;
+		  else
+		    continue;
+		}
+	      return (cu->cu_error.re_status = RPC_TIMEDOUT);
 	    }
 
-	  time_waited.tv_sec += cu->cu_wait.tv_sec;
-	  time_waited.tv_usec += cu->cu_wait.tv_usec;
-	  while (time_waited.tv_usec >= 1000000)
-	    {
-	      time_waited.tv_sec++;
-	      time_waited.tv_usec -= 1000000;
-	    }
-	  if ((time_waited.tv_sec < timeout.tv_sec) ||
-	      ((time_waited.tv_sec == timeout.tv_sec) &&
-	       (time_waited.tv_usec < timeout.tv_usec)))
-	    goto send_again;
-	  return (cu->cu_error.re_status = RPC_TIMEDOUT);
-
-	  /*
-	   * buggy in other cases because time_waited is not being
-	   * updated.
-	   */
-	case -1:
-	  if (errno == EINTR)
-	    continue;
+	  /* errno != EINTR */
 	  cu->cu_error.re_errno = errno;
 	  return (cu->cu_error.re_status = RPC_CANTRECV);
 	}

Places

File glibc-2.2-sunrpc.diff of Package glibc-utils.9247

Places