version 1.19.6.3, 2013/11/15 09:49:37
|
version 1.20.4.3, 2013/12/15 22:02:24
|
Line 228 err:
|
Line 228 err:
|
} |
} |
|
|
/* |
/* |
|
* rpc_cli_reconnectClient() - Reconnecting client to RPC server |
|
* |
|
* @cli = RPC Client session |
|
* return: -1 error or 0 ok |
|
*/ |
|
int |
|
rpc_cli_reconnectClient(rpc_cli_t * __restrict cli) |
|
{ |
|
int netBuf; |
|
|
|
if (!cli) |
|
return -1; |
|
else |
|
netBuf = AIT_LEN(&cli->cli_buf); |
|
|
|
close(cli->cli_sock); |
|
|
|
cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0); |
|
if (cli->cli_sock == -1) { |
|
LOGERR; |
|
return -1; |
|
} |
|
if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, |
|
&netBuf, sizeof netBuf) == -1) { |
|
LOGERR; |
|
close(cli->cli_sock); |
|
return -1; |
|
} |
|
if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, |
|
&netBuf, sizeof netBuf) == -1) { |
|
LOGERR; |
|
close(cli->cli_sock); |
|
return -1; |
|
} |
|
if (cli->cli_id == SOCK_STREAM) |
|
if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { |
|
LOGERR; |
|
close(cli->cli_sock); |
|
return -1; |
|
} |
|
|
|
fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); |
|
return 0; |
|
} |
|
|
|
/* |
* rpc_cli_closeClient() - Close connection to RPC server and free resources |
* rpc_cli_closeClient() - Close connection to RPC server and free resources |
* |
* |
* @cli = RPC Client session |
* @cli = RPC Client session |
Line 260 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
Line 306 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
* @sa = Server address |
* @sa = Server address |
* @pkt = RPC packet |
* @pkt = RPC packet |
* @len = Length of packet |
* @len = Length of packet |
* return: -1 error or !=-1 sended bytes | * return: -1 error, 0 EOF or >0 sended bytes |
*/ |
*/ |
int |
int |
rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int len) |
rpc_pkt_Send(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt, int len) |
Line 283 rpc_pkt_Send(int sock, int type, sockaddr_t * __restri
|
Line 329 rpc_pkt_Send(int sock, int type, sockaddr_t * __restri
|
* @type = Type of socket |
* @type = Type of socket |
* @sa = Server address |
* @sa = Server address |
* @pkt = RPC packet |
* @pkt = RPC packet |
* return: -1 error or !=-1 sended bytes | * return: -1 error, 0 EOF or >0 received bytes |
*/ |
*/ |
int |
int |
rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt) |
rpc_pkt_Receive(int sock, int type, sockaddr_t * __restrict sa, ait_val_t * __restrict pkt) |
Line 307 rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
|
Line 353 rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
|
else |
else |
ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, sa, buf, blen); |
ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, sa, buf, blen); |
if (ret < 1) |
if (ret < 1) |
return -1; | return ret; |
|
|
/* check for response from known address */ |
/* check for response from known address */ |
if (!estlen) { |
if (!estlen) { |
Line 491 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t
|
Line 537 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t
|
* @tag = Function tag for execution |
* @tag = Function tag for execution |
* @in_vars = IN function argument array of values, may be NULL |
* @in_vars = IN function argument array of values, may be NULL |
* @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with ait_freeVars() |
* @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with ait_freeVars() |
* return: -1 error or != -1 ok result | * return: -1 error, 0 ok result or 1 closed rpc connection |
*/ |
*/ |
int |
int |
rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, |
rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, |
Line 514 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 560 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, in_vars, noreply, type)) == -1) |
if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, in_vars, noreply, type)) == -1) |
return -1; |
return -1; |
|
|
if (rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf, wlen) == -1) | if ((wlen = rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf, wlen)) == -1) |
return -1; |
return -1; |
|
if (!wlen) /* closed rpc connection */ |
|
return 1; |
|
|
if (noreply) /* we not want reply */ |
if (noreply) /* we not want reply */ |
return 0; |
return 0; |
|
|
if (rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf) == -1) | if ((wlen = rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf)) == -1) |
return -1; |
return -1; |
|
if (!wlen) /* closed rpc connection */ |
|
return 1; |
|
|
if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, out_vars, type)) == -1) |
if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, out_vars, type)) == -1) |
return -1; |
return -1; |