version 1.5.2.3, 2011/09/07 09:22:15
|
version 1.6.2.1, 2012/03/13 17:10:13
|
Line 56 rpc_cli_t *
|
Line 56 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; |
struct sockaddr sa; | io_sockaddr_t sa; |
struct sockaddr_in *sin = (struct sockaddr_in*) &sa; | |
struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa; | |
struct sockaddr_un *sun = (struct sockaddr_un*) &sa; | |
int n; |
int n; |
|
|
if (!rpccli || |
if (!rpccli || |
(rpccli->cli_sa.sa_family != AF_INET && rpccli->cli_sa.sa_family != AF_INET6 && | (rpccli->cli_sa.sa.sa_family != AF_INET && rpccli->cli_sa.sa.sa_family != AF_INET6 && |
rpccli->cli_sa.sa_family != AF_LOCAL)) { | rpccli->cli_sa.sa.sa_family != AF_LOCAL)) { |
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to BLOB server ...\n"); |
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to BLOB server ...\n"); |
return NULL; |
return NULL; |
} |
} |
if (!Port) |
|
Port = RPC_DEFPORT + 1; |
|
|
|
cli = malloc(sizeof(rpc_cli_t)); |
cli = malloc(sizeof(rpc_cli_t)); |
if (!cli) { |
if (!cli) { |
Line 79 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 74 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
memcpy(cli, rpccli, sizeof(rpc_cli_t)); |
memcpy(cli, rpccli, sizeof(rpc_cli_t)); |
|
|
memcpy(&sa, &rpccli->cli_sa, sizeof sa); |
memcpy(&sa, &rpccli->cli_sa, sizeof sa); |
switch (rpccli->cli_sa.sa_family) { | switch (sa.sa.sa_family) { |
case AF_INET: |
case AF_INET: |
sin->sin_port = htons(Port); | sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1); |
memcpy(&cli->cli_sa, sin, sizeof(struct sockaddr)); | |
break; |
break; |
case AF_INET6: |
case AF_INET6: |
sin6->sin6_port = htons(Port); | sa.sin6.sin6_port = htons(Port ? Port : ntohs(sa.sin6.sin6_port) + 1); |
memcpy(&cli->cli_sa, sin6, sizeof(struct sockaddr)); | |
break; |
break; |
case AF_LOCAL: |
case AF_LOCAL: |
strlcat(sun->sun_path, ".blob", sizeof sun->sun_path); | strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path); |
memcpy(&cli->cli_sa, sun, sizeof(struct sockaddr)); | |
break; |
break; |
} |
} |
|
memcpy(&cli->cli_sa, &sa, sizeof sa); |
|
|
/* connect to BLOB server */ |
/* connect to BLOB server */ |
cli->cli_sock = socket(cli->cli_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; |
free(cli); |
free(cli); |
Line 114 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 107 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
free(cli); |
free(cli); |
return NULL; |
return NULL; |
} |
} |
if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -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); |
free(cli); |
free(cli); |
Line 161 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
Line 154 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
{ |
{ |
rpc_cli_t *cli = NULL; |
rpc_cli_t *cli = NULL; |
struct hostent *host = NULL; |
struct hostent *host = NULL; |
struct sockaddr sa; | io_sockaddr_t sa; |
struct sockaddr_in *sin = (struct sockaddr_in*) &sa; | |
struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa; | |
struct sockaddr_un *sun = (struct sockaddr_un*) &sa; | |
int n; |
int n; |
|
|
if (!csHost || (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) { |
if (!csHost || (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) { |
Line 183 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
Line 173 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
} |
} |
} |
} |
memset(&sa, 0, sizeof sa); |
memset(&sa, 0, sizeof sa); |
sa.sa_family = family; | sa.sa.sa_family = family; |
switch (family) { |
switch (family) { |
case AF_INET: |
case AF_INET: |
sin->sin_len = sizeof(struct sockaddr_in); | sa.sin.sin_len = sizeof(struct sockaddr_in); |
sin->sin_port = htons(Port); | sa.sin.sin_port = htons(Port); |
if (csHost) |
if (csHost) |
memcpy(&sin->sin_addr, host->h_addr, host->h_length); | memcpy(&sa.sin.sin_addr, host->h_addr, host->h_length); |
break; |
break; |
case AF_INET6: |
case AF_INET6: |
sin6->sin6_len = sizeof(struct sockaddr_in6); | sa.sin6.sin6_len = sizeof(struct sockaddr_in6); |
sin6->sin6_port = htons(Port); | sa.sin6.sin6_port = htons(Port); |
if (csHost) |
if (csHost) |
memcpy(&sin6->sin6_addr, host->h_addr, host->h_length); | memcpy(&sa.sin6.sin6_addr, host->h_addr, host->h_length); |
break; |
break; |
case AF_LOCAL: |
case AF_LOCAL: |
sun->sun_len = sizeof(struct sockaddr_un); | sa.sun.sun_len = sizeof(struct sockaddr_un); |
if (csHost) |
if (csHost) |
strlcpy(sun->sun_path, csHost, sizeof sun->sun_path); | strlcpy(sa.sun.sun_path, csHost, sizeof sa.sun.sun_path); |
break; |
break; |
default: |
default: |
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n"); |
rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n"); |
Line 226 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
Line 216 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID; |
((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID; |
} |
} |
|
|
switch (family) { | memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa); |
case AF_INET: | |
memcpy(&cli->cli_sa, sin, sizeof cli->cli_sa); | |
break; | |
case AF_INET6: | |
memcpy(&cli->cli_sa, sin6, sizeof cli->cli_sa); | |
break; | |
case AF_LOCAL: | |
memcpy(&cli->cli_sa, sun, sizeof cli->cli_sa); | |
break; | |
} | |
|
|
/* connect to RPC server */ |
/* connect to RPC server */ |
cli->cli_sock = socket(family, SOCK_STREAM, 0); |
cli->cli_sock = socket(family, SOCK_STREAM, 0); |
Line 261 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
Line 241 rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
|
free(cli); |
free(cli); |
return NULL; |
return NULL; |
} |
} |
if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -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); |
free(cli->cli_parent); |
free(cli->cli_parent); |
Line 311 rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
|
Line 291 rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
|
fd_set fds; |
fd_set fds; |
u_char *buf, str[MAXPATHLEN + UCHAR_MAX + 1]; |
u_char *buf, str[MAXPATHLEN + UCHAR_MAX + 1]; |
struct tagRPCCall *rpc; |
struct tagRPCCall *rpc; |
struct tagRPCRet *rrpc = NULL; | struct tagRPCCall *rrpc = NULL; |
int ret = 0, Limit = 0; |
int ret = 0, Limit = 0; |
struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; |
struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; |
uint16_t tag; |
uint16_t tag; |
Line 341 rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
|
Line 321 rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
|
/* 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(in_vars ? io_arraySize(in_vars) : 0); | rpc->call_argc = htons(io_arraySize(in_vars)); |
rpc->call_tag = tag = htons(crcFletcher16((u_short*) str, sizeof str / 2)); |
rpc->call_tag = tag = htons(crcFletcher16((u_short*) str, sizeof str / 2)); |
rpc->call_hash = hash = htonl(hash_fnv((char*) str, sizeof str)); |
rpc->call_hash = hash = htonl(hash_fnv((char*) str, sizeof str)); |
Limit = sizeof(struct tagRPCCall); |
Limit = sizeof(struct tagRPCCall); |
|
|
if (in_vars && io_arraySize(in_vars)) { | if (io_arraySize(in_vars)) { |
/* marshaling variables */ |
/* marshaling variables */ |
ret = io_vals2buffer(buf + Limit, cli->cli_netbuf - Limit, in_vars); | ret = io_vars2buffer(buf + Limit, cli->cli_netbuf - Limit, in_vars); |
if (ret == -1) { |
if (ret == -1) { |
rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n"); |
rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n"); |
free(buf); |
free(buf); |
Line 391 rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
|
Line 371 rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
|
free(buf); |
free(buf); |
return 0; |
return 0; |
} |
} |
if (ret < sizeof(struct tagRPCRet)) { | if (ret < sizeof(struct tagRPCCall)) { |
rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n"); |
rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n"); |
free(buf); |
free(buf); |
return -4; |
return -4; |
} else |
} else |
rrpc = (struct tagRPCRet*) buf; | rrpc = (struct tagRPCCall*) buf; |
/* check RPC packet session info */ |
/* check RPC packet session info */ |
if (rpc_chkPktSession(&rrpc->ret_session, cli->cli_parent)) { | if (rpc_chkPktSession(&rrpc->call_session, cli->cli_parent)) { |
rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n"); |
rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n"); |
free(buf); |
free(buf); |
return -5; |
return -5; |
} else |
} else |
Limit = sizeof(struct tagRPCRet); | Limit = sizeof(struct tagRPCCall); |
if (rrpc->ret_tag != tag || rrpc->ret_hash != hash) { | if (rrpc->call_tag != tag || rrpc->call_hash != hash) { |
printf("tag=%x/%x hash=%x/%x\n", rrpc->ret_tag, tag, rrpc->ret_hash, hash); | |
rpc_SetErr(ERPCMISMATCH, "Error:: get wrong RPC reply ...\n"); |
rpc_SetErr(ERPCMISMATCH, "Error:: get wrong RPC reply ...\n"); |
free(buf); |
free(buf); |
return -5; |
return -5; |
} |
} |
if (ntohl(rrpc->ret_retcode) < 0 && ntohl(rrpc->ret_errno)) { | if (ntohl(rrpc->call_rep.ret) < 0 && ntohl(rrpc->call_rep.eno)) { |
rpc_SetErr(ntohl(rrpc->ret_errno), "Error::Server side: retcode=%d #%d %s\n", | rpc_SetErr(ntohl(rrpc->call_rep.eno), "Error::Server side: retcode=%d #%d %s\n", |
ntohl(rrpc->ret_retcode), ntohl(rrpc->ret_errno), | ntohl(rrpc->call_rep.ret), ntohl(rrpc->call_rep.eno), |
strerror(ntohl(rrpc->ret_errno))); | strerror(ntohl(rrpc->call_rep.eno))); |
free(buf); |
free(buf); |
return -6; |
return -6; |
} |
} |
if (ntohs(rrpc->ret_argc) * sizeof(ait_val_t) > cli->cli_netbuf - Limit) { | if (ntohs(rrpc->call_argc) * sizeof(ait_val_t) > cli->cli_netbuf - Limit) { |
rpc_SetErr(EMSGSIZE, "Error:: reply RPC packet is too long ...\n"); |
rpc_SetErr(EMSGSIZE, "Error:: reply RPC packet is too long ...\n"); |
free(buf); |
free(buf); |
return -7; |
return -7; |
} |
} |
|
|
/* RPC is OK! Go de-marshaling variables ... */ |
/* RPC is OK! Go de-marshaling variables ... */ |
if (ntohs(rrpc->ret_argc)) { | if (ntohs(rrpc->call_argc)) { |
*out_vars = io_buffer2vals(buf + Limit, cli->cli_netbuf - Limit, | *out_vars = io_buffer2vars(buf + Limit, cli->cli_netbuf - Limit, |
ntohs(rrpc->ret_argc), 0); | ntohs(rrpc->call_argc), 0); |
if (!*out_vars) { |
if (!*out_vars) { |
free(buf); |
free(buf); |
return -1; |
return -1; |
} |
} |
} |
} |
|
|
ret = ntohl(rrpc->ret_retcode); | ret = ntohl(rrpc->call_rep.ret); |
free(buf); |
free(buf); |
return ret; |
return ret; |
} |
|
|
|
/* |
|
* rpc_cli_freeVals() Free ait_val_t array returned from RPC call |
|
* @vars = Variable array |
|
* return: none |
|
*/ |
|
inline void |
|
rpc_cli_freeVals(array_t ** __restrict vars) |
|
{ |
|
register int i; |
|
|
|
if (!vars || !*vars) |
|
return; |
|
|
|
for (i = 0; i < io_arraySize(*vars); i++) |
|
if (io_arrayGet(*vars, i)) |
|
AIT_FREE_VAL(io_array(*vars, i, ait_val_t*)); |
|
|
|
io_arrayFree(*vars); |
|
io_arrayDestroy(vars); |
|
} |
|
|
|
/* |
|
* rpc_cli_allocVals() Allocate ait_val_t array for RPC call |
|
* @args = Number of arguments |
|
* return: =NULL error or !=NULL allocated array |
|
*/ |
|
inline array_t * |
|
rpc_cli_allocVals(u_short args) |
|
{ |
|
array_t *arr; |
|
register int i; |
|
ait_val_t *v; |
|
|
|
if (!args) |
|
return NULL; |
|
|
|
if (!(arr = io_arrayInit(args))) |
|
return NULL; |
|
|
|
for (i = 0; i < io_arraySize(arr); i++) { |
|
v = malloc(sizeof(ait_val_t)); |
|
if (!v) { |
|
LOGERR; |
|
rpc_cli_freeVals(&arr); |
|
return NULL; |
|
} else { |
|
memset(v, 0, sizeof(ait_val_t)); |
|
io_arraySet(arr, i, v); |
|
} |
|
} |
|
|
|
return arr; |
|
} |
} |