version 1.12.4.3, 2013/11/14 22:53:12
|
version 1.12.4.5, 2013/11/15 09:07:42
|
Line 169 rpc_Read(int sock, int type, int flags, sockaddr_t * _
|
Line 169 rpc_Read(int sock, int type, int flags, sockaddr_t * _
|
for (len = blen; len > 0; len -= ret, buf += ret) { |
for (len = blen; len > 0; len -= ret, buf += ret) { |
if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
LOGERR; | if (ret) |
| LOGERR; |
| else |
| rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); |
return -1; |
return -1; |
} |
} |
if (type == SOCK_STREAM) |
if (type == SOCK_STREAM) |
ret = recv(sock, buf, len, flags); |
ret = recv(sock, buf, len, flags); |
else { |
else { |
ret = recvfrom(sock, buf, len, flags, &sa2.sa, &salen); |
ret = recvfrom(sock, buf, len, flags, &sa2.sa, &salen); |
if (ret > -1 && e_addrcmp(sa, &sa2, 42)) { | if (ret > -1 && sa && e_addrcmp(sa, &sa2, 42)) { |
rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address"); | rpc_SetErr(ERPCMISMATCH, |
| "Received RPC response from unknown address"); |
return -1; |
return -1; |
} |
} |
} |
} |