version 1.9.2.9, 2012/05/17 14:22:24
|
version 1.12.2.2, 2012/11/19 14:51:52
|
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 |
|
* @proto = Protocol, if == 0 choose SOCK_STREAM |
* return: NULL == error or !=NULL connection to RPC server established |
* return: NULL == error or !=NULL connection to RPC server established |
*/ |
*/ |
rpc_cli_t * |
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, int proto) |
{ |
{ |
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 (!proto) |
| proto = SOCK_STREAM; |
| if (netBuf < RPC_MIN_BUFSIZ) |
netBuf = BUFSIZ; |
netBuf = BUFSIZ; |
|
else |
|
netBuf = io_align(netBuf, 2); /* 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 168 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 176 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 180 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 187 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID; |
((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID; |
} |
} |
|
|
|
cli->cli_id = proto; |
memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa); |
memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa); |
AIT_SET_BUF2(&cli->cli_buf, 0, netBuf); |
AIT_SET_BUF2(&cli->cli_buf, 0, netBuf); |
|
|
/* connect to RPC server */ |
/* connect to RPC server */ |
cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0); | cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0); |
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 (cli->cli_id == SOCK_STREAM) |
LOGERR; | if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { |
AIT_FREE_VAL(&cli->cli_buf); | LOGERR; |
close(cli->cli_sock); | AIT_FREE_VAL(&cli->cli_buf); |
free(cli->cli_parent); | close(cli->cli_sock); |
free(cli); | io_free(cli->cli_parent); |
return NULL; | io_free(cli); |
} | return NULL; |
| } |
|
|
|
fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
return cli; |
return cli; |
} |
} |
|
|
Line 216 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
Line 226 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
if (!cli || !*cli) |
if (!cli || !*cli) |
return; |
return; |
|
|
shutdown((*cli)->cli_sock, SHUT_RDWR); | if ((*cli)->cli_id == SOCK_STREAM) |
| shutdown((*cli)->cli_sock, SHUT_RDWR); |
close((*cli)->cli_sock); |
close((*cli)->cli_sock); |
|
|
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 248 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 259 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
uint16_t crc; |
uint16_t crc; |
u_char *buf; |
u_char *buf; |
struct pollfd pfd; |
struct pollfd pfd; |
|
io_sockaddr_t sa; |
|
socklen_t salen; |
|
|
if (!cli) { |
if (!cli) { |
rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!"); |
rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!"); |
Line 257 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 270 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
if (out_vars) |
if (out_vars) |
*out_vars = NULL; |
*out_vars = NULL; |
|
|
|
memset(&sa, 0, sizeof sa); |
|
|
/* prepare RPC call */ |
/* prepare RPC call */ |
rpc = (struct tagRPCCall*) buf; |
rpc = (struct tagRPCCall*) buf; |
rpc_addPktSession(&rpc->call_session, cli->cli_parent); |
rpc_addPktSession(&rpc->call_session, cli->cli_parent); |
Line 284 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 299 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) { | pfd.fd = cli->cli_sock; |
LOGERR; | 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, can't send to RPC server"); |
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; |
|
} |
} |
|
do { |
|
if (cli->cli_id == SOCK_STREAM) |
|
ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL); |
|
else |
|
ret = sendto(cli->cli_sock, buf, wlen, MSG_NOSIGNAL, |
|
&cli->cli_sa.sa, cli->cli_sa.sa.sa_len); |
|
if (ret == -1) { |
|
if (errno == EAGAIN) |
|
continue; |
|
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; |
|
} |
|
} 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) { |
| LOGERR; |
| } else { |
| if (wlen++ < 7) |
| continue; |
| else |
| rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server"); |
| } |
| |
| return -1; |
| } |
| |
| memset(buf, 0, AIT_LEN(&cli->cli_buf)); |
| if (cli->cli_id == SOCK_STREAM) |
| ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0); |
else |
else |
rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server"); | ret = recvfrom(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0, |
| &sa.sa, &salen); |
| if (ret < 1) { |
| if (ret) { |
| if (errno == EAGAIN) |
| continue; |
| else |
| LOGERR; |
| } |
| return -1; |
| } |
|
|
return -1; | if (cli->cli_id == SOCK_DGRAM) { |
} | /* check for response from known address */ |
memset(buf, 0, AIT_LEN(&cli->cli_buf)); | if (io_addrcmp(&cli->cli_sa, &sa, 42)) { |
if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) { | rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address"); |
if (ret) | continue; |
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 350 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 408 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 (out_vars && ntohs(rpc->call_argc)) { |
if (out_vars && ntohs(rpc->call_argc)) { |
|
#ifdef CLI_RES_ZCOPY |
*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), 42); |
|
#else |
|
*out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, |
ntohs(rpc->call_argc), 0); |
ntohs(rpc->call_argc), 0); |
|
#endif |
if (!*out_vars) { |
if (!*out_vars) { |
rpc_SetErr(io_GetErrno(), "%s", io_GetError()); |
rpc_SetErr(io_GetErrno(), "%s", io_GetError()); |
return -1; |
return -1; |
Line 363 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 426 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
} |
} |
|
|
/* |
/* |
|
* rpc_cli_freeCall() - Free resouce allocated by RPC call |
|
* |
|
* @out_vars = Returned array with variables from RPC call |
|
* return: none |
|
*/ |
|
inline void |
|
rpc_cli_freeCall(array_t ** __restrict out_vars) |
|
{ |
|
#ifdef CLI_RES_ZCOPY |
|
io_arrayDestroy(out_vars); |
|
#else |
|
io_freeVars(out_vars); |
|
#endif |
|
} |
|
|
|
/* |
* rpc_cli_ping() - Ping RPC server |
* rpc_cli_ping() - Ping RPC server |
* |
* |
* @cli = connected client |
* @cli = connected client |
Line 371 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 450 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 459 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); | rpc_cli_freeCall(&arr); |
|
|
return ret; |
return ret; |
} |
} |