--- libaitrpc/src/srv.c 2011/08/18 15:08:03 1.3 +++ libaitrpc/src/srv.c 2011/08/19 14:24:54 1.3.2.10 @@ -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.3.2.10 2011/08/19 14:24:54 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -73,10 +73,16 @@ rpc_srv_dispatchCall(void *arg) 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, sizeof buf); + ret = recv(c->cli_sock, buf, sizeof buf, 0); + if (ret == -1) { LOGERR; ret = -3; break; @@ -102,7 +108,7 @@ rpc_srv_dispatchCall(void *arg) if (rpc->call_argc) { v = (rpc_val_t*) (buf + Limit); // check RPC packet length - if (rpc->call_argc * sizeof(rpc_val_t) > BUFSIZ - Limit) { + if (rpc->call_argc * sizeof(rpc_val_t) > sizeof buf - Limit) { rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n"); ret = -5; goto makeReply; @@ -113,7 +119,7 @@ rpc_srv_dispatchCall(void *arg) for (i = 0; i < rpc->call_argc; i++) { switch (v[i].val_type) { case buffer: - if (v[i].val_len > BUFSIZ - Limit) { + if (v[i].val_len > sizeof buf - Limit) { rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n"); ret = -5; goto makeReply; @@ -124,7 +130,7 @@ rpc_srv_dispatchCall(void *arg) data += v[i].val_len; break; case string: - if (v[i].val_len > BUFSIZ - Limit) { + if (v[i].val_len > sizeof buf - Limit) { rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n"); ret = -5; goto makeReply; @@ -140,6 +146,11 @@ rpc_srv_dispatchCall(void *arg) ret = -5; goto makeReply; } + if (s->srv_blob.state == kill) { + rpc_SetErr(ENOTSUP, "Error:: BLOB server is killed\n"); + ret = -5; + goto makeReply; + } default: break; } @@ -156,9 +167,9 @@ rpc_srv_dispatchCall(void *arg) 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: - memset(buf, 0, BUFSIZ); + memset(buf, 0, sizeof buf); rrpc = (struct tagRPCRet*) buf; Limit = sizeof(struct tagRPCRet); @@ -171,10 +182,10 @@ makeReply: if (argc && vals) { v = (rpc_val_t*) (buf + Limit); - if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) { + if (argc * sizeof(rpc_val_t) > sizeof buf - Limit) { for (i = 0; i < argc; i++) RPC_FREE_VAL(&vals[i]); - rpc_srv_freeValsCall(f); + rpc_srv_freeVars(f); vals = NULL; argc = 0; ret = -7; @@ -187,7 +198,7 @@ makeReply: 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; @@ -199,7 +210,7 @@ makeReply: Limit += vals[i].val_len; break; case string: - 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; @@ -217,18 +228,25 @@ makeReply: rrpc->ret_argc = 0; break; } + if (s->srv_blob.state == kill) { + rpc_SetErr(ENOTSUP, "Error:: BLOB server is killed\n"); + rrpc->ret_retcode = ret = -5; + rrpc->ret_argc = 0; + break; + } default: break; } RPC_FREE_VAL(&vals[i]); } - rpc_srv_freeValsCall(f); + 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; @@ -239,7 +257,7 @@ makeReply: ret = -9; break; } - } while (ret > -1); + } while (ret > -1 || s->srv_kill != kill); shutdown(c->cli_sock, SHUT_RDWR); close(c->cli_sock); @@ -254,7 +272,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; @@ -267,25 +285,33 @@ rpc_srv_dispatchVars(void *arg) do { // check for disable service at this moment? - if (s->srv_blob.state == disable) { - ret = 0; - break; + if (s->srv_blob.state == disable && s->srv_kill != kill) { + usleep(100000); + pthread_yield(); + 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; } @@ -343,7 +369,8 @@ makeReply: // 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; @@ -354,7 +381,7 @@ makeReply: ret = -9; break; } - } while (ret > -1); + } while (ret > -1 || s->srv_kill != kill); shutdown(c->cli_sock, SHUT_RDWR); close(c->cli_sock); @@ -366,6 +393,7 @@ makeReply: /* * 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 +402,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"); @@ -397,16 +427,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; @@ -424,6 +464,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; @@ -461,13 +502,14 @@ 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); @@ -478,6 +520,7 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) 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; @@ -505,7 +548,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) 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,7 +558,7 @@ 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) break; @@ -545,7 +588,8 @@ 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; @@ -559,8 +603,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 */ @@ -571,39 +615,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; @@ -623,10 +673,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; @@ -646,6 +706,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; @@ -683,6 +744,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); @@ -696,6 +758,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; @@ -735,7 +798,7 @@ 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; @@ -765,7 +828,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;