version 1.9.2.7, 2012/05/16 16:36:10
|
version 1.9.2.10, 2012/05/17 15:14:16
|
Line 102 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 102 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
close(cli->cli_sock); |
close(cli->cli_sock); |
free(cli); |
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 199 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 200 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
free(cli->cli_parent); |
free(cli->cli_parent); |
free(cli); |
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 235 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
Line 237 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 264 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 348 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 351 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) |
|
{ |
|
array_t *arr; |
|
int ret = 0; |
|
|
|
if (!cli) |
|
return -1; |
|
|
|
if (rpc_cli_execCall(cli, RPC_REPLY, CALL_SRVPING, NULL, &arr)) |
|
return -1; |
|
else |
|
ret = AIT_GET_U16(io_getVars(arr, 0)); |
|
io_freeVars(&arr); |
|
|
return ret; |
return ret; |
} |
} |