--- libaitrpc/src/srv.c 2012/05/16 07:24:08 1.9.2.9 +++ libaitrpc/src/srv.c 2012/05/16 07:37:37 1.9.2.10 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.9.2.9 2012/05/16 07:24:08 misho Exp $ +* $Id: srv.c,v 1.9.2.10 2012/05/16 07:37:37 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -168,8 +168,7 @@ execCall(sched_task_t *task) } } - if (arr) - io_arrayDestroy(&arr); + io_arrayDestroy(&arr); return NULL; } @@ -468,8 +467,8 @@ rpc_srv_dispatchVars(void *arg) free(buf); return NULL; } +#endif -// ------------------------------------------------- /* * rpc_srv_initBLOBServer() - Init & create BLOB Server @@ -501,10 +500,9 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s } else AIT_SET_STR(&srv->srv_blob.dir, diskDir); - srv->srv_blob.server.cli_tid = pthread_self(); srv->srv_blob.server.cli_parent = srv; - memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa); + memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof(io_sockaddr_t)); switch (sa.sa.sa_family) { case AF_INET: sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1); @@ -519,7 +517,6 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s AIT_FREE_VAL(&srv->srv_blob.dir); return -1; } - memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa); /* create BLOB server socket */ srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0); @@ -555,20 +552,20 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s return -1; } - /* allocate pool for concurent clients */ - srv->srv_blob.clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t)); + /* allocate pool for concurent blob clients */ + srv->srv_blob.clients = io_arrayInit(io_arraySize(srv->srv_clients)); if (!srv->srv_blob.clients) { - LOGERR; + rpc_SetErr(io_GetErrno(), "%s", io_GetError()); close(srv->srv_blob.server.cli_sock); AIT_FREE_VAL(&srv->srv_blob.dir); return -1; - } else - memset(srv->srv_blob.clients, 0, srv->srv_numcli * sizeof(rpc_cli_t)); + } srv->srv_blob.state = enable; /* enable BLOB */ return 0; } +#if 0 /* * rpc_srv_endBLOBServer() - Destroy BLOB server, close all opened sockets and free resources *