--- libaitrpc/src/cli.c 2011/08/19 09:20:47 1.3.2.1 +++ libaitrpc/src/cli.c 2011/08/29 23:26:56 1.4.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.3.2.1 2011/08/19 09:20:47 misho Exp $ +* $Id: cli.c,v 1.4.2.1 2011/08/29 23:26:56 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -49,12 +49,11 @@ SUCH DAMAGE. /* * rpc_cli_openBLOBClient() Connect to BLOB Server * @rpccli = RPC Client session - * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW * @Port = Port for bind server, if Port == 0 default port is selected * return: NULL == error or !=NULL connection to BLOB server established */ rpc_cli_t * -rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, int sockType, u_short Port) +rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port) { rpc_cli_t *cli = NULL; struct sockaddr sa; @@ -95,8 +94,7 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, } /* connect to BLOB server */ - cli->cli_type = sockType ? sockType : SOCK_STREAM; - cli->cli_sock = socket(cli->cli_sa.sa_family, cli->cli_type, 0); + cli->cli_sock = socket(cli->cli_sa.sa_family, SOCK_STREAM, 0); if (cli->cli_sock == -1) { LOGERR; free(cli); @@ -137,14 +135,13 @@ 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 - * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW * @family = Family socket type, AF_INET or AF_INET6 * @csHost = Host name or IP address for bind server * @Port = Port for bind server, if Port == 0 default port is selected * return: NULL == error or !=NULL connection to RPC server established */ rpc_cli_t * -rpc_cli_openClient(u_int ProgID, u_int ProcID, int sockType, u_short family, const char *csHost, u_short Port) +rpc_cli_openClient(u_int ProgID, u_int ProcID, u_short family, const char *csHost, u_short Port) { rpc_cli_t *cli = NULL; struct hostent *host = NULL; @@ -221,8 +218,7 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, int soc } /* connect to RPC server */ - cli->cli_type = sockType ? sockType : SOCK_STREAM; - cli->cli_sock = socket(family, cli->cli_type, 0); + cli->cli_sock = socket(family, SOCK_STREAM, 0); if (cli->cli_sock == -1) { LOGERR; free(cli->cli_parent); @@ -268,14 +264,14 @@ rpc_cli_closeClient(rpc_cli_t * __restrict cli) * @csModule = Module name, if NULL self binary * @csFunc = Function name for execute * @in_argc = IN count of arguments - * @in_vals = IN RPC call array of rpc values + * @in_vars = IN RPC call array of rpc values * @out_argc = OUT returned count of arguments - * @out_vals = OUT returned array of rpc values, must be free after use (see rpc_cli_freeVals()) + * @out_vars = OUT returned array of rpc values, must be free after use (see rpc_cli_freeVals()) * return: -1 error or != -1 ok result */ int rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, const char *csFunc, int in_argc, - rpc_val_t * __restrict in_vals, int *out_argc, rpc_val_t ** __restrict out_vals) + ait_val_t * __restrict in_vars, int *out_argc, ait_val_t ** __restrict out_vars) { fd_set fds; u_char buf[BUFSIZ], str[MAXPATHLEN + UCHAR_MAX + 1], *data; @@ -283,58 +279,60 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, struct tagRPCRet *rrpc = NULL; int ret = 0, Limit = 0; register int i; - rpc_val_t *v; + ait_val_t *v; struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; FD_ZERO(&fds); - memset(buf, 0, BUFSIZ); - memset(str, 0, MAXPATHLEN + UCHAR_MAX + 1); - if (!cli || !csFunc || (in_argc && !in_vals)) { + memset(buf, 0, sizeof buf); + memset(str, 0, sizeof str); + if (!cli || !csFunc || (in_argc && !in_vars)) { rpc_SetErr(EINVAL, "Error:: Can`t execute call because parameter is null or invalid!\n"); return -1; } + /* build RPC call string for hash */ if (csModule) - strlcpy((char*) str, csModule, MAXPATHLEN + UCHAR_MAX + 1); - strlcat((char*) str, "__", MAXPATHLEN + UCHAR_MAX + 1); - strlcat((char*) str, csFunc, MAXPATHLEN + UCHAR_MAX + 1); + strlcpy((char*) str, csModule, sizeof str); + strlcat((char*) str, "__", sizeof str); + strlcat((char*) str, csFunc, sizeof str); + /* prepare RPC call */ memcpy(&rpc->call_session, cli->cli_parent, sizeof rpc->call_session); rpc->call_argc = in_argc; - rpc->call_tag = crcFletcher16((u_short*) str, (MAXPATHLEN + UCHAR_MAX + 1) / 2); - rpc->call_hash = hash_fnv((char*) str, MAXPATHLEN + UCHAR_MAX + 1); + rpc->call_tag = crcFletcher16((u_short*) str, sizeof str / 2); + rpc->call_hash = hash_fnv((char*) str, sizeof str); Limit = sizeof(struct tagRPCCall); if (in_argc) { - v = (rpc_val_t*) (buf + sizeof(struct tagRPCCall)); - if (in_argc * sizeof(rpc_val_t) > BUFSIZ - Limit) { + v = (ait_val_t*) (buf + sizeof(struct tagRPCCall)); + if (in_argc * sizeof(ait_val_t) > sizeof buf - Limit) { rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n"); return -7; } else - Limit += in_argc * sizeof(rpc_val_t); - memcpy(v, in_vals, in_argc * sizeof(rpc_val_t)); - data = (u_char*) v + in_argc * sizeof(rpc_val_t); - for (i = 0; i < in_argc; i++) { - switch (in_vals[i].val_type) { + Limit += in_argc * sizeof(ait_val_t); + memcpy(v, in_vars, in_argc * sizeof(ait_val_t)); + data = (u_char*) v + in_argc * sizeof(ait_val_t); + for (i = 0; i < in_argc && !ret; i++) { + switch (in_vars[i].val_type) { case buffer: - if (Limit + in_vals[i].val_len > BUFSIZ) { + if (Limit + in_vars[i].val_len > sizeof buf) { ret = -7; break; } - memcpy(data, in_vals[i].val.buffer, in_vals[i].val_len); + memcpy(data, in_vars[i].val.buffer, in_vars[i].val_len); v[i].val.buffer = (uint8_t*) ((void*) data - (void*) v); - data += in_vals[i].val_len; - Limit += in_vals[i].val_len; + data += in_vars[i].val_len; + Limit += in_vars[i].val_len; break; case string: - if (Limit + in_vals[i].val_len > BUFSIZ) { + if (Limit + in_vars[i].val_len > sizeof buf) { ret = -7; break; } - memcpy(data, in_vals[i].val.string, in_vals[i].val_len); + memcpy(data, in_vars[i].val.string, in_vars[i].val_len); v[i].val.string = (int8_t*) ((void*) data - (void*) v); - data += in_vals[i].val_len; - Limit += in_vals[i].val_len; + data += in_vars[i].val_len; + Limit += in_vars[i].val_len; break; default: break; @@ -345,6 +343,7 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, return ret; } } + if ((ret = send(cli->cli_sock, buf, Limit, 0)) == -1) { LOGERR; return -1; @@ -357,14 +356,15 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, FD_SET(cli->cli_sock, &fds); if ((ret = select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) < 1) { - if (ret) { + if (ret) LOGERR; - } else + else rpc_SetErr(ETIMEDOUT, "Error:: timeout, no return from RPC server?\n"); + return -1; } - memset(buf, 0, BUFSIZ); - if ((ret = recv(cli->cli_sock, buf, BUFSIZ, 0)) == -1) { + memset(buf, 0, sizeof buf); + if ((ret = recv(cli->cli_sock, buf, sizeof buf, 0)) == -1) { LOGERR; return -3; } @@ -386,66 +386,66 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, rrpc->ret_retcode, strerror(rrpc->ret_errno)); return -6; } - if (rrpc->ret_argc * sizeof(rpc_val_t) > BUFSIZ - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: reply RPC packet is too big ...\n"); + if (rrpc->ret_argc * sizeof(ait_val_t) > sizeof buf - Limit) { + rpc_SetErr(EMSGSIZE, "Error:: reply RPC packet is too long ...\n"); return -7; } else - Limit += rrpc->ret_argc * sizeof(rpc_val_t); + Limit += rrpc->ret_argc * sizeof(ait_val_t); /* RPC is OK! Go decapsulate variables ... */ if (rrpc->ret_argc) { *out_argc = rrpc->ret_argc; - *out_vals = calloc(rrpc->ret_argc, sizeof(rpc_val_t)); - if (!*out_vals) { + *out_vars = calloc(rrpc->ret_argc, sizeof(ait_val_t)); + if (!*out_vars) { LOGERR; *out_argc = 0; return -1; } else - memcpy(*out_vals, buf + sizeof(struct tagRPCRet), Limit - sizeof(struct tagRPCRet)); + memcpy(*out_vars, buf + sizeof(struct tagRPCRet), Limit - sizeof(struct tagRPCRet)); /* RPC received variables types OK! */ data = (u_char*) buf + Limit; for (i = 0; i < rrpc->ret_argc; i++) - switch ((*out_vals)[i].val_type) { + switch ((*out_vars)[i].val_type) { case buffer: - if ((*out_vals)[i].val_len > BUFSIZ - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n"); - free(*out_vals); - *out_vals = NULL; + if ((*out_vars)[i].val_len > sizeof buf - Limit) { + rpc_SetErr(EMSGSIZE, "Error:: Too long RPC packet ...\n"); + free(*out_vars); + *out_vars = NULL; *out_argc = 0; return -7; } else - Limit += (*out_vals)[i].val_len; + Limit += (*out_vars)[i].val_len; - (*out_vals)[i].val.buffer = malloc((*out_vals)[i].val_len); - if (!(*out_vals)[i].val.buffer) { + (*out_vars)[i].val.buffer = malloc((*out_vars)[i].val_len); + if (!(*out_vars)[i].val.buffer) { rpc_SetErr(errno, "Error:: in prepare RPC reply ...\n"); - free(*out_vals); - *out_vals = NULL; + free(*out_vars); + *out_vars = NULL; *out_argc = 0; return -1; } else - memcpy((*out_vals)[i].val.buffer, data, (*out_vals)[i].val_len); - data += (*out_vals)[i].val_len; + memcpy((*out_vars)[i].val.buffer, data, (*out_vars)[i].val_len); + data += (*out_vars)[i].val_len; break; case string: - if ((*out_vals)[i].val_len > BUFSIZ - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n"); - free(*out_vals); - *out_vals = NULL; + if ((*out_vars)[i].val_len > sizeof buf - Limit) { + rpc_SetErr(EMSGSIZE, "Error:: Too long RPC packet ...\n"); + free(*out_vars); + *out_vars = NULL; *out_argc = 0; return -7; } else - Limit += (*out_vals)[i].val_len; + Limit += (*out_vars)[i].val_len; - (*out_vals)[i].val.string = malloc((*out_vals)[i].val_len); - if (!(*out_vals)[i].val.string) { + (*out_vars)[i].val.string = malloc((*out_vars)[i].val_len); + if (!(*out_vars)[i].val.string) { rpc_SetErr(errno, "Error:: in prepare RPC reply ...\n"); - free(*out_vals); - *out_vals = NULL; + free(*out_vars); + *out_vars = NULL; *out_argc = 0; return -1; } else - memcpy((*out_vals)[i].val.string, data, (*out_vals)[i].val_len); - data += (*out_vals)[i].val_len; + memcpy((*out_vars)[i].val.string, data, (*out_vars)[i].val_len); + data += (*out_vars)[i].val_len; break; default: break; @@ -453,30 +453,30 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, } else { if (out_argc) *out_argc = 0; - if (out_vals) - *out_vals = NULL; + if (out_vars) + *out_vars = NULL; } return rrpc->ret_retcode; } /* - * rpc_cli_freeVals() Free rpc_val_t array returned from RPC call + * rpc_cli_freeVals() Free ait_val_t array returned from RPC call * @args = Number of arguments in array - * @vals = Value elements + * @vars = Value elements * return: none */ inline void -rpc_cli_freeVals(int args, rpc_val_t *vals) +rpc_cli_freeVals(int args, ait_val_t * __restrict vars) { register int i; - if (!vals) + if (!vars) return; for (i = 0; i < args; i++) - RPC_FREE_VAL(&vals[i]); + AIT_FREE_VAL(&vars[i]); - free(vals); - vals = NULL; + free(vars); + vars = NULL; }