--- libaitrpc/src/cli.c 2013/03/07 23:03:03 1.13.4.4 +++ libaitrpc/src/cli.c 2013/08/21 15:28:15 1.16.6.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.13.4.4 2013/03/07 23:03:03 misho Exp $ +* $Id: cli.c,v 1.16.6.1 2013/08/21 15:28:15 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -71,6 +71,13 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, } else 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)); switch (cli->cli_sa.sa.sa_family) { case AF_INET: @@ -89,8 +96,8 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, return NULL; } - AIT_COPY_VAL(&cli->cli_buf, &rpccli->cli_buf); - n = AIT_LEN(&cli->cli_buf); + AIT_COPY_VAL(array(cli->cli_buf, 0, ait_val_t*), array(rpccli->cli_buf, 0, ait_val_t*)); + n = AIT_LEN(array(cli->cli_buf, 0, ait_val_t*)); /* connect to BLOB server */ cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0); @@ -137,7 +144,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) shutdown((*cli)->cli_sock, SHUT_RDWR); close((*cli)->cli_sock); - AIT_FREE_VAL(&(*cli)->cli_buf); + ait_freeVars(&(*cli)->cli_buf); e_free(*cli); *cli = NULL; @@ -148,8 +155,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) /* * rpc_cli_openClient() - Connect to RPC Server * - * @ProgID = ProgramID for RPC session request - * @ProcID = ProcessID for RPC session request + * @InstID = InstID for RPC session request * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) * @csHost = Host name or IP address for bind server * @Port = Port for bind server, if Port == 0 default port is selected @@ -157,8 +163,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) * return: NULL == error or !=NULL connection to RPC server established */ rpc_cli_t * -rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, - u_short Port, int proto) +rpc_cli_openClient(u_char InstID, int netBuf, const char *csHost, u_short Port, int proto) { rpc_cli_t *cli = NULL; sockaddr_t sa = E_SOCKADDR_INIT; @@ -197,13 +202,20 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne return NULL; } else { ((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION; - ((rpc_sess_t*) cli->cli_parent)->sess_program = ProgID; - ((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID; + ((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; memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa); - AIT_SET_BUFSIZ(&cli->cli_buf, 0, netBuf); /* connect to RPC server */ cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0); @@ -230,7 +242,7 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); return cli; err: - AIT_FREE_VAL(&cli->cli_buf); + ait_freeVars(&cli->cli_buf); if (cli->cli_sock > 2) close(cli->cli_sock); e_free(cli->cli_parent); @@ -254,7 +266,7 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli) shutdown((*cli)->cli_sock, SHUT_RDWR); close((*cli)->cli_sock); - AIT_FREE_VAL(&(*cli)->cli_buf); + ait_freeVars(&(*cli)->cli_buf); if ((*cli)->cli_parent) e_free((*cli)->cli_parent); @@ -405,11 +417,12 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res * @tag = Function tag for execution * @vars = Function argument array of values, may be NULL * @noreply = We not want RPC reply + * @nocrc = Without CRC calculation * return: -1 error or != -1 prepared bytes into packet */ int rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t * __restrict sess, u_short tag, - array_t * __restrict vars, int noreply) + array_t * __restrict vars, int noreply, int nocrc) { struct tagRPCCall *rpc; int ret = 0, len = sizeof(struct tagRPCCall); @@ -425,7 +438,6 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t rpc = (struct tagRPCCall*) buf; rpc_addPktSession(&rpc->call_session, sess); rpc->call_tag = htons(tag); - rpc->call_seq = htons(random() % USHRT_MAX); if (!vars) rpc->call_argc = 0; else @@ -447,9 +459,11 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t /* total packet length */ rpc->call_len = htons(len); - /* calculate CRC */ - rpc->call_crc ^= rpc->call_crc; - rpc->call_crc = htons(crcFletcher16((u_short*) buf, len / 2)); + if (!nocrc) { + /* calculate CRC */ + rpc->call_crc ^= rpc->call_crc; + rpc->call_crc = htons(crcFletcher16((u_short*) buf, len / 2)); + } return len; } @@ -461,11 +475,12 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t * @sess = RPC session info * @tag = Function tag * @vars = Function argument array of values, may be NULL + * @nocrc = Without CRC calculation * return: -1 error or != -1 return value from function */ int rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t * __restrict sess, u_short tag, - array_t ** __restrict vars) + array_t ** __restrict vars, int nocrc) { struct tagRPCCall *rpc; int len; @@ -479,12 +494,14 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t buf = AIT_GET_BUF(pkt); rpc = (struct tagRPCCall*) buf; - /* calculate CRC */ - crc = ntohs(rpc->call_crc); - rpc->call_crc ^= rpc->call_crc; - if (crc != crcFletcher16((u_short*) buf, ntohs(rpc->call_len) / 2)) { - rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); - return -1; + if (!nocrc) { + /* calculate CRC */ + crc = ntohs(rpc->call_crc); + rpc->call_crc ^= rpc->call_crc; + if (crc != crcFletcher16((u_short*) buf, ntohs(rpc->call_len) / 2)) { + rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); + return -1; + } } /* check RPC packet session info */ @@ -544,33 +561,33 @@ int rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, array_t * __restrict in_vars, array_t ** __restrict out_vars) { - int ret = 0, wlen; - u_char *buf; + int type = 0, wlen; if (!cli) { rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!"); return -1; - } else - buf = AIT_GET_BUF(&cli->cli_buf); + } + if (cli->cli_id == SOCK_STREAM) + type = cli->cli_id; if (out_vars) *out_vars = NULL; - if ((wlen = rpc_pkt_Request(&cli->cli_buf, cli->cli_parent, tag, in_vars, noreply)) == -1) + if ((wlen = rpc_pkt_Request(rpc_getBufVar(cli), cli->cli_parent, tag, in_vars, noreply, type)) == -1) return -1; - if (rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf, wlen) == -1) + if (rpc_pkt_Send(cli->cli_sock, cli->cli_id, &cli->cli_sa, rpc_getBufVar(cli), wlen) == -1) return -1; if (noreply) /* we not want reply */ return 0; - if (rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, &cli->cli_buf) == -1) + if (rpc_pkt_Receive(cli->cli_sock, cli->cli_id, &cli->cli_sa, rpc_getBufVar(cli)) == -1) return -1; - if ((wlen = rpc_pkt_Replay(&cli->cli_buf, cli->cli_parent, tag, out_vars)) == -1) + if ((wlen = rpc_pkt_Replay(rpc_getBufVar(cli), cli->cli_parent, tag, out_vars, type)) == -1) return -1; - return ret; + return 0; } /* @@ -579,7 +596,7 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short * @out_vars = Returned array with variables from RPC call * return: none */ -inline void +void rpc_cli_freeCall(array_t ** __restrict out_vars) { #ifdef CLI_RES_ZCOPY @@ -595,7 +612,7 @@ rpc_cli_freeCall(array_t ** __restrict out_vars) * @cli = connected client * return: -1 error or !=-1 ping seq id */ -inline int +int rpc_cli_ping(rpc_cli_t *cli) { int ret = 0;