version 1.9.2.12, 2012/05/17 15:24:28
|
version 1.9.2.13, 2012/05/17 21:14:13
|
Line 102 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 102 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
close(cli->cli_sock); |
close(cli->cli_sock); |
free(cli); |
free(cli); |
return NULL; |
return NULL; |
} /*else | } else |
fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
*/ |
|
|
|
return cli; |
return cli; |
} |
} |
Line 203 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 202 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
free(cli->cli_parent); |
free(cli->cli_parent); |
free(cli); |
free(cli); |
return NULL; |
return NULL; |
} /*else | } else |
fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
*/ |
|
|
|
return cli; |
return cli; |
} |
} |
Line 290 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 288 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); |
rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); |
|
|
|
pfd.fd = cli->cli_sock; |
|
pfd.events = POLLOUT; |
|
if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || |
|
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
|
if (ret) |
|
LOGERR; |
|
else |
|
rpc_SetErr(ETIMEDOUT, "Timeout, no ready to send"); |
|
|
|
return -1; |
|
} |
if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) { |
if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |