--- libaitrpc/src/srv.c 2011/09/01 14:55:42 1.4.2.7 +++ libaitrpc/src/srv.c 2011/09/03 12:39:27 1.4.2.8 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.4.2.7 2011/09/01 14:55:42 misho Exp $ +* $Id: srv.c,v 1.4.2.8 2011/09/03 12:39:27 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -310,7 +310,7 @@ makeReply: shutdown(c->cli_sock, SHUT_RDWR); close(c->cli_sock); memset(c, 0, sizeof(rpc_cli_t)); - return (void*) (long)ret; + return (void*) ((long)ret); } // ------------------------------------------------- @@ -437,10 +437,12 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) } else srv->srv_blob.state = kill; + /* rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN); rpc_srv_unregisterCall(srv, NULL, CALL_BLOBCLIENTS); rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS); rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSTATE); + */ /* close all clients connections & server socket */ for (i = 0, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++) @@ -467,12 +469,12 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) } /* - * rpc_srv_execBLOBServer() Execute Main BLOB server loop and wait for clients requests + * rpc_srv_loopBLOB() Execute Main BLOB server loop and wait for clients requests * @srv = RPC Server instance * return: -1 error or 0 ok, infinite loop ... */ int -rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) +rpc_srv_loopBLOB(rpc_srv_t * __restrict srv) { socklen_t salen = sizeof(struct sockaddr); register int i; @@ -727,12 +729,12 @@ rpc_srv_endServer(rpc_srv_t * __restrict srv) } /* - * rpc_srv_execServer() Execute Main server loop and wait for clients requests + * rpc_srv_loopServer() Execute Main server loop and wait for clients requests * @srv = RPC Server instance * return: -1 error or 0 ok, infinite loop ... */ int -rpc_srv_execServer(rpc_srv_t * __restrict srv) +rpc_srv_loopServer(rpc_srv_t * __restrict srv) { socklen_t salen = sizeof(struct sockaddr); register int i; @@ -745,6 +747,9 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start RPC server ...\n"); return -1; } + + /* activate BLOB server worker if srv->srv_blob.state == enable */ + rpc_srv_execBLOBServer(srv); if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) { LOGERR;