version 1.9.2.14, 2012/05/17 21:40:02
|
version 1.9.2.18, 2012/05/18 23:03:00
|
Line 290 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 290 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
|
|
pfd.fd = cli->cli_sock; |
pfd.fd = cli->cli_sock; |
pfd.events = POLLOUT; |
pfd.events = POLLOUT; |
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, can't send to RPC server"); |
return -1; |
return -1; |
} |
} |
if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) { | do { |
LOGERR; | if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) { |
return -1; | if (errno == EAGAIN) |
} else if (ret != wlen) { | continue; |
rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, " | LOGERR; |
"really sended %d bytes", wlen, ret); | return -1; |
return -1; | } else if (ret != wlen) { |
} | rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, " |
| "really sended %d bytes", wlen, ret); |
| return -1; |
| } |
| } while (0); |
|
|
if (noreply) /* we not want reply */ |
if (noreply) /* we not want reply */ |
return 0; |
return 0; |
|
|
|
wlen = 0; |
/* reply from RPC server */ |
/* reply from RPC server */ |
pfd.fd = cli->cli_sock; |
|
pfd.events = POLLIN | POLLPRI; |
pfd.events = POLLIN | POLLPRI; |
if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || | do { |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { | if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
if (ret) | pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
LOGERR; | if (ret) |
else | LOGERR; |
rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server"); | else { |
| if (wlen++ < 7) |
return -1; | continue; |
} | else |
memset(buf, 0, AIT_LEN(&cli->cli_buf)); | rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server"); |
if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) { | } |
if (ret) | return -1; |
LOGERR; | } |
return -1; | } while (0); |
} | do { |
| memset(buf, 0, AIT_LEN(&cli->cli_buf)); |
| if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) { |
| if (ret) { |
| if (errno == EAGAIN) |
| continue; |
| else |
| LOGERR; |
| } |
| return -1; |
| } |
| } while (0); |
if (ret < sizeof(struct tagRPCCall)) { |
if (ret < sizeof(struct tagRPCCall)) { |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); | rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); |
return -1; |
return -1; |
} |
} |
|
|
/* calculate CRC */ |
/* calculate CRC */ |
crc = ntohs(rpc->call_crc); |
crc = ntohs(rpc->call_crc); |
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc ^= rpc->call_crc; |
if (crc != crcFletcher16((u_short*) buf, ret / 2)) { | if (crc != crcFletcher16((u_short*) buf, ntohs(rpc->call_len) / 2)) { |
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); |
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); |
return -1; |
return -1; |
} |
} |
Line 382 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 400 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
inline int |
inline int |
rpc_cli_ping(rpc_cli_t *cli) |
rpc_cli_ping(rpc_cli_t *cli) |
{ |
{ |
array_t *arr; |
|
int ret = 0; |
int ret = 0; |
|
array_t *arr = NULL; |
|
|
if (!cli) |
if (!cli) |
return -1; |
return -1; |
Line 391 rpc_cli_ping(rpc_cli_t *cli)
|
Line 409 rpc_cli_ping(rpc_cli_t *cli)
|
if (rpc_cli_execCall(cli, RPC_REPLY, CALL_SRVPING, NULL, &arr)) |
if (rpc_cli_execCall(cli, RPC_REPLY, CALL_SRVPING, NULL, &arr)) |
return -1; |
return -1; |
else |
else |
ret = AIT_GET_U16(io_getVars(arr, 0)); | ret = AIT_GET_U16(io_array(arr, 0, ait_val_t*)); |
io_freeVars(&arr); |
io_freeVars(&arr); |
|
|
return ret; |
return ret; |