--- libaitrpc/src/srv.c 2011/08/19 06:58:31 1.3.2.4 +++ libaitrpc/src/srv.c 2011/08/19 14:39:23 1.3.2.11 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.3.2.4 2011/08/19 06:58:31 misho Exp $ +* $Id: srv.c,v 1.3.2.11 2011/08/19 14:39:23 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -73,15 +73,21 @@ 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; } - if (!ret) { // receive EOF + if (!ret) { /* receive EOF */ ret = 0; break; } @@ -91,30 +97,30 @@ 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; goto makeReply; } else Limit = sizeof(struct tagRPCCall); - // RPC is OK! Go decapsulate variables ... + /* 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"); + /* 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! + /* 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"); + if (v[i].val_len > sizeof buf - Limit) { + rpc_SetErr(EMSGSIZE, "Error:: too long RPC packet ...\n"); ret = -5; goto makeReply; } else @@ -124,8 +130,8 @@ rpc_srv_dispatchCall(void *arg) data += v[i].val_len; break; case string: - if (v[i].val_len > BUFSIZ - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n"); + if (v[i].val_len > sizeof buf - Limit) { + rpc_SetErr(EMSGSIZE, "Error:: too long RPC packet ...\n"); ret = -5; goto makeReply; } else @@ -140,12 +146,18 @@ rpc_srv_dispatchCall(void *arg) 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); @@ -156,9 +168,10 @@ 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); + /* made reply */ + memset(buf, 0, sizeof buf); rrpc = (struct tagRPCRet*) buf; Limit = sizeof(struct tagRPCRet); @@ -171,10 +184,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 +200,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 +212,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 +230,25 @@ makeReply: rrpc->ret_argc = 0; 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_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 +259,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 +274,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,26 +286,34 @@ 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); + 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; } @@ -295,13 +323,13 @@ rpc_srv_dispatchVars(void *arg) 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 +348,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); @@ -340,10 +368,11 @@ rpc_srv_dispatchVars(void *arg) } 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; @@ -354,7 +383,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 +396,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 +449,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 +504,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,20 +550,17 @@ 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; } - printf("server.cli_type=%d:%d\n", srv->srv_blob.server.cli_type, SOCK_STREAM); - 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 (!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; @@ -557,11 +580,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; @@ -572,11 +591,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; @@ -590,7 +605,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 @@ -598,7 +612,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; @@ -675,8 +689,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); @@ -782,13 +795,12 @@ 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 (!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; @@ -808,10 +820,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; @@ -821,12 +830,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;