version 1.9.2.13, 2012/05/17 21:14:13
|
version 1.11.2.1, 2012/09/17 14:16:42
|
Line 63 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 63 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
return NULL; |
return NULL; |
} |
} |
|
|
cli = malloc(sizeof(rpc_cli_t)); | cli = io_malloc(sizeof(rpc_cli_t)); |
if (!cli) { |
if (!cli) { |
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
Line 94 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 94 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0); |
cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0); |
if (cli->cli_sock == -1) { |
if (cli->cli_sock == -1) { |
LOGERR; |
LOGERR; |
free(cli); | io_free(cli); |
return NULL; |
return NULL; |
} |
} |
if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { |
if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { |
LOGERR; |
LOGERR; |
close(cli->cli_sock); |
close(cli->cli_sock); |
free(cli); | io_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); |
Line 125 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
|
Line 125 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
|
|
|
AIT_FREE_VAL(&(*cli)->cli_buf); |
AIT_FREE_VAL(&(*cli)->cli_buf); |
|
|
free(*cli); | io_free(*cli); |
*cli = NULL; |
*cli = NULL; |
} |
} |
|
|
Line 145 rpc_cli_t *
|
Line 145 rpc_cli_t *
|
rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, u_short Port) |
rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, u_short Port) |
{ |
{ |
rpc_cli_t *cli = NULL; |
rpc_cli_t *cli = NULL; |
io_sockaddr_t sa; | io_sockaddr_t sa = IO_SOCKADDR_INIT; |
|
|
if (!io_gethostbyname(csHost, Port, &sa)) |
if (!io_gethostbyname(csHost, Port, &sa)) |
return NULL; |
return NULL; |
Line 154 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 154 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
if (netBuf < RPC_MIN_BUFSIZ) |
if (netBuf < RPC_MIN_BUFSIZ) |
netBuf = BUFSIZ; |
netBuf = BUFSIZ; |
else |
else |
netBuf = io_align(netBuf, 1); /* align netBuf length */ | netBuf = io_align(netBuf, 2); /* align netBuf length */ |
|
|
#ifdef HAVE_SRANDOMDEV |
#ifdef HAVE_SRANDOMDEV |
srandomdev(); |
srandomdev(); |
Line 164 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 164 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
srandom((time(&tim) ^ getpid())); |
srandom((time(&tim) ^ getpid())); |
#endif |
#endif |
|
|
cli = malloc(sizeof(rpc_cli_t)); | cli = io_malloc(sizeof(rpc_cli_t)); |
if (!cli) { |
if (!cli) { |
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
Line 172 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 172 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
memset(cli, 0, sizeof(rpc_cli_t)); |
memset(cli, 0, sizeof(rpc_cli_t)); |
|
|
/* build session */ |
/* build session */ |
cli->cli_parent = malloc(sizeof(rpc_sess_t)); | cli->cli_parent = io_malloc(sizeof(rpc_sess_t)); |
if (!cli->cli_parent) { |
if (!cli->cli_parent) { |
LOGERR; |
LOGERR; |
free(cli); | io_free(cli); |
return NULL; |
return NULL; |
} else { |
} else { |
((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION; |
((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION; |
Line 191 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 191 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
if (cli->cli_sock == -1) { |
if (cli->cli_sock == -1) { |
LOGERR; |
LOGERR; |
AIT_FREE_VAL(&cli->cli_buf); |
AIT_FREE_VAL(&cli->cli_buf); |
free(cli->cli_parent); | io_free(cli->cli_parent); |
free(cli); | io_free(cli); |
return NULL; |
return NULL; |
} |
} |
if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { |
if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { |
LOGERR; |
LOGERR; |
AIT_FREE_VAL(&cli->cli_buf); |
AIT_FREE_VAL(&cli->cli_buf); |
close(cli->cli_sock); |
close(cli->cli_sock); |
free(cli->cli_parent); | io_free(cli->cli_parent); |
free(cli); | io_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); |
Line 226 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
Line 226 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
AIT_FREE_VAL(&(*cli)->cli_buf); |
AIT_FREE_VAL(&(*cli)->cli_buf); |
|
|
if ((*cli)->cli_parent) |
if ((*cli)->cli_parent) |
free((*cli)->cli_parent); | io_free((*cli)->cli_parent); |
|
|
free(*cli); | io_free(*cli); |
*cli = NULL; |
*cli = NULL; |
} |
} |
|
|
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)) { |
if (ret) |
if (ret) |
LOGERR; |
LOGERR; |
else |
else |
rpc_SetErr(ETIMEDOUT, "Timeout, no ready to send"); | 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 386 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 395 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; |