--- libaitrpc/src/srv.c 2011/09/07 09:22:15 1.5.2.3 +++ libaitrpc/src/srv.c 2011/09/07 09:42:46 1.5.2.4 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.5.2.3 2011/09/07 09:22:15 misho Exp $ +* $Id: srv.c,v 1.5.2.4 2011/09/07 09:42:46 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -688,50 +688,50 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i /* * rpc_srv_endServer() Destroy RPC server, close all opened sockets and free resources - * @srv = RPC Server instance + * @psrv = RPC Server instance * return: none */ void -rpc_srv_endServer(rpc_srv_t * __restrict srv) +rpc_srv_endServer(rpc_srv_t ** __restrict psrv) { rpc_cli_t *c; register int i; rpc_func_t *f; - if (!srv) { + if (!psrv || !*psrv) { rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n"); return; } - rpc_srv_endBLOBServer(srv); + rpc_srv_endBLOBServer(*psrv); /* close all clients connections & server socket */ - for (i = 0, c = srv->srv_clients; i < srv->srv_numcli && c; i++, c++) + for (i = 0, c = (*psrv)->srv_clients; i < (*psrv)->srv_numcli && c; i++, c++) if (c->cli_sa.sa_family) { shutdown(c->cli_sock, SHUT_RDWR); close(c->cli_sock); } - close(srv->srv_server.cli_sock); + close((*psrv)->srv_server.cli_sock); - if (srv->srv_clients) { - free(srv->srv_clients); - srv->srv_clients = NULL; - srv->srv_numcli = 0; + if ((*psrv)->srv_clients) { + free((*psrv)->srv_clients); + (*psrv)->srv_clients = NULL; + (*psrv)->srv_numcli = 0; } /* detach exported calls */ - pthread_mutex_lock(&srv->srv_mtx); - while ((f = srv->srv_funcs)) { - srv->srv_funcs = f->func_next; + pthread_mutex_lock(&(*psrv)->srv_mtx); + while ((f = (*psrv)->srv_funcs)) { + (*psrv)->srv_funcs = f->func_next; free(f); } - pthread_mutex_unlock(&srv->srv_mtx); + pthread_mutex_unlock(&(*psrv)->srv_mtx); - while (pthread_mutex_trylock(&srv->srv_mtx) == EBUSY); - pthread_mutex_destroy(&srv->srv_mtx); + while (pthread_mutex_trylock(&(*psrv)->srv_mtx) == EBUSY); + pthread_mutex_destroy(&(*psrv)->srv_mtx); - free(srv); - srv = NULL; + free(*psrv); + *psrv = NULL; } /*