version 1.12.2.1, 2012/11/19 12:43:21
|
version 1.12.2.3, 2012/11/19 21:28:55
|
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 195 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 209 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 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 (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, |
|
&netBuf, sizeof netBuf) == -1) { |
|
LOGERR; |
|
goto err; |
|
} |
|
if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, |
|
&netBuf, sizeof netBuf) == -1) { |
|
LOGERR; |
|
goto err; |
|
} |
if (cli->cli_id == SOCK_STREAM) |
if (cli->cli_id == SOCK_STREAM) |
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); | goto err; |
close(cli->cli_sock); | |
io_free(cli->cli_parent); | |
io_free(cli); | |
return NULL; | |
} |
} |
|
|
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); |
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 270 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 334 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 (cli->cli_id == SOCK_STREAM) |
if (cli->cli_id == SOCK_STREAM) |
ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0); |
ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0); |
Line 361 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 387 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
} |
} |
return -1; |
return -1; |
} |
} |
/* check for response from known address */ | |
if (io_addrcmp(&cli->cli_sa, &sa, 42)) { | if (cli->cli_id == SOCK_DGRAM) { |
rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address"); | /* check for response from known address */ |
continue; | 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)) { |