--- libaitrpc/src/cli.c 2012/11/19 21:50:26 1.13 +++ libaitrpc/src/cli.c 2013/01/17 16:33:57 1.13.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.13 2012/11/19 21:50:26 misho Exp $ +* $Id: cli.c,v 1.13.4.1 2013/01/17 16:33:57 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -64,14 +64,14 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, return NULL; } - cli = io_malloc(sizeof(rpc_cli_t)); + cli = e_malloc(sizeof(rpc_cli_t)); if (!cli) { LOGERR; return NULL; } else 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) { case AF_INET: cli->cli_sa.sin.sin_port = @@ -96,25 +96,25 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0); if (cli->cli_sock == -1) { LOGERR; - io_free(cli); + e_free(cli); return NULL; } if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) { LOGERR; close(cli->cli_sock); - io_free(cli); + e_free(cli); return NULL; } if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) { LOGERR; close(cli->cli_sock); - io_free(cli); + e_free(cli); return NULL; } if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) { LOGERR; close(cli->cli_sock); - io_free(cli); + e_free(cli); return NULL; } else fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); @@ -139,7 +139,7 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli) AIT_FREE_VAL(&(*cli)->cli_buf); - io_free(*cli); + e_free(*cli); *cli = NULL; } @@ -161,9 +161,9 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne u_short Port, int proto) { 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; if (!Port) Port = RPC_DEFPORT; @@ -172,7 +172,7 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne if (netBuf < RPC_MIN_BUFSIZ) netBuf = BUFSIZ; else - netBuf = io_align(netBuf, 2); /* align netBuf length */ + netBuf = E_ALIGN(netBuf, 2); /* align netBuf length */ #ifdef HAVE_SRANDOMDEV srandomdev(); @@ -182,7 +182,7 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne srandom((time(&tim) ^ getpid())); #endif - cli = io_malloc(sizeof(rpc_cli_t)); + cli = e_malloc(sizeof(rpc_cli_t)); if (!cli) { LOGERR; return NULL; @@ -190,10 +190,10 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne memset(cli, 0, sizeof(rpc_cli_t)); /* build session */ - cli->cli_parent = io_malloc(sizeof(rpc_sess_t)); + cli->cli_parent = e_malloc(sizeof(rpc_sess_t)); if (!cli->cli_parent) { LOGERR; - io_free(cli); + e_free(cli); return NULL; } else { ((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION; @@ -203,7 +203,7 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne cli->cli_id = proto; 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 */ cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0); @@ -233,8 +233,8 @@ err: AIT_FREE_VAL(&cli->cli_buf); if (cli->cli_sock > 2) close(cli->cli_sock); - io_free(cli->cli_parent); - io_free(cli); + e_free(cli->cli_parent); + e_free(cli); return NULL; } @@ -257,9 +257,9 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli) AIT_FREE_VAL(&(*cli)->cli_buf); if ((*cli)->cli_parent) - io_free((*cli)->cli_parent); + e_free((*cli)->cli_parent); - io_free(*cli); + e_free(*cli); *cli = NULL; } @@ -271,7 +271,7 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli) * @noreply = We not want RPC reply * @tag = Function tag for execution * @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 */ int @@ -283,7 +283,7 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short uint16_t crc; u_char *buf; struct pollfd pfd; - io_sockaddr_t sa; + sockaddr_t sa; socklen_t salen; if (!cli) { @@ -299,16 +299,16 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short /* prepare RPC call */ rpc = (struct tagRPCCall*) buf; 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_seq = htons(random() % USHRT_MAX); /* set reply */ rpc->call_req.flags = noreply ? RPC_NOREPLY : RPC_REPLY; - if (io_arraySize(in_vars)) { + if (array_Size(in_vars)) { /* 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) { rpc_SetErr(EBADRPC, "Failed to prepare RPC packet values"); return -1; @@ -390,7 +390,7 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short if (cli->cli_id == SOCK_DGRAM) { /* 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"); continue; } @@ -433,14 +433,14 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short /* RPC is OK! Go de-marshaling variables ... */ if (out_vars && ntohs(rpc->call_argc)) { #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); #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); #endif if (!*out_vars) { - rpc_SetErr(io_GetErrno(), "%s", io_GetError()); + rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); return -1; } } @@ -459,9 +459,9 @@ inline void rpc_cli_freeCall(array_t ** __restrict out_vars) { #ifdef CLI_RES_ZCOPY - io_arrayDestroy(out_vars); + array_Destroy(out_vars); #else - io_freeVars(out_vars); + ait_freeVars(out_vars); #endif } @@ -483,7 +483,7 @@ rpc_cli_ping(rpc_cli_t *cli) if (rpc_cli_execCall(cli, RPC_REPLY, CALL_SRVPING, NULL, &arr)) return -1; 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); return ret;