--- libaitrpc/src/srv.c 2010/06/23 16:44:24 1.1.1.1.2.7 +++ libaitrpc/src/srv.c 2011/08/19 14:44:34 1.3.2.13 @@ -3,24 +3,62 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.1.1.1.2.7 2010/06/23 16:44:24 misho Exp $ +* $Id: srv.c,v 1.3.2.13 2011/08/19 14:44:34 misho Exp $ * -*************************************************************************/ +************************************************************************** +The ELWIX and AITNET software is distributed under the following +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 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #include "global.h" static void * rpc_srv_dispatchCall(void *arg) { - rpc_cli_t cli, *c = arg; + rpc_cli_t *c = arg; rpc_srv_t *s; - rpc_val_t *vals, *v = NULL; - rpc_func_t *f; + rpc_val_t *vals = NULL, *v = NULL; + rpc_func_t *f = NULL; struct tagRPCCall *rpc; - struct tagRPCRet rrpc; + struct tagRPCRet *rrpc; + rpc_sess_t ses = { 0 }; fd_set fds; u_char buf[BUFSIZ], *data; - int ret, argc, Limit = 0; + int ret, argc = 0, Limit = 0; register int i; if (!arg) { @@ -30,20 +68,26 @@ rpc_srv_dispatchCall(void *arg) s = c->cli_parent; do { + v = NULL; FD_ZERO(&fds); FD_SET(c->cli_sock, &fds); ret = select(c->cli_sock + 1, &fds, NULL, NULL, NULL); if (ret == -1) { + if (errno == EINTR && s->srv_kill != kill) + continue; + + LOGERR; ret = -2; + break; } - memset(&rrpc, 0, sizeof rrpc); - memset(buf, 0, BUFSIZ); - if ((ret = recv(c->cli_sock, buf, BUFSIZ, 0)) == -1) { + memset(buf, 0, sizeof buf); + ret = recv(c->cli_sock, buf, sizeof buf, 0); + if (ret == -1) { LOGERR; ret = -3; break; } - if (!ret) { // receive EOF + if (!ret) { /* receive EOF */ ret = 0; break; } @@ -53,69 +97,113 @@ rpc_srv_dispatchCall(void *arg) break; } else rpc = (struct tagRPCCall*) buf; - // check RPC packet session info + /* check RPC packet session info */ if (memcmp(&rpc->call_session, &s->srv_session, sizeof rpc->call_session)) { rpc_SetErr(EINVAL, "Error:: get invalid RPC session ...\n"); ret = -5; - break; - } - // RPC is OK! Go decapsulate variables ... + goto makeReply; + } else + Limit = sizeof(struct tagRPCCall); + /* RPC is OK! Go decapsulate variables ... */ if (rpc->call_argc) { - v = (rpc_val_t*) (buf + sizeof(struct tagRPCCall)); - // RPC received variables types OK! + v = (rpc_val_t*) (buf + Limit); + /* check RPC packet length */ + if (rpc->call_argc * sizeof(rpc_val_t) > sizeof buf - Limit) { + rpc_SetErr(EMSGSIZE, "Error:: too long RPC packet ...\n"); + ret = -5; + goto makeReply; + } else + Limit += rpc->call_argc * sizeof(rpc_val_t); + /* RPC received variables types OK! */ data = (u_char*) v + rpc->call_argc * sizeof(rpc_val_t); for (i = 0; i < rpc->call_argc; i++) { switch (v[i].val_type) { case buffer: + if (v[i].val_len > sizeof buf - Limit) { + rpc_SetErr(EMSGSIZE, "Error:: too long RPC packet ...\n"); + ret = -5; + goto makeReply; + } else + Limit += v[i].val_len; + v[i].val.buffer = data; data += v[i].val_len; break; case string: + if (v[i].val_len > sizeof buf - Limit) { + rpc_SetErr(EMSGSIZE, "Error:: too long RPC packet ...\n"); + ret = -5; + goto makeReply; + } else + Limit += v[i].val_len; + v[i].val.string = (int8_t*) data; - data += v[i].val_len + 1; + data += v[i].val_len; break; case blob: - rpc_srv_getBLOBVar(&v[i], data); - data += sizeof(rpc_cli_t); - break; + if (s->srv_blob.state == disable) { + rpc_SetErr(ENOTSUP, "Error:: BLOB server is disabled\n"); + ret = -5; + goto makeReply; + } + if (s->srv_blob.state == kill) { + rpc_SetErr(ENOTSUP, "Error:: BLOB server is gone.\n"); + ret = -5; + goto makeReply; + } default: break; } } } + /* execute call */ argc = 0; vals = NULL; + memcpy(&ses, &rpc->call_session, sizeof ses); if (!(f = rpc_srv_getCall(s, rpc->call_tag, rpc->call_hash))) { rpc_SetErr(EINVAL, "Error:: call not found into RPC server ...\n"); ret = -6; } else - if ((ret = rpc_srv_execCall(s, f, rpc, v)) == -1) - ret = -6; + if ((ret = rpc_srv_execCall(f, rpc, v)) == -1) + ret = -9; else - argc = rpc_srv_getValsCall(f, &vals); + argc = rpc_srv_getVars(f, &vals); +makeReply: + /* made reply */ + memset(buf, 0, sizeof buf); + rrpc = (struct tagRPCRet*) buf; + Limit = sizeof(struct tagRPCRet); - memcpy(&rrpc.ret_session, &rpc->call_session, sizeof rrpc.ret_session); - rrpc.ret_tag = rpc->call_tag; - rrpc.ret_hash = rpc->call_hash; - rrpc.ret_errno = rpc_Errno; - rrpc.ret_retcode = ret; - rrpc.ret_argc = argc; + memcpy(&rrpc->ret_session, &ses, sizeof(rpc_sess_t)); + rrpc->ret_tag = rpc->call_tag; + rrpc->ret_hash = rpc->call_hash; + rrpc->ret_errno = rpc_Errno; + rrpc->ret_retcode = ret; + rrpc->ret_argc = argc; - memset(buf, 0, BUFSIZ); - memcpy(buf, &rrpc, (Limit = sizeof rrpc)); if (argc && vals) { - v = (rpc_val_t*) (buf + sizeof rrpc); + v = (rpc_val_t*) (buf + Limit); + if (argc * sizeof(rpc_val_t) > sizeof buf - Limit) { + for (i = 0; i < argc; i++) + RPC_FREE_VAL(&vals[i]); + rpc_srv_freeVars(f); + vals = NULL; + argc = 0; + ret = -7; + rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n"); + goto makeReply; + } else + Limit += argc * sizeof(rpc_val_t); memcpy(v, vals, argc * sizeof(rpc_val_t)); - Limit += argc * sizeof(rpc_val_t); data = (u_char*) v + argc * sizeof(rpc_val_t); for (ret = i = 0; i < argc; i++) { switch (vals[i].val_type) { case buffer: - if (ret || Limit + vals[i].val_len > BUFSIZ) { + if (ret || Limit + vals[i].val_len > sizeof buf) { rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n"); - rrpc.ret_retcode = ret = -7; - rrpc.ret_argc = 0; + rrpc->ret_retcode = ret = -7; + rrpc->ret_argc = 0; break; } @@ -124,56 +212,59 @@ rpc_srv_dispatchCall(void *arg) Limit += vals[i].val_len; break; case string: - if (ret || Limit + vals[i].val_len + 1 > BUFSIZ) { + if (ret || Limit + vals[i].val_len > sizeof buf) { rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n"); - rrpc.ret_retcode = ret = -7; - rrpc.ret_argc = 0; + rrpc->ret_retcode = ret = -7; + rrpc->ret_argc = 0; break; } - memcpy(data, vals[i].val.string, vals[i].val_len + 1); - data += vals[i].val_len + 1; - Limit += vals[i].val_len + 1; + memcpy(data, vals[i].val.string, vals[i].val_len); + data += vals[i].val_len; + Limit += vals[i].val_len; break; case blob: - if (ret || Limit + sizeof(rpc_cli_t) > BUFSIZ) { - rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n"); - rrpc.ret_retcode = ret = -7; - rrpc.ret_argc = 0; + if (s->srv_blob.state == disable) { + rpc_SetErr(ENOTSUP, "Error:: BLOB server is disabled\n"); + rrpc->ret_retcode = ret = -5; + rrpc->ret_argc = 0; break; } - - memcpy(data, &cli, sizeof(rpc_cli_t)); - data += sizeof(rpc_cli_t); - Limit += sizeof(rpc_cli_t); - - rpc_srv_setBLOBVar(&vals[i], &cli); - break; + if (s->srv_blob.state == kill) { + rpc_SetErr(ENOTSUP, "Error:: BLOB server is gone.\n"); + rrpc->ret_retcode = ret = -5; + rrpc->ret_argc = 0; + break; + } default: break; } RPC_FREE_VAL(&vals[i]); } + rpc_srv_freeVars(f); + vals = NULL; + argc = 0; } - if ((ret = send(c->cli_sock, buf, Limit, 0)) == -1) { + ret = send(c->cli_sock, buf, Limit, 0); + if (ret == -1) { LOGERR; ret = -8; break; } if (ret != Limit) { - rpc_SetErr(EBADMSG, "Error:: in send RPC request, should be send %d bytes, " + rpc_SetErr(ECANCELED, "Error:: in send RPC request, should be send %d bytes, " "really is %d\n", Limit, ret); ret = -9; break; } - } while (ret > -1); + } while (ret > -1 || s->srv_kill != kill); shutdown(c->cli_sock, SHUT_RDWR); close(c->cli_sock); memset(c, 0, sizeof(rpc_cli_t)); - return (void*) ret; + return (void*) (long)ret; } @@ -183,7 +274,7 @@ rpc_srv_dispatchVars(void *arg) rpc_cli_t *c = arg; rpc_srv_t *s; rpc_blob_t *b; - int cx, ret; + int ret = 0; fd_set fds; u_char buf[sizeof(struct tagBLOBHdr)]; struct tagBLOBHdr *blob; @@ -194,23 +285,37 @@ rpc_srv_dispatchVars(void *arg) } else s = c->cli_parent; - cx = -1; do { - cx++; + /* check for disable service at this moment? */ + if (s->srv_blob.state == disable && s->srv_kill != kill) { + usleep(100000); +#ifdef HAVE_PTHREAD_YIELD + pthread_yield(); +#endif + continue; + } FD_ZERO(&fds); FD_SET(c->cli_sock, &fds); ret = select(c->cli_sock + 1, &fds, NULL, NULL, NULL); if (ret == -1) { + if (errno == EINTR && s->srv_kill != kill && s->srv_blob.state != kill) + continue; + + LOGERR; ret = -2; + break; } + memset(buf, 0, sizeof buf); - if ((ret = recv(c->cli_sock, buf, sizeof buf, 0)) == -1) { + ret = recv(c->cli_sock, buf, sizeof buf, 0); + if (ret == -1) { LOGERR; ret = -3; break; } - if (!ret) { // receive EOF + /* receive EOF, disable or kill service */ + if (!ret || s->srv_blob.state == kill || s->srv_kill == kill) { ret = 0; break; } @@ -220,21 +325,23 @@ rpc_srv_dispatchVars(void *arg) break; } else blob = (struct tagBLOBHdr*) buf; - // check BLOB packet session info - if (memcmp(&blob->hdr_session, &s->srv_session, sizeof blob->hdr_session) || - blob->hdr_seq != cx) { - rpc_SetErr(EINVAL, "Error:: get invalid BLOB session in seq=%d...\n", blob->hdr_seq); + /* check BLOB packet session info */ + if (memcmp(&blob->hdr_session, &s->srv_session, sizeof blob->hdr_session)) { + rpc_SetErr(EINVAL, "Error:: get invalid BLOB session ...\n"); ret = -5; - break; + goto makeReply; } - // Go to decapsulate packet ... - if (!(b = rpc_srv_getBLOB(s, blob->hdr_var))) { - rpc_SetErr(EINVAL, "Error:: var (%x) not found into BLOB server ...\n", blob->hdr_var); - ret = -6; - break; - } + /* Go to proceed packet ... */ switch (blob->hdr_cmd) { case get: + if (!(b = rpc_srv_getBLOB(s, blob->hdr_var))) { + rpc_SetErr(EINVAL, "Error:: var (%x) not found into BLOB server ...\n", + blob->hdr_var); + ret = -6; + break; + } else + blob->hdr_len = b->blob_len; + if (rpc_srv_blobMap(s, b) != -1) { ret = rpc_srv_sendBLOB(c, b); rpc_srv_blobUnmap(b); @@ -242,12 +349,17 @@ rpc_srv_dispatchVars(void *arg) ret = -7; break; case set: - ret = rpc_srv_recvBLOB(c, b); - if (ret == -1) + if ((b = rpc_srv_registerBLOB(s, blob->hdr_len))) { + /* set new BLOB variable for reply :) */ + blob->hdr_var = b->blob_var; + + ret = rpc_srv_recvBLOB(c, b); + rpc_srv_blobUnmap(b); + } else ret = -7; break; case unset: - ret = rpc_srv_deleteBLOB(c, b); + ret = rpc_srv_unregisterBLOB(s, blob->hdr_var); if (ret == -1) ret = -7; break; @@ -257,32 +369,35 @@ rpc_srv_dispatchVars(void *arg) ret = -7; } - // Replay to client! +makeReply: + /* Replay to client! */ blob->hdr_cmd = ret < 0 ? error : ok; - blob->hdr_seq = ret; - if ((ret = send(c->cli_sock, buf, sizeof buf, 0)) == -1) { + blob->hdr_ret = ret; + ret = send(c->cli_sock, buf, sizeof buf, 0); + if (ret == -1) { LOGERR; ret = -8; break; } if (ret != sizeof buf) { - rpc_SetErr(EBADMSG, "Error:: in send BLOB reply, should be send %d bytes, " + rpc_SetErr(ECANCELED, "Error:: in send BLOB reply, should be send %d bytes, " "really is %d\n", sizeof buf, ret); ret = -9; break; } - } while (ret > -1); + } while (ret > -1 || s->srv_kill != kill); shutdown(c->cli_sock, SHUT_RDWR); close(c->cli_sock); memset(c, 0, sizeof(rpc_cli_t)); - return (void*) ret; + return (void*) (long)ret; } // ------------------------------------------------- /* * rpc_srv_initBLOBServer() Init & create BLOB Server + * @srv = RPC server instance * @Port = Port for bind server, if Port == 0 default port is selected * @diskDir = Disk place for BLOB file objects * return: -1 == error or 0 bind and created BLOB server instance @@ -291,8 +406,10 @@ int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir) { int n = 1; - struct sockaddr_in sin; - struct sockaddr_in6 sin6; + struct sockaddr sa; + struct sockaddr_in *sin = (struct sockaddr_in*) &sa; + struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa; + struct sockaddr_un *sun = (struct sockaddr_un*) &sa; if (!srv) { rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init BLOB server ...\n"); @@ -314,16 +431,26 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s srv->srv_blob.server.cli_tid = pthread_self(); srv->srv_blob.server.cli_parent = srv; - if (srv->srv_server.cli_sa.sa_family == AF_INET) { - memcpy(&sin, &srv->srv_server.cli_sa, sizeof sin); - sin.sin_port = htons(Port); - memcpy(&srv->srv_blob.server.cli_sa, &sin, sizeof(struct sockaddr)); - } else { - memcpy(&sin6, &srv->srv_server.cli_sa, sizeof sin6); - sin6.sin6_port = htons(Port); - memcpy(&srv->srv_blob.server.cli_sa, &sin6, sizeof(struct sockaddr)); + + memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa); + switch (srv->srv_server.cli_sa.sa_family) { + case AF_INET: + sin->sin_port = htons(Port); + memcpy(&srv->srv_blob.server.cli_sa, sin, sizeof(struct sockaddr)); + break; + case AF_INET6: + sin6->sin6_port = htons(Port); + memcpy(&srv->srv_blob.server.cli_sa, sin6, sizeof(struct sockaddr)); + break; + case AF_LOCAL: + strlcat(sun->sun_path, ".blob", sizeof sun->sun_path); + memcpy(&srv->srv_blob.server.cli_sa, sun, sizeof(struct sockaddr)); + break; + default: + return -1; } + /* create BLOB server socket */ srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa_family, SOCK_STREAM, 0); if (srv->srv_blob.server.cli_sock == -1) { LOGERR; @@ -341,6 +468,7 @@ 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)); if (!srv->srv_blob.clients) { LOGERR; @@ -355,9 +483,10 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0); rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 0); rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 0); + rpc_srv_registerCall(srv, NULL, CALL_BLOBSTATE, 1); pthread_mutex_unlock(&srv->srv_mtx); - srv->srv_blob.state = enable; // enable BLOB + srv->srv_blob.state = enable; /* enable BLOB */ return 0; } @@ -377,23 +506,34 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n"); return; } else - srv->srv_blob.state = disable; + 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++) if (c->cli_sa.sa_family) shutdown(c->cli_sock, SHUT_RDWR); close(srv->srv_blob.server.cli_sock); - if (srv->srv_blob.clients) + if (srv->srv_blob.clients) { free(srv->srv_blob.clients); + srv->srv_blob.clients = NULL; + } + /* detach blobs */ pthread_mutex_lock(&srv->srv_blob.mtx); while ((f = srv->srv_blob.blobs)) { srv->srv_blob.blobs = f->blob_next; + rpc_srv_blobFree(srv, f); free(f); } pthread_mutex_unlock(&srv->srv_blob.mtx); + while (pthread_mutex_trylock(&srv->srv_blob.mtx) == EBUSY); pthread_mutex_destroy(&srv->srv_blob.mtx); } @@ -412,7 +552,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) int ret; struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; - if (!srv || !srv->srv_blob.state) { + if (!srv || srv->srv_blob.state == kill) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start BLOB server ...\n"); return -1; } @@ -422,11 +562,11 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) return -1; } - while (!rpc_Kill) { + while (srv->srv_blob.state != kill && srv->srv_kill != kill) { for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++) if (!c->cli_sa.sa_family) break; - if (c && c->cli_sa.sa_family && c->cli_parent) { + if (i >= srv->srv_numcli) { usleep(1000000); continue; } @@ -452,9 +592,12 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchVars, c)) { LOGERR; continue; - } + } else + pthread_detach(c->cli_tid); } + srv->srv_blob.state = disable; + return 0; } @@ -464,8 +607,8 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) * @regProgID = ProgramID for authentication & recognition * @regProcID = ProcessID for authentication & recognition * @concurentClients = Concurent clients at same time to this server - * @family = Family socket type, AF_INET or AF_INET6 - * @csHost = Host name or IP address for bind server, if NULL any address + * @family = Family type, AF_INET, AF_INET6 or AF_LOCAL + * @csHost = Host name or address for bind server, if NULL any address * @Port = Port for bind server, if Port == 0 default port is selected * return: NULL == error or !=NULL bind and created RPC server instance */ @@ -476,39 +619,45 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i rpc_srv_t *srv = NULL; int n = 1; struct hostent *host = NULL; - struct sockaddr_in sin; - struct sockaddr_in6 sin6; + struct sockaddr sa; + struct sockaddr_in *sin = (struct sockaddr_in*) &sa; + struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa; + struct sockaddr_un *sun = (struct sockaddr_un*) &sa; - if (!concurentClients || !regProgID || (family != AF_INET && family != AF_INET6)) { + if (!concurentClients || !regProgID || + (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) { rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init RPC server ...\n"); return NULL; } if (!Port) Port = RPC_DEFPORT; - if (csHost) { + if (csHost && family != AF_LOCAL) { host = gethostbyname2(csHost, family); if (!host) { rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno)); return NULL; } } + memset(&sa, 0, sizeof sa); + sa.sa_family = family; switch (family) { case AF_INET: - memset(&sin, 0, sizeof sin); - sin.sin_len = sizeof sin; - sin.sin_family = family; - sin.sin_port = htons(Port); + sin->sin_len = sizeof(struct sockaddr_in); + sin->sin_port = htons(Port); if (csHost) - memcpy(&sin.sin_addr, host->h_addr, host->h_length); + memcpy(&sin->sin_addr, host->h_addr, host->h_length); break; case AF_INET6: - memset(&sin6, 0, sizeof sin6); - sin6.sin6_len = sizeof sin6; - sin6.sin6_family = family; - sin6.sin6_port = htons(Port); + sin6->sin6_len = sizeof(struct sockaddr_in6); + sin6->sin6_port = htons(Port); if (csHost) - memcpy(&sin6.sin6_addr, host->h_addr, host->h_length); + memcpy(&sin6->sin6_addr, host->h_addr, host->h_length); break; + case AF_LOCAL: + sun->sun_len = sizeof(struct sockaddr_un); + if (csHost) + strlcpy(sun->sun_path, csHost, sizeof sun->sun_path); + break; default: rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n"); return NULL; @@ -528,10 +677,20 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i srv->srv_server.cli_tid = pthread_self(); srv->srv_server.cli_parent = srv; - if (family == AF_INET) - memcpy(&srv->srv_server.cli_sa, &sin, sizeof srv->srv_server.cli_sa); - else - memcpy(&srv->srv_server.cli_sa, &sin6, sizeof srv->srv_server.cli_sa); + switch (family) { + case AF_INET: + memcpy(&srv->srv_server.cli_sa, sin, sizeof srv->srv_server.cli_sa); + break; + case AF_INET6: + memcpy(&srv->srv_server.cli_sa, sin6, sizeof srv->srv_server.cli_sa); + break; + case AF_LOCAL: + memcpy(&srv->srv_server.cli_sa, sun, sizeof srv->srv_server.cli_sa); + unlink(sun->sun_path); + break; + } + + /* create server socket */ srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0); if (srv->srv_server.cli_sock == -1) { LOGERR; @@ -551,6 +710,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i return NULL; } + /* allocate pool for concurent clients */ srv->srv_clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t)); if (!srv->srv_clients) { LOGERR; @@ -560,12 +720,12 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i } else memset(srv->srv_clients, 0, srv->srv_numcli * sizeof(rpc_cli_t)); + pthread_mutex_init(&srv->srv_mtx, NULL); + rpc_srv_registerCall(srv, NULL, CALL_SRVSHUTDOWN, 0); rpc_srv_registerCall(srv, NULL, CALL_SRVCLIENTS, 0); rpc_srv_registerCall(srv, NULL, CALL_SRVCALLS, 0); rpc_srv_registerCall(srv, NULL, CALL_SRVSESSIONS, 0); - - pthread_mutex_init(&srv->srv_mtx, NULL); return srv; } @@ -588,16 +748,21 @@ rpc_srv_endServer(rpc_srv_t * __restrict srv) rpc_srv_endBLOBServer(srv); + /* close all clients connections & server socket */ for (i = 0, c = srv->srv_clients; i < srv->srv_numcli && c; i++, c++) - if (c->cli_sa.sa_family) + if (c->cli_sa.sa_family) { shutdown(c->cli_sock, SHUT_RDWR); + close(c->cli_sock); + } close(srv->srv_server.cli_sock); if (srv->srv_clients) { free(srv->srv_clients); + srv->srv_clients = NULL; srv->srv_numcli = 0; } + /* detach exported calls */ pthread_mutex_lock(&srv->srv_mtx); while ((f = srv->srv_funcs)) { srv->srv_funcs = f->func_next; @@ -605,6 +770,7 @@ rpc_srv_endServer(rpc_srv_t * __restrict srv) } pthread_mutex_unlock(&srv->srv_mtx); + while (pthread_mutex_trylock(&srv->srv_mtx) == EBUSY); pthread_mutex_destroy(&srv->srv_mtx); free(srv); @@ -636,11 +802,11 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) return -1; } - while (!rpc_Kill) { + while (srv->srv_kill != kill) { for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++) if (!c->cli_sa.sa_family) break; - if (c && c->cli_sa.sa_family && c->cli_parent) { + if (i >= srv->srv_numcli) { usleep(1000000); continue; } @@ -666,7 +832,8 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchCall, c)) { LOGERR; continue; - } + } else + pthread_detach(c->cli_tid); } return 0; @@ -676,21 +843,20 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) /* * rpc_srv_execCall() Execute registered call from RPC server - * @data = RPC const data * @call = Register RPC call * @rpc = IN RPC call structure * @args = IN RPC call array of rpc values * return: -1 error, !=-1 ok */ int -rpc_srv_execCall(void * const data, rpc_func_t * __restrict call, - struct tagRPCCall * __restrict rpc, rpc_val_t * __restrict args) +rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, + rpc_val_t * __restrict args) { void *dl; rpc_callback_t func; int ret; - if (!data || !call || !rpc) { + if (!call || !rpc || !call->func_parent) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t exec call from RPC server ...\n"); return -1; } @@ -703,7 +869,7 @@ rpc_srv_execCall(void * const data, rpc_func_t * __res func = dlsym(dl, (char*) call->func_name); if (func) - ret = func(data, call, rpc->call_argc, args); + ret = func(call, rpc->call_argc, args); else { rpc_SetErr(ENOEXEC, "Error:: Can`t find function %s!\n", dlerror()); ret = -1;