DEVEL15-rx-lwp-sendmsg-20070614

update the lwp version of rxi_sendmsg to return the same error, -1,
returned by the pthread version.

replace errno with WSAGetLastError() in the Windows blocks so that
the correct error value is checked.


(cherry picked from commit 46a931d020)
This commit is contained in:
Jeffrey Altman 2007-06-14 20:06:25 +00:00
parent 2bc3dfc829
commit b8d45dbd09
2 changed files with 4 additions and 4 deletions

View File

@ -445,12 +445,12 @@ rxi_Sendmsg(osi_socket socket, struct msghdr *msg_p, int flags)
if (!(sfds = IOMGR_AllocFDSet())) {
(osi_Msg "rx failed to alloc fd_set: ");
perror("rx_sendmsg");
return 3;
return -1;
}
FD_SET(socket, sfds);
}
#ifdef AFS_NT40_ENV
if (errno)
if (WSAGetLastError())
#elif defined(AFS_LINUX22_ENV)
/* linux unfortunately returns ECONNREFUSED if the target port
* is no longer in use */
@ -463,7 +463,7 @@ rxi_Sendmsg(osi_socket socket, struct msghdr *msg_p, int flags)
{
(osi_Msg "rx failed to send packet: ");
perror("rx_sendmsg");
return 3;
return -1;
}
while ((err = select(socket + 1, 0, sfds, 0, 0)) != 1) {
if (err >= 0 || errno != EINTR)

View File

@ -2233,7 +2233,7 @@ rxi_SendPacket(struct rx_call *call, struct rx_connection *conn,
* code. So, when this happens let's "down" the host NOW so
* we don't sit around waiting for this host to timeout later.
*/
if (call && code == -1 && errno == WSAEHOSTUNREACH)
if (call && code == -1 && WSAGetLastError() == WSAEHOSTUNREACH)
call->lastReceiveTime = 0;
#endif
#if defined(KERNEL) && defined(AFS_LINUX20_ENV)