--- libaitrpc/src/srv.c 2011/07/14 01:37:02 1.2.2.3 +++ libaitrpc/src/srv.c 2011/08/18 19:04:10 1.3.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.2.2.3 2011/07/14 01:37:02 misho Exp $ +* $Id: srv.c,v 1.3.2.2 2011/08/18 19:04:10 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -52,9 +52,10 @@ rpc_srv_dispatchCall(void *arg) rpc_cli_t *c = arg; rpc_srv_t *s; rpc_val_t *vals = NULL, *v = NULL; - rpc_func_t *f; + rpc_func_t *f = NULL; struct tagRPCCall *rpc; struct tagRPCRet *rrpc; + rpc_sess_t ses = { 0 }; fd_set fds; u_char buf[BUFSIZ], *data; int ret, argc = 0, Limit = 0; @@ -147,6 +148,7 @@ rpc_srv_dispatchCall(void *arg) 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; @@ -155,13 +157,12 @@ rpc_srv_dispatchCall(void *arg) ret = -9; else argc = rpc_srv_getValsCall(f, &vals); - makeReply: memset(buf, 0, BUFSIZ); rrpc = (struct tagRPCRet*) buf; Limit = sizeof(struct tagRPCRet); - memcpy(&rrpc->ret_session, &rpc->call_session, sizeof rrpc->ret_session); + 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; @@ -173,7 +174,7 @@ makeReply: if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) { for (i = 0; i < argc; i++) RPC_FREE_VAL(&vals[i]); - free(vals); + rpc_srv_freeValsCall(f); vals = NULL; argc = 0; ret = -7; @@ -222,8 +223,9 @@ makeReply: RPC_FREE_VAL(&vals[i]); } - free(vals); + rpc_srv_freeValsCall(f); vals = NULL; + argc = 0; } if ((ret = send(c->cli_sock, buf, Limit, 0)) == -1) { @@ -557,51 +559,58 @@ 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 + * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW + * @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 */ rpc_srv_t * rpc_srv_initServer(u_int regProgID, u_int regProcID, int concurentClients, - u_short family, const char *csHost, u_short Port) + int sockType, u_short family, const char *csHost, u_short Port) { 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; @@ -621,16 +630,27 @@ 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); - srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0); + 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, sockType ? sockType : SOCK_STREAM, 0); if (srv->srv_server.cli_sock == -1) { LOGERR; free(srv); return NULL; - } + } else + srv->srv_server.cli_type = sockType; if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) { LOGERR; close(srv->srv_server.cli_sock); @@ -644,6 +664,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; @@ -681,6 +702,7 @@ 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) { shutdown(c->cli_sock, SHUT_RDWR); @@ -694,6 +716,7 @@ rpc_srv_endServer(rpc_srv_t * __restrict srv) srv->srv_numcli = 0; } + /* detach exported calls */ pthread_mutex_lock(&srv->srv_mtx); while ((f = srv->srv_funcs)) { srv->srv_funcs = f->func_next;