--- libaitrpc/src/srv.c 2011/08/19 09:32:38 1.3.2.8 +++ libaitrpc/src/srv.c 2011/08/19 12:51:50 1.3.2.9 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.3.2.8 2011/08/19 09:32:38 misho Exp $ +* $Id: srv.c,v 1.3.2.9 2011/08/19 12:51:50 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 = read(c->cli_sock, buf, BUFSIZ)) == -1) { + ret = recv(c->cli_sock, buf, BUFSIZ, 0); + if (ret == -1) { LOGERR; ret = -3; break; @@ -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; } @@ -217,6 +228,12 @@ 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; } @@ -228,7 +245,8 @@ makeReply: argc = 0; } - if ((ret = write(c->cli_sock, buf, Limit)) == -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 = read(c->cli_sock, buf, sizeof buf)) == -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 = write(c->cli_sock, buf, sizeof buf)) == -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); @@ -367,13 +394,12 @@ makeReply: /* * rpc_srv_initBLOBServer() Init & create BLOB Server * @srv = RPC server instance - * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW * @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 */ int -rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, int sockType, u_short Port, const char *diskDir) +rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir) { int n = 1; struct sockaddr sa; @@ -421,9 +447,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, int } /* create BLOB server socket */ - srv->srv_blob.server.cli_type = sockType ? sockType : SOCK_STREAM; - srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa_family, - srv->srv_blob.server.cli_type, 0); + 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; return -1; @@ -478,7 +502,7 @@ 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); @@ -524,17 +548,15 @@ 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; } - if (srv->srv_blob.server.cli_type == SOCK_STREAM || - srv->srv_blob.server.cli_type == SOCK_SEQPACKET) - if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) { - LOGERR; - return -1; - } + if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) { + LOGERR; + return -1; + } 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++) @@ -556,11 +578,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) if (!ret) continue; - if (srv->srv_blob.server.cli_type == SOCK_STREAM || - srv->srv_blob.server.cli_type == SOCK_SEQPACKET) - c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa, &salen); - else - c->cli_sock = dup(srv->srv_blob.server.cli_sock); + c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa, &salen); if (c->cli_sock == -1) { LOGERR; continue; @@ -571,11 +589,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) LOGERR; continue; } else - if (srv->srv_blob.server.cli_type == SOCK_STREAM || - srv->srv_blob.server.cli_type == SOCK_SEQPACKET) - pthread_detach(c->cli_tid); - else - pthread_join(c->cli_tid, NULL); + pthread_detach(c->cli_tid); } srv->srv_blob.state = disable; @@ -589,7 +603,6 @@ 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 - * @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 @@ -597,7 +610,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) */ rpc_srv_t * rpc_srv_initServer(u_int regProgID, u_int regProcID, int concurentClients, - int sockType, u_short family, const char *csHost, u_short Port) + u_short family, const char *csHost, u_short Port) { rpc_srv_t *srv = NULL; int n = 1; @@ -674,8 +687,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i } /* create server socket */ - srv->srv_server.cli_type = sockType ? sockType : SOCK_STREAM; - srv->srv_server.cli_sock = socket(family, srv->srv_server.cli_type, 0); + srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0); if (srv->srv_server.cli_sock == -1) { LOGERR; free(srv); @@ -781,11 +793,10 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) return -1; } - if (srv->srv_server.cli_type == SOCK_STREAM || srv->srv_server.cli_type == SOCK_SEQPACKET) - if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) { - LOGERR; - return -1; - } + if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) { + LOGERR; + return -1; + } while (srv->srv_kill != kill) { for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++) @@ -807,10 +818,7 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) if (!ret) continue; - if (srv->srv_server.cli_type == SOCK_STREAM || srv->srv_server.cli_type == SOCK_SEQPACKET) - c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa, &salen); - else - c->cli_sock = dup(srv->srv_server.cli_sock); + c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa, &salen); if (c->cli_sock == -1) { LOGERR; continue; @@ -820,12 +828,8 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) if (pthread_create(&c->cli_tid, NULL, rpc_srv_dispatchCall, c)) { LOGERR; continue; - } else { - if (srv->srv_server.cli_type == SOCK_STREAM || srv->srv_server.cli_type == SOCK_SEQPACKET) - pthread_detach(c->cli_tid); - else - pthread_join(c->cli_tid, NULL); - } + } else + pthread_detach(c->cli_tid); } return 0;