--- libaitrpc/src/srv.c 2011/08/18 15:08:03 1.3 +++ libaitrpc/src/srv.c 2011/11/03 15:32:21 1.6 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.3 2011/08/18 15:08:03 misho Exp $ +* $Id: srv.c,v 1.6 2011/11/03 15:32:21 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -51,15 +51,17 @@ 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 = NULL; + array_t *arr; struct tagRPCCall *rpc; struct tagRPCRet *rrpc; rpc_sess_t ses = { 0 }; fd_set fds; - u_char buf[BUFSIZ], *data; + u_char *buf; int ret, argc = 0, Limit = 0; register int i; + uint16_t tag = 0; + uint32_t hash = 0; if (!arg) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t procced RPC client ...\n"); @@ -67,183 +69,134 @@ rpc_srv_dispatchCall(void *arg) } else s = c->cli_parent; + buf = malloc(s->srv_netbuf); + if (!buf) { + LOGERR; + return NULL; + } + 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(buf, 0, BUFSIZ); - if ((ret = recv(c->cli_sock, buf, BUFSIZ, 0)) == -1) { + memset(buf, 0, s->srv_netbuf); + ret = recv(c->cli_sock, buf, s->srv_netbuf, 0); + if (ret == -1) { LOGERR; ret = -3; break; } - if (!ret) { // receive EOF + if (!ret) { /* receive EOF */ ret = 0; break; } if (ret < sizeof(struct tagRPCCall)) { - rpc_SetErr(EMSGSIZE, "Error:: too short RPC packet ...\n"); + rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n"); ret = -4; - break; + if (s->srv_kill != kill) + continue; + else + break; } else rpc = (struct tagRPCCall*) buf; - // 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"); + /* check RPC packet session info */ + if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) { + rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n"); ret = -5; goto makeReply; } else Limit = sizeof(struct tagRPCCall); - // RPC is OK! Go decapsulate variables ... - if (rpc->call_argc) { - v = (rpc_val_t*) (buf + Limit); - // check RPC packet length - if (rpc->call_argc * sizeof(rpc_val_t) > BUFSIZ - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: Too big 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 > BUFSIZ - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: Too big 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 > BUFSIZ - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n"); - ret = -5; - goto makeReply; - } else - Limit += v[i].val_len; + tag = rpc->call_tag; + hash = rpc->call_hash; - v[i].val.string = (int8_t*) data; - data += v[i].val_len; - break; - case blob: - if (s->srv_blob.state == disable) { - rpc_SetErr(ENOTSUP, "Error:: BLOB server is disabled\n"); - ret = -5; - goto makeReply; - } - default: - break; - } + /* RPC is OK! Go decapsulate variables ... */ + if (ntohs(rpc->call_argc)) { + arr = io_buffer2vars(buf + Limit, s->srv_netbuf - Limit, + ntohs(rpc->call_argc), 1); + if (!arr) { + ret = -5; + goto makeReply; } - } + } else + arr = NULL; + /* 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"); + if (!(f = rpc_srv_getCall(s, ntohs(tag), ntohl(hash)))) { + rpc_SetErr(EPROGUNAVAIL, "Error:: call not found into RPC server ...\n"); ret = -6; } else - if ((ret = rpc_srv_execCall(f, rpc, v)) == -1) + if ((ret = rpc_srv_execCall(f, rpc, arr)) == -1) ret = -9; - else - argc = rpc_srv_getValsCall(f, &vals); + else { + if (arr) + io_arrayDestroy(&arr); + argc = rpc_srv_getVars(f, &arr); + goto makeReply; /* Call finish OK */ + } + + if (arr) + io_arrayDestroy(&arr); + makeReply: - memset(buf, 0, BUFSIZ); + /* Made reply */ + memset(buf, 0, s->srv_netbuf); rrpc = (struct tagRPCRet*) buf; Limit = sizeof(struct tagRPCRet); 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; + rrpc->ret_tag = tag; + rrpc->ret_hash = hash; + rrpc->ret_errno = htonl(rpc_Errno); + rrpc->ret_retcode = htonl(ret); + rrpc->ret_argc = htons(argc); - if (argc && vals) { - v = (rpc_val_t*) (buf + Limit); - if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) { - for (i = 0; i < argc; i++) - RPC_FREE_VAL(&vals[i]); - rpc_srv_freeValsCall(f); - vals = NULL; + if (argc && arr) { + /* Go Encapsulate variables ... */ + if ((i = io_vars2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) { + io_clrVars(f->func_vars); argc = 0; ret = -7; - rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n"); + rpc_SetErr(EBADRPC, "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)); - 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) { - rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n"); - rrpc->ret_retcode = ret = -7; - rrpc->ret_argc = 0; - break; - } + } else { + Limit += i; - memcpy(data, vals[i].val.buffer, vals[i].val_len); - data += vals[i].val_len; - Limit += vals[i].val_len; - break; - case string: - if (ret || Limit + vals[i].val_len > BUFSIZ) { - rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n"); - rrpc->ret_retcode = ret = -7; - rrpc->ret_argc = 0; - break; - } - - memcpy(data, vals[i].val.string, vals[i].val_len); - data += vals[i].val_len; - Limit += vals[i].val_len; - break; - case blob: - 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; - } - default: - break; - } - - RPC_FREE_VAL(&vals[i]); + io_clrVars(f->func_vars); } - rpc_srv_freeValsCall(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(ECANCELED, "Error:: in send RPC request, should be send %d bytes, " + rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, " "really is %d\n", Limit, ret); ret = -9; - break; + if (s->srv_kill != kill) + continue; + else + 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)); + free(buf); return (void*) (long)ret; } @@ -254,7 +207,7 @@ rpc_srv_dispatchVars(void *arg) rpc_cli_t *c = arg; rpc_srv_t *s; rpc_blob_t *b; - int ret; + int ret = 0; fd_set fds; u_char buf[sizeof(struct tagBLOBHdr)]; struct tagBLOBHdr *blob; @@ -266,42 +219,55 @@ rpc_srv_dispatchVars(void *arg) s = c->cli_parent; do { - // check for disable service at this moment? - if (s->srv_blob.state == disable) { - ret = 0; - break; + /* 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 || s->srv_blob.state == disable) { // receive EOF or disable service + /* receive EOF, disable or kill service */ + if (!ret || s->srv_blob.state == kill || s->srv_kill == kill) { ret = 0; break; } if (ret < sizeof(struct tagBLOBHdr)) { - rpc_SetErr(EMSGSIZE, "Error:: too short BLOB packet ...\n"); + rpc_SetErr(ERPCMISMATCH, "Error:: too short BLOB packet ...\n"); ret = -4; - break; + if (s->srv_kill != kill && s->srv_blob.state != kill) + continue; + else + break; } else blob = (struct tagBLOBHdr*) buf; - // check BLOB packet session info + /* 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; goto makeReply; } - // Go to proceed packet ... + /* Go to proceed packet ... */ switch (blob->hdr_cmd) { case get: if (!(b = rpc_srv_getBLOB(s, blob->hdr_var))) { @@ -320,7 +286,7 @@ rpc_srv_dispatchVars(void *arg) break; case set: if ((b = rpc_srv_registerBLOB(s, blob->hdr_len))) { - // set new BLOB variable for reply :) + /* set new BLOB variable for reply :) */ blob->hdr_var = b->blob_var; ret = rpc_srv_recvBLOB(c, b); @@ -334,38 +300,43 @@ rpc_srv_dispatchVars(void *arg) ret = -7; break; default: - rpc_SetErr(EINVAL, "Error:: unsupported BLOB command (%d)...\n", + rpc_SetErr(EPROCUNAVAIL, "Error:: unsupported BLOB command (%d)...\n", blob->hdr_cmd); ret = -7; } makeReply: - // Replay to client! + /* Replay to client! */ blob->hdr_cmd = ret < 0 ? error : ok; blob->hdr_ret = ret; - if ((ret = send(c->cli_sock, buf, sizeof buf, 0)) == -1) { + ret = send(c->cli_sock, buf, sizeof buf, 0); + if (ret == -1) { LOGERR; ret = -8; break; } if (ret != sizeof buf) { - rpc_SetErr(ECANCELED, "Error:: in send BLOB reply, should be send %d bytes, " + rpc_SetErr(EPROCUNAVAIL, "Error:: in send BLOB reply, should be send %d bytes, " "really is %d\n", sizeof buf, ret); ret = -9; - break; + if (s->srv_kill != kill && s->srv_blob.state != kill) + continue; + else + 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*) (long)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 @@ -374,8 +345,7 @@ 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; + io_sockaddr_t sa; if (!srv) { rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init BLOB server ...\n"); @@ -385,8 +355,6 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s rpc_SetErr(EPERM, "Warning:: Already started BLOB server!\n"); return 0; } - if (!Port) - Port = RPC_DEFPORT + 1; memset(&srv->srv_blob, 0, sizeof srv->srv_blob); if (access(diskDir, R_OK | W_OK) == -1) { @@ -397,17 +365,25 @@ 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 (sa.sa.sa_family) { + case AF_INET: + sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1); + break; + case AF_INET6: + sa.sin6.sin6_port = htons(Port ? Port : ntohs(sa.sin6.sin6_port) + 1); + break; + case AF_LOCAL: + strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path); + break; + default: + return -1; } + memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa); - srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa_family, SOCK_STREAM, 0); + /* create BLOB server socket */ + srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0); if (srv->srv_blob.server.cli_sock == -1) { LOGERR; return -1; @@ -417,13 +393,25 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s close(srv->srv_blob.server.cli_sock); return -1; } - if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa, - sizeof srv->srv_blob.server.cli_sa) == -1) { + n = srv->srv_netbuf; + if (setsockopt(srv->srv_blob.server.cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) { LOGERR; close(srv->srv_blob.server.cli_sock); return -1; } + if (setsockopt(srv->srv_blob.server.cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) { + LOGERR; + close(srv->srv_blob.server.cli_sock); + return -1; + } + if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa, + srv->srv_blob.server.cli_sa.sa.sa_len) == -1) { + LOGERR; + close(srv->srv_blob.server.cli_sock); + 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; @@ -434,14 +422,12 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s pthread_mutex_init(&srv->srv_blob.mtx, NULL); - pthread_mutex_lock(&srv->srv_mtx); 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); + rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 1); + rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 1); + rpc_srv_registerCall(srv, NULL, CALL_BLOBSTATE, 0); - srv->srv_blob.state = enable; // enable BLOB + srv->srv_blob.state = enable; /* enable BLOB */ return 0; } @@ -461,24 +447,26 @@ 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) + if (c->cli_sa.sa.sa_family) shutdown(c->cli_sock, SHUT_RDWR); close(srv->srv_blob.server.cli_sock); + pthread_mutex_lock(&srv->srv_blob.mtx); if (srv->srv_blob.clients) { free(srv->srv_blob.clients); srv->srv_blob.clients = NULL; } - pthread_mutex_lock(&srv->srv_blob.mtx); + /* detach blobs */ while ((f = srv->srv_blob.blobs)) { srv->srv_blob.blobs = f->blob_next; rpc_srv_blobFree(srv, f); @@ -491,21 +479,21 @@ 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); + socklen_t salen = sizeof(io_sockaddr_t); register int i; rpc_cli_t *c; fd_set fds; int ret; struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; - if (!srv || srv->srv_blob.state == disable) { + if (!srv || srv->srv_blob.state == kill) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start BLOB server ...\n"); return -1; } @@ -515,12 +503,16 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) return -1; } - while (!blob_Kill && !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) + if (!c->cli_sa.sa.sa_family) break; if (i >= srv->srv_numcli) { +#ifdef HAVE_PTHREAD_YIELD + pthread_yield(); +#else usleep(1000000); +#endif continue; } @@ -535,7 +527,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) if (!ret) continue; - c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa, &salen); + c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen); if (c->cli_sock == -1) { LOGERR; continue; @@ -545,10 +537,11 @@ 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; + srv->srv_blob.state = kill; return 0; } @@ -559,51 +552,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 + * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet) + * @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 netBuf, 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; + io_sockaddr_t 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 (!netBuf) + netBuf = BUFSIZ; + 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.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); + sa.sin.sin_len = sizeof(struct sockaddr_in); + sa.sin.sin_port = htons(Port); if (csHost) - memcpy(&sin.sin_addr, host->h_addr, host->h_length); + memcpy(&sa.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); + sa.sin6.sin6_len = sizeof(struct sockaddr_in6); + sa.sin6.sin6_port = htons(Port); if (csHost) - memcpy(&sin6.sin6_addr, host->h_addr, host->h_length); + memcpy(&sa.sin6.sin6_addr, host->h_addr, host->h_length); break; + case AF_LOCAL: + sa.sun.sun_len = sizeof(struct sockaddr_un); + if (csHost) + strlcpy(sa.sun.sun_path, csHost, sizeof sa.sun.sun_path); + unlink(sa.sun.sun_path); + break; default: rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n"); return NULL; @@ -616,6 +616,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i } else memset(srv, 0, sizeof(rpc_srv_t)); + srv->srv_netbuf = netBuf; srv->srv_numcli = concurentClients; srv->srv_session.sess_version = RPC_VERSION; srv->srv_session.sess_program = regProgID; @@ -623,10 +624,9 @@ 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); + memcpy(&srv->srv_server.cli_sa, &sa, sizeof sa); + + /* create server socket */ srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0); if (srv->srv_server.cli_sock == -1) { LOGERR; @@ -639,13 +639,28 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i free(srv); return NULL; } - if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa, sizeof srv->srv_server.cli_sa) == -1) { + n = srv->srv_netbuf; + if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) { LOGERR; close(srv->srv_server.cli_sock); free(srv); return NULL; } + if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_RCVBUF, &n, sizeof n) == -1) { + LOGERR; + close(srv->srv_server.cli_sock); + free(srv); + return NULL; + } + if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa.sa, + srv->srv_server.cli_sa.sa.sa_len) == -1) { + LOGERR; + close(srv->srv_server.cli_sock); + free(srv); + return NULL; + } + /* allocate pool for concurent clients */ srv->srv_clients = calloc(srv->srv_numcli, sizeof(rpc_cli_t)); if (!srv->srv_clients) { LOGERR; @@ -658,67 +673,70 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i 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); + rpc_srv_registerCall(srv, NULL, CALL_SRVCLIENTS, 1); + rpc_srv_registerCall(srv, NULL, CALL_SRVSESSIONS, 4); + rpc_srv_registerCall(srv, NULL, CALL_SRVCALLS, 1); return srv; } /* * 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); - for (i = 0, c = srv->srv_clients; i < srv->srv_numcli && c; i++, c++) - if (c->cli_sa.sa_family) { + /* close all clients connections & server socket */ + for (i = 0, c = (*psrv)->srv_clients; i < (*psrv)->srv_numcli && c; i++, c++) + if (c->cli_sa.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; } - pthread_mutex_lock(&srv->srv_mtx); - while ((f = srv->srv_funcs)) { - srv->srv_funcs = f->func_next; + /* detach exported calls */ + pthread_mutex_lock(&(*psrv)->srv_mtx); + while ((f = (*psrv)->srv_funcs)) { + (*psrv)->srv_funcs = f->func_next; + io_freeVars(&f->func_vars); 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; } /* - * 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); + socklen_t salen = sizeof(io_sockaddr_t); register int i; rpc_cli_t *c; fd_set fds; @@ -730,17 +748,24 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) 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; 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) + if (!c->cli_sa.sa.sa_family) break; if (i >= srv->srv_numcli) { +#ifdef HAVE_PTHREAD_YIELD + pthread_yield(); +#else usleep(1000000); +#endif continue; } @@ -755,7 +780,7 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) if (!ret) continue; - c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa, &salen); + c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen); if (c->cli_sock == -1) { LOGERR; continue; @@ -765,7 +790,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; @@ -777,12 +803,12 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) * rpc_srv_execCall() Execute registered call from RPC server * @call = Register RPC call * @rpc = IN RPC call structure - * @args = IN RPC call array of rpc values + * @args = IN RPC calling arguments from RPC client * return: -1 error, !=-1 ok */ int rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, - rpc_val_t * __restrict args) + array_t * __restrict args) { void *dl; rpc_callback_t func; @@ -801,7 +827,7 @@ rpc_srv_execCall(rpc_func_t * __restrict call, struct func = dlsym(dl, (char*) call->func_name); if (func) - ret = func(call, rpc->call_argc, args); + ret = func(call, ntohs(rpc->call_argc), args); else { rpc_SetErr(ENOEXEC, "Error:: Can`t find function %s!\n", dlerror()); ret = -1;