version 1.12.2.3, 2012/11/19 21:28:55
|
version 1.13.4.3, 2013/01/17 17:01:51
|
Line 12 terms:
|
Line 12 terms:
|
All of the documentation and software included in the ELWIX and AITNET |
All of the documentation and software included in the ELWIX and AITNET |
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org> |
|
|
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 | Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 |
by Michael Pounov <misho@elwix.org>. All rights reserved. |
by Michael Pounov <misho@elwix.org>. All rights reserved. |
|
|
Redistribution and use in source and binary forms, with or without |
Redistribution and use in source and binary forms, with or without |
Line 64 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 64 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
return NULL; |
return NULL; |
} |
} |
|
|
cli = io_malloc(sizeof(rpc_cli_t)); | cli = e_malloc(sizeof(rpc_cli_t)); |
if (!cli) { |
if (!cli) { |
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
} else |
} else |
memcpy(cli, rpccli, sizeof(rpc_cli_t)); |
memcpy(cli, rpccli, sizeof(rpc_cli_t)); |
|
|
memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof(io_sockaddr_t)); | memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof(sockaddr_t)); |
switch (cli->cli_sa.sa.sa_family) { |
switch (cli->cli_sa.sa.sa_family) { |
case AF_INET: |
case AF_INET: |
cli->cli_sa.sin.sin_port = |
cli->cli_sa.sin.sin_port = |
Line 96 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 96 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; |
io_free(cli); | e_free(cli); |
return NULL; |
return NULL; |
} |
} |
if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) { |
if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) { |
LOGERR; |
LOGERR; |
close(cli->cli_sock); |
close(cli->cli_sock); |
io_free(cli); | e_free(cli); |
return NULL; |
return NULL; |
} |
} |
if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) { |
if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) { |
LOGERR; |
LOGERR; |
close(cli->cli_sock); |
close(cli->cli_sock); |
io_free(cli); | e_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); |
io_free(cli); | e_free(cli); |
return NULL; |
return NULL; |
} else |
} else |
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); |
Line 139 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
|
Line 139 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
|
|
|
AIT_FREE_VAL(&(*cli)->cli_buf); |
AIT_FREE_VAL(&(*cli)->cli_buf); |
|
|
io_free(*cli); | e_free(*cli); |
*cli = NULL; |
*cli = NULL; |
} |
} |
|
|
Line 161 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 161 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
u_short Port, int proto) |
u_short Port, int proto) |
{ |
{ |
rpc_cli_t *cli = NULL; |
rpc_cli_t *cli = NULL; |
io_sockaddr_t sa = IO_SOCKADDR_INIT; | sockaddr_t sa = E_SOCKADDR_INIT; |
|
|
if (!io_gethostbyname(csHost, Port, &sa)) | if (!e_gethostbyname(csHost, Port, &sa)) |
return NULL; |
return NULL; |
if (!Port) |
if (!Port) |
Port = RPC_DEFPORT; |
Port = RPC_DEFPORT; |
Line 172 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 172 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
if (netBuf < RPC_MIN_BUFSIZ) |
if (netBuf < RPC_MIN_BUFSIZ) |
netBuf = BUFSIZ; |
netBuf = BUFSIZ; |
else |
else |
netBuf = io_align(netBuf, 2); /* align netBuf length */ | netBuf = E_ALIGN(netBuf, 2); /* align netBuf length */ |
|
|
#ifdef HAVE_SRANDOMDEV |
#ifdef HAVE_SRANDOMDEV |
srandomdev(); |
srandomdev(); |
Line 182 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 182 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
srandom((time(&tim) ^ getpid())); |
srandom((time(&tim) ^ getpid())); |
#endif |
#endif |
|
|
cli = io_malloc(sizeof(rpc_cli_t)); | cli = e_malloc(sizeof(rpc_cli_t)); |
if (!cli) { |
if (!cli) { |
LOGERR; |
LOGERR; |
return NULL; |
return NULL; |
Line 190 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 190 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 = io_malloc(sizeof(rpc_sess_t)); | cli->cli_parent = e_malloc(sizeof(rpc_sess_t)); |
if (!cli->cli_parent) { |
if (!cli->cli_parent) { |
LOGERR; |
LOGERR; |
io_free(cli); | e_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 203 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
Line 203 rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
|
|
|
cli->cli_id = proto; |
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_BUFSIZ(&cli->cli_buf, 0, netBuf); |
|
|
/* connect to RPC server */ |
/* connect to RPC server */ |
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); |
Line 233 err:
|
Line 233 err:
|
AIT_FREE_VAL(&cli->cli_buf); |
AIT_FREE_VAL(&cli->cli_buf); |
if (cli->cli_sock > 2) |
if (cli->cli_sock > 2) |
close(cli->cli_sock); |
close(cli->cli_sock); |
io_free(cli->cli_parent); | e_free(cli->cli_parent); |
io_free(cli); | e_free(cli); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 257 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
Line 257 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
AIT_FREE_VAL(&(*cli)->cli_buf); |
AIT_FREE_VAL(&(*cli)->cli_buf); |
|
|
if ((*cli)->cli_parent) |
if ((*cli)->cli_parent) |
io_free((*cli)->cli_parent); | e_free((*cli)->cli_parent); |
|
|
io_free(*cli); | e_free(*cli); |
*cli = NULL; |
*cli = NULL; |
} |
} |
|
|
Line 271 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
Line 271 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
* @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, may be NULL |
* @in_vars = IN RPC call array of rpc values, may be NULL |
* @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with io_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 or != -1 ok result |
*/ |
*/ |
int |
int |
Line 283 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; | sockaddr_t sa; |
socklen_t salen; |
socklen_t salen; |
|
|
if (!cli) { |
if (!cli) { |
Line 299 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 299 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
/* 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); |
rpc->call_argc = htons(io_arraySize(in_vars)); | rpc->call_argc = htons(array_Size(in_vars)); |
rpc->call_tag = htons(tag); |
rpc->call_tag = htons(tag); |
rpc->call_seq = htons(random() % USHRT_MAX); |
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; |
|
|
if (io_arraySize(in_vars)) { | if (array_Size(in_vars)) { |
/* marshaling variables */ |
/* marshaling variables */ |
ret = io_vars2buffer(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, in_vars); | ret = ait_vars2buffer(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, in_vars); |
if (ret == -1) { |
if (ret == -1) { |
rpc_SetErr(EBADRPC, "Failed to prepare RPC packet values"); |
rpc_SetErr(EBADRPC, "Failed to prepare RPC packet values"); |
return -1; |
return -1; |
Line 375 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 375 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
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); |
else | else { |
| salen = sa.ss.ss_len = sizeof(sockaddr_t); |
ret = recvfrom(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0, |
ret = recvfrom(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0, |
&sa.sa, &salen); |
&sa.sa, &salen); |
|
} |
if (ret < 1) { |
if (ret < 1) { |
if (ret) { |
if (ret) { |
if (errno == EAGAIN) |
if (errno == EAGAIN) |
Line 390 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 392 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
|
|
if (cli->cli_id == SOCK_DGRAM) { |
if (cli->cli_id == SOCK_DGRAM) { |
/* check for response from known address */ |
/* check for response from known address */ |
if (io_addrcmp(&cli->cli_sa, &sa, 42)) { | if (e_addrcmp(&cli->cli_sa, &sa, 42)) { |
rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address"); |
rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address"); |
continue; |
continue; |
} |
} |
Line 433 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 435 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 |
#ifdef CLI_RES_ZCOPY |
*out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, | *out_vars = ait_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, |
ntohs(rpc->call_argc), 42); |
ntohs(rpc->call_argc), 42); |
#else |
#else |
*out_vars = io_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, | *out_vars = ait_buffer2vars(buf + wlen, AIT_LEN(&cli->cli_buf) - wlen, |
ntohs(rpc->call_argc), 0); |
ntohs(rpc->call_argc), 0); |
#endif |
#endif |
if (!*out_vars) { |
if (!*out_vars) { |
rpc_SetErr(io_GetErrno(), "%s", io_GetError()); | rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); |
return -1; |
return -1; |
} |
} |
} |
} |
Line 459 inline void
|
Line 461 inline void
|
rpc_cli_freeCall(array_t ** __restrict out_vars) |
rpc_cli_freeCall(array_t ** __restrict out_vars) |
{ |
{ |
#ifdef CLI_RES_ZCOPY |
#ifdef CLI_RES_ZCOPY |
io_arrayDestroy(out_vars); | array_Destroy(out_vars); |
#else |
#else |
io_freeVars(out_vars); | ait_freeVars(out_vars); |
#endif |
#endif |
} |
} |
|
|
Line 483 rpc_cli_ping(rpc_cli_t *cli)
|
Line 485 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_array(arr, 0, ait_val_t*)); | ret = AIT_GET_U16(array(arr, 0, ait_val_t*)); |
rpc_cli_freeCall(&arr); |
rpc_cli_freeCall(&arr); |
|
|
return ret; |
return ret; |