version 1.9.2.9, 2012/05/17 14:22:24
|
version 1.9.2.18, 2012/05/18 23:03:00
|
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 |
| fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
|
|
return cli; |
return cli; |
} |
} |
Line 135 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
|
Line 136 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
|
* |
* |
* @ProgID = ProgramID for RPC session request |
* @ProgID = ProgramID for RPC session request |
* @ProcID = ProcessID for RPC session request |
* @ProcID = ProcessID for RPC session request |
* @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet) | * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) |
* @csHost = Host name or IP address for bind server |
* @csHost = Host name or IP address for bind server |
* @Port = Port for bind server, if Port == 0 default port is selected |
* @Port = Port for bind server, if Port == 0 default port is selected |
* return: NULL == error or !=NULL connection to RPC server established |
* return: NULL == error or !=NULL connection to RPC server established |
Line 150 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 151 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
return NULL; |
return NULL; |
if (!Port) |
if (!Port) |
Port = RPC_DEFPORT; |
Port = RPC_DEFPORT; |
if (!netBuf) | if (netBuf < RPC_MIN_BUFSIZ) |
netBuf = BUFSIZ; |
netBuf = BUFSIZ; |
|
else |
|
netBuf = io_align(netBuf, 1); /* align netBuf length */ |
|
|
#ifdef HAVE_SRANDOMDEV |
#ifdef HAVE_SRANDOMDEV |
srandomdev(); |
srandomdev(); |
Line 199 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 |
| fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
|
|
return cli; |
return cli; |
} |
} |
Line 284 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)); |
|
|
if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) { |
|
LOGERR; |
|
return -1; |
|
} else if (ret != wlen) { |
|
rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, " |
|
"really sended %d bytes", wlen, ret); |
|
return -1; |
|
} |
|
|
|
if (noreply) /* we not want reply */ |
|
return 0; |
|
|
|
/* reply from RPC server */ |
|
pfd.fd = cli->cli_sock; |
pfd.fd = cli->cli_sock; |
pfd.events = POLLIN | POLLPRI; | 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)) { |
if (ret) |
if (ret) |
LOGERR; |
LOGERR; |
else |
else |
rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server"); | rpc_SetErr(ETIMEDOUT, "Timeout, can't send to RPC server"); |
| |
return -1; |
return -1; |
} |
} |
memset(buf, 0, AIT_LEN(&cli->cli_buf)); | do { |
if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) { | if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) { |
if (ret) | if (errno == EAGAIN) |
| continue; |
LOGERR; |
LOGERR; |
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 */ |
| return 0; |
| |
| wlen = 0; |
| /* reply from RPC server */ |
| pfd.events = POLLIN | POLLPRI; |
| do { |
| if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
| pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
| if (ret) |
| LOGERR; |
| else { |
| if (wlen++ < 7) |
| continue; |
| else |
| rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server"); |
| } |
| 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 371 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 380 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; |