--- libaitrpc/src/cli.c 2015/01/15 01:42:37 1.23 +++ libaitrpc/src/cli.c 2015/01/18 01:03:49 1.23.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.23 2015/01/15 01:42:37 misho Exp $ +* $Id: cli.c,v 1.23.2.2 2015/01/18 01:03:49 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 - 2014 +Copyright 2004 - 2015 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -746,6 +746,71 @@ rpc_cli_closeClient2(rpc_cli_t ** __restrict cli) return; close((*cli)->cli_sock); + + AIT_FREE_VAL(&(*cli)->cli_buf); + + if ((*cli)->cli_parent) + e_free((*cli)->cli_parent); + + e_free(*cli); + *cli = NULL; +} + +/* + * rpc_cli_openClientExt() - Connect to pipe RPC Server + * + * @InstID = InstID for RPC session request + * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) + * @fd = File descriptor + * return: NULL == error or !=NULL connection to RPC server established + */ +rpc_cli_t * +rpc_cli_openClientExt(u_char InstID, int netBuf, int fd) +{ + rpc_cli_t *cli = NULL; + int n; + + cli = e_malloc(sizeof(rpc_cli_t)); + if (!cli) { + LOGERR; + return NULL; + } else + memset(cli, 0, sizeof(rpc_cli_t)); + + /* build session */ + cli->cli_parent = e_malloc(sizeof(rpc_sess_t)); + if (!cli->cli_parent) { + LOGERR; + e_free(cli); + return NULL; + } else { + ((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION; + ((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID; + } + + cli->cli_id = SOCK_EXT; + cli->cli_sock = fd; + + n = (netBuf < RPC_MIN_BUFSIZ) ? getpagesize() : E_ALIGN(netBuf, 2); + AIT_SET_BUFSIZ(&cli->cli_buf, 0, n); + + fcntl(cli->cli_sock, F_SETFL, + fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); + + return cli; +} + +/* + * rpc_cli_closeClientExt() - Close pipe connection to RPC server and free resources + * + * @cli = RPC Client session + * return: none + */ +void +rpc_cli_closeClientExt(rpc_cli_t ** __restrict cli) +{ + if (!cli || !*cli || (*cli)->cli_id != SOCK_EXT) + return; AIT_FREE_VAL(&(*cli)->cli_buf);