version 1.9.2.7, 2012/05/16 16:36:10
|
version 1.10.2.2, 2012/07/22 18:46:57
|
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 |
| fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
|
|
return cli; |
return cli; |
} |
} |
Line 124 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 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 144 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; |
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 161 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 169 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 188 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 |
| fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
|
|
return cli; |
return cli; |
} |
} |
Line 222 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 235 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
Line 239 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
* @cli = RPC Client session |
* @cli = RPC Client session |
* @noreply = We not want RPC reply |
* @noreply = We not want RPC reply |
* @tag = Function tag for execution |
* @tag = Function tag for execution |
* @in_vars = IN RPC call array of rpc values | * @in_vars = IN RPC call array of rpc values, may be NULL |
* @out_vars = OUT returned array of rpc values, must be free after use with rpc_cli_freeVals() | * @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with io_freeVars() |
* return: -1 error or != -1 ok result |
* return: -1 error or != -1 ok result |
*/ |
*/ |
int |
int |
Line 262 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 266 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
rpc_addPktSession(&rpc->call_session, cli->cli_parent); |
rpc_addPktSession(&rpc->call_session, cli->cli_parent); |
rpc->call_argc = htons(io_arraySize(in_vars)); |
rpc->call_argc = htons(io_arraySize(in_vars)); |
rpc->call_tag = htons(tag); |
rpc->call_tag = htons(tag); |
|
rpc->call_seq = htons(random() % USHRT_MAX); |
|
|
/* set reply */ |
/* set reply */ |
rpc->call_req.flags = noreply ? RPC_NOREPLY : RPC_REPLY; |
rpc->call_req.flags = noreply ? RPC_NOREPLY : RPC_REPLY; |
Line 283 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 348 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 378 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
} |
} |
|
|
/* RPC is OK! Go de-marshaling variables ... */ |
/* RPC is OK! Go de-marshaling variables ... */ |
if (ntohs(rpc->call_argc)) { | if (out_vars && ntohs(rpc->call_argc)) { |
*out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, |
*out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, |
ntohs(rpc->call_argc), 0); |
ntohs(rpc->call_argc), 0); |
if (!*out_vars) { |
if (!*out_vars) { |
|
rpc_SetErr(io_GetErrno(), "%s", io_GetError()); |
return -1; |
return -1; |
} |
} |
} |
} |
|
|
ret = ntohl(rpc->call_rep.ret); |
ret = ntohl(rpc->call_rep.ret); |
|
return ret; |
|
} |
|
|
|
/* |
|
* rpc_cli_ping() - Ping RPC server |
|
* |
|
* @cli = connected client |
|
* return: -1 error or !=-1 ping seq id |
|
*/ |
|
inline int |
|
rpc_cli_ping(rpc_cli_t *cli) |
|
{ |
|
int ret = 0; |
|
array_t *arr = NULL; |
|
|
|
if (!cli) |
|
return -1; |
|
|
|
if (rpc_cli_execCall(cli, RPC_REPLY, CALL_SRVPING, NULL, &arr)) |
|
return -1; |
|
else |
|
ret = AIT_GET_U16(io_array(arr, 0, ait_val_t*)); |
|
io_freeVars(&arr); |
|
|
return ret; |
return ret; |
} |
} |