version 1.12, 2012/11/13 09:22:10
|
version 1.13, 2012/11/19 21:50:26
|
Line 57 rpc_cli_t *
|
Line 57 rpc_cli_t *
|
rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port) |
rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port) |
{ |
{ |
rpc_cli_t *cli = NULL; |
rpc_cli_t *cli = NULL; |
|
int n; |
|
|
if (!rpccli) { |
if (!rpccli) { |
rpc_SetErr(EINVAL, "Invalid parameters can`t connect to BLOB server"); |
rpc_SetErr(EINVAL, "Invalid parameters can`t connect to BLOB server"); |
Line 89 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 90 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
} |
} |
|
|
AIT_COPY_VAL(&cli->cli_buf, &rpccli->cli_buf); |
AIT_COPY_VAL(&cli->cli_buf, &rpccli->cli_buf); |
|
n = AIT_LEN(&cli->cli_buf); |
|
|
/* connect to BLOB server */ |
/* connect to BLOB server */ |
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); |
Line 97 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 99 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
io_free(cli); |
io_free(cli); |
return NULL; |
return NULL; |
} |
} |
|
if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) { |
|
LOGERR; |
|
close(cli->cli_sock); |
|
io_free(cli); |
|
return NULL; |
|
} |
|
if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) { |
|
LOGERR; |
|
close(cli->cli_sock); |
|
io_free(cli); |
|
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); |
Line 139 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
|
Line 153 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
|
* @netBuf = Network buffer length (min:512 bytes), 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_INIT; |
io_sockaddr_t sa = IO_SOCKADDR_INIT; |
Line 151 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 167 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 (!proto) |
|
proto = SOCK_STREAM; |
if (netBuf < RPC_MIN_BUFSIZ) |
if (netBuf < RPC_MIN_BUFSIZ) |
netBuf = BUFSIZ; |
netBuf = BUFSIZ; |
else |
else |
Line 183 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 201 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); | goto err; |
io_free(cli->cli_parent); | |
io_free(cli); | |
return NULL; | |
} |
} |
if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { | if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, |
| &netBuf, sizeof netBuf) == -1) { |
LOGERR; |
LOGERR; |
AIT_FREE_VAL(&cli->cli_buf); | goto err; |
close(cli->cli_sock); | } |
io_free(cli->cli_parent); | if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, |
io_free(cli); | &netBuf, sizeof netBuf) == -1) { |
return NULL; | LOGERR; |
} else | goto err; |
fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); | } |
| if (cli->cli_id == SOCK_STREAM) |
| if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { |
| LOGERR; |
| goto err; |
| } |
|
|
|
fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
return cli; |
return cli; |
|
err: |
|
AIT_FREE_VAL(&cli->cli_buf); |
|
if (cli->cli_sock > 2) |
|
close(cli->cli_sock); |
|
io_free(cli->cli_parent); |
|
io_free(cli); |
|
return NULL; |
} |
} |
|
|
/* |
/* |
Line 220 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
Line 250 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); |
Line 252 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 283 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 261 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 294 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 299 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 334 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
return -1; |
return -1; |
} |
} |
do { |
do { |
if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) { | 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) |
if (errno == EAGAIN) |
continue; |
continue; |
LOGERR; |
LOGERR; |
Line 320 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 360 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
do { |
do { |
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 { |
if (wlen++ < 7) |
if (wlen++ < 7) |
continue; |
continue; |
else |
else |
rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server"); |
rpc_SetErr(ETIMEDOUT, "Timeout, no answer from RPC server"); |
} |
} |
|
|
return -1; |
return -1; |
} |
} |
} while (0); | |
do { | |
memset(buf, 0, AIT_LEN(&cli->cli_buf)); |
memset(buf, 0, AIT_LEN(&cli->cli_buf)); |
if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) { | if (cli->cli_id == SOCK_STREAM) |
| ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0); |
| else |
| ret = recvfrom(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0, |
| &sa.sa, &salen); |
| if (ret < 1) { |
if (ret) { |
if (ret) { |
if (errno == EAGAIN) |
if (errno == EAGAIN) |
continue; |
continue; |
Line 341 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 386 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
LOGERR; |
LOGERR; |
} |
} |
return -1; |
return -1; |
|
} |
|
|
|
if (cli->cli_id == SOCK_DGRAM) { |
|
/* check for response from known address */ |
|
if (io_addrcmp(&cli->cli_sa, &sa, 42)) { |
|
rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address"); |
|
continue; |
|
} |
} |
} |
} while (0); |
} while (0); |
if (ret < sizeof(struct tagRPCCall)) { |
if (ret < sizeof(struct tagRPCCall)) { |