version 1.16.6.1, 2013/08/21 15:28:15
|
version 1.16.8.4, 2013/08/22 11:55:45
|
Line 71 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 71 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
} else |
} else |
memcpy(cli, rpccli, sizeof(rpc_cli_t)); |
memcpy(cli, rpccli, sizeof(rpc_cli_t)); |
|
|
cli->cli_buf = ait_allocVars(1); |
|
if (!cli->cli_buf) { |
|
rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); |
|
e_free(cli); |
|
return NULL; |
|
} |
|
|
|
memcpy(&cli->cli_sa, &rpccli->cli_sa, sizeof(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: |
Line 96 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
Line 89 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli,
|
return NULL; |
return NULL; |
} |
} |
|
|
AIT_COPY_VAL(array(cli->cli_buf, 0, ait_val_t*), array(rpccli->cli_buf, 0, ait_val_t*)); | AIT_COPY_VAL(&cli->cli_buf, &rpccli->cli_buf); |
n = AIT_LEN(array(cli->cli_buf, 0, ait_val_t*)); | 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 144 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
|
Line 137 rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
|
shutdown((*cli)->cli_sock, SHUT_RDWR); |
shutdown((*cli)->cli_sock, SHUT_RDWR); |
close((*cli)->cli_sock); |
close((*cli)->cli_sock); |
|
|
ait_freeVars(&(*cli)->cli_buf); | AIT_FREE_VAL(&(*cli)->cli_buf); |
|
|
e_free(*cli); |
e_free(*cli); |
*cli = NULL; |
*cli = NULL; |
Line 179 rpc_cli_openClient(u_char InstID, int netBuf, const ch
|
Line 172 rpc_cli_openClient(u_char InstID, int netBuf, const ch
|
else |
else |
netBuf = E_ALIGN(netBuf, 2); /* align netBuf length */ |
netBuf = E_ALIGN(netBuf, 2); /* align netBuf length */ |
|
|
#ifdef HAVE_SRANDOMDEV |
|
srandomdev(); |
|
#else |
|
time_t tim; |
|
|
|
srandom((time(&tim) ^ getpid())); |
|
#endif |
|
|
|
cli = e_malloc(sizeof(rpc_cli_t)); |
cli = e_malloc(sizeof(rpc_cli_t)); |
if (!cli) { |
if (!cli) { |
LOGERR; |
LOGERR; |
Line 205 rpc_cli_openClient(u_char InstID, int netBuf, const ch
|
Line 190 rpc_cli_openClient(u_char InstID, int netBuf, const ch
|
((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID; |
((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID; |
} |
} |
|
|
cli->cli_buf = ait_allocVars(2); |
|
if (!cli->cli_buf) { |
|
rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); |
|
e_free(cli->cli_parent); |
|
e_free(cli); |
|
return NULL; |
|
} else |
|
AIT_SET_BUFSIZ(array(cli->cli_buf, 0, ait_val_t*), 0, netBuf); |
|
|
|
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_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 242 rpc_cli_openClient(u_char InstID, int netBuf, const ch
|
Line 219 rpc_cli_openClient(u_char InstID, int netBuf, const ch
|
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: |
err: |
ait_freeVars(&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); |
e_free(cli->cli_parent); |
e_free(cli->cli_parent); |
Line 266 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
Line 243 rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
|
shutdown((*cli)->cli_sock, SHUT_RDWR); |
shutdown((*cli)->cli_sock, SHUT_RDWR); |
close((*cli)->cli_sock); |
close((*cli)->cli_sock); |
|
|
ait_freeVars(&(*cli)->cli_buf); | AIT_FREE_VAL(&(*cli)->cli_buf); |
|
|
if ((*cli)->cli_parent) |
if ((*cli)->cli_parent) |
e_free((*cli)->cli_parent); |
e_free((*cli)->cli_parent); |
Line 345 int
|
Line 322 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) |
{ |
{ |
struct pollfd pfd; |
struct pollfd pfd; |
int ret, len = 0; | int ret, estlen, blen = sizeof(struct tagRPCCall), len = 0; |
u_char *buf; |
u_char *buf; |
sockaddr_t sa2; |
sockaddr_t sa2; |
socklen_t salen; |
socklen_t salen; |
|
struct tagRPCCall *rpc; |
|
|
if (!pkt) { |
if (!pkt) { |
rpc_SetErr(EINVAL, "Invalid argument(s)!"); |
rpc_SetErr(EINVAL, "Invalid argument(s)!"); |
Line 375 rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
|
Line 353 rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
|
return -1; |
return -1; |
} |
} |
|
|
memset(buf, 0, AIT_LEN(pkt)); | if (type == SOCK_STREAM) { |
if (type == SOCK_STREAM) | memset(buf, 0, blen); |
ret = recv(sock, buf, AIT_LEN(pkt), 0); | ret = recv(sock, buf, blen, 0); |
else { | } else { |
| blen = AIT_LEN(pkt); |
| memset(buf, 0, blen); |
memset(&sa2, 0, sizeof sa2); |
memset(&sa2, 0, sizeof sa2); |
salen = sa2.ss.ss_len = sizeof(sockaddr_t); |
salen = sa2.ss.ss_len = sizeof(sockaddr_t); |
ret = recvfrom(sock, buf, AIT_LEN(pkt), 0, &sa2.sa, &salen); | ret = recvfrom(sock, buf, blen, 0, &sa2.sa, &salen); |
} |
} |
if (ret < 1) { |
if (ret < 1) { |
if (ret) { |
if (ret) { |
Line 394 rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
|
Line 374 rpc_pkt_Receive(int sock, int type, sockaddr_t * __res
|
} |
} |
|
|
/* check for response from known address */ |
/* check for response from known address */ |
if (type == SOCK_DGRAM) | if (type == SOCK_DGRAM) { |
if (e_addrcmp(sa, &sa2, 42)) { |
if (e_addrcmp(sa, &sa2, 42)) { |
rpc_SetErr(ERPCMISMATCH, |
rpc_SetErr(ERPCMISMATCH, |
"Received RPC response from unknown address"); |
"Received RPC response from unknown address"); |
continue; |
continue; |
} |
} |
|
} else { |
|
/* 1st read for RPC header */ |
|
if (buf == AIT_GET_BUF(pkt)) { |
|
if (ret < sizeof(struct tagRPCCall)) { |
|
rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); |
|
return -1; |
|
} |
|
|
|
/* calc estimated length */ |
|
rpc = (struct tagRPCCall*) buf; |
|
estlen = ntohl(rpc->call_len) + blen; |
|
printf("ret = %d len=%d\n", ret, estlen); |
|
if (estlen > AIT_LEN(pkt)) |
|
AIT_RE_BUF(pkt, estlen); |
|
buf = AIT_GET_BUF(pkt) + blen; |
|
blen = AIT_LEN(pkt) - blen; |
|
} else |
|
ret += sizeof(struct tagRPCCall); |
|
} |
} while (0); |
} while (0); |
|
|
if (ret < sizeof(struct tagRPCCall)) { |
if (ret < sizeof(struct tagRPCCall)) { |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); |
rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); |
return -1; |
return -1; |
Line 425 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
|
Line 425 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
|
array_t * __restrict vars, int noreply, int nocrc) |
array_t * __restrict vars, int noreply, int nocrc) |
{ |
{ |
struct tagRPCCall *rpc; |
struct tagRPCCall *rpc; |
int ret = 0, len = sizeof(struct tagRPCCall); | int ret = 0, estlen, len = sizeof(struct tagRPCCall); |
u_char *buf; |
u_char *buf; |
|
|
if (!pkt || !sess) { |
if (!pkt || !sess) { |
rpc_SetErr(EINVAL, "Invalid argument(s)!"); |
rpc_SetErr(EINVAL, "Invalid argument(s)!"); |
return -1; |
return -1; |
} else | } |
buf = AIT_GET_BUF(pkt); | |
|
|
|
/* calc estimated length */ |
|
estlen = ait_resideVars(vars) + len; |
|
if (estlen > AIT_LEN(pkt)) |
|
AIT_RE_BUF(pkt, estlen); |
|
buf = AIT_GET_BUF(pkt); |
|
|
/* prepare RPC call */ |
/* prepare RPC call */ |
rpc = (struct tagRPCCall*) buf; |
rpc = (struct tagRPCCall*) buf; |
rpc_addPktSession(&rpc->call_session, sess); |
rpc_addPktSession(&rpc->call_session, sess); |
Line 457 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
|
Line 462 rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
|
} |
} |
|
|
/* total packet length */ |
/* total packet length */ |
rpc->call_len = htons(len); | rpc->call_len = htonl(len); |
|
|
if (!nocrc) { |
if (!nocrc) { |
/* calculate CRC */ |
/* calculate CRC */ |
Line 498 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t
|
Line 503 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t
|
/* calculate CRC */ |
/* calculate CRC */ |
crc = ntohs(rpc->call_crc); |
crc = ntohs(rpc->call_crc); |
rpc->call_crc ^= rpc->call_crc; |
rpc->call_crc ^= rpc->call_crc; |
if (crc != crcFletcher16((u_short*) buf, ntohs(rpc->call_len) / 2)) { | if (crc != crcFletcher16((u_short*) buf, ntohl(rpc->call_len) / 2)) { |
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); |
rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); |
return -1; |
return -1; |
} |
} |
Line 524 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t
|
Line 529 rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t
|
rpc_SetErr(EMSGSIZE, "Reply RPC packet not enough buffer space ..."); |
rpc_SetErr(EMSGSIZE, "Reply RPC packet not enough buffer space ..."); |
return -1; |
return -1; |
} |
} |
if (len > ntohs(rpc->call_len) - sizeof(struct tagRPCCall)) { | if (len > ntohl(rpc->call_len) - sizeof(struct tagRPCCall)) { |
rpc_SetErr(EMSGSIZE, "Reply RPC packet is too short ..."); |
rpc_SetErr(EMSGSIZE, "Reply RPC packet is too short ..."); |
return -1; |
return -1; |
} |
} |
Line 562 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
Line 567 rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short
|
array_t * __restrict in_vars, array_t ** __restrict out_vars) |
array_t * __restrict in_vars, array_t ** __restrict out_vars) |
{ |
{ |
int type = 0, wlen; |
int type = 0, wlen; |
|
u_char *buf; |
|
|
if (!cli) { |
if (!cli) { |
rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!"); |
rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!"); |
return -1; |
return -1; |
|
} else { |
|
if (cli->cli_id == SOCK_STREAM) |
|
type = cli->cli_id; |
|
buf = AIT_GET_BUF(&cli->cli_buf); |
} |
} |
if (cli->cli_id == SOCK_STREAM) |
|
type = cli->cli_id; |
|
if (out_vars) |
if (out_vars) |
*out_vars = NULL; |
*out_vars = NULL; |
|
|
if ((wlen = rpc_pkt_Request(rpc_getBufVar(cli), 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, rpc_getBufVar(cli), wlen) == -1) | if (rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf, wlen) == -1) |
return -1; |
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, rpc_getBufVar(cli)) == -1) | if (rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf) == -1) |
return -1; |
return -1; |
|
|
if ((wlen = rpc_pkt_Replay(rpc_getBufVar(cli), 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; |
|
|
return 0; |
return 0; |