--- libaitrpc/src/srv.c 2011/08/29 22:37:06 1.4 +++ libaitrpc/src/srv.c 2011/09/03 12:58:49 1.4.2.9 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.4 2011/08/29 22:37:06 misho Exp $ +* $Id: srv.c,v 1.4.2.9 2011/09/03 12:58:49 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -51,13 +51,13 @@ 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; @@ -67,8 +67,13 @@ 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); @@ -80,8 +85,8 @@ rpc_srv_dispatchCall(void *arg) ret = -2; break; } - memset(buf, 0, sizeof buf); - ret = recv(c->cli_sock, buf, sizeof buf, 0); + memset(buf, 0, s->srv_netbuf); + ret = recv(c->cli_sock, buf, s->srv_netbuf, 0); if (ret == -1) { LOGERR; ret = -3; @@ -92,86 +97,50 @@ rpc_srv_dispatchCall(void *arg) 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; } 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"); + 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) > sizeof buf - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: too long RPC packet ...\n"); + arr = io_buffer2vals(buf + Limit, s->srv_netbuf - Limit, rpc->call_argc, 1); + if (!arr) { 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 > sizeof buf - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: too long 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 > sizeof buf - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: too long RPC packet ...\n"); - ret = -5; - goto makeReply; - } else - Limit += v[i].val_len; - - 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; - } - 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); if (!(f = rpc_srv_getCall(s, rpc->call_tag, rpc->call_hash))) { - rpc_SetErr(EINVAL, "Error:: call not found into RPC server ...\n"); + 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_getVars(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: - /* made reply */ - memset(buf, 0, sizeof buf); + /* Made reply */ + memset(buf, 0, s->srv_netbuf); rrpc = (struct tagRPCRet*) buf; Limit = sizeof(struct tagRPCRet); @@ -182,69 +151,19 @@ makeReply: rrpc->ret_retcode = ret; rrpc->ret_argc = argc; - if (argc && vals) { - v = (rpc_val_t*) (buf + Limit); - if (argc * sizeof(rpc_val_t) > sizeof buf - Limit) { - for (i = 0; i < argc; i++) - RPC_FREE_VAL(&vals[i]); - rpc_srv_freeVars(f); - vals = NULL; + if (argc && arr) { + /* Go Encapsulate variables ... */ + if ((i = io_vals2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) { + rpc_srv_freeVals(f); 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 > sizeof buf) { - 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 > sizeof buf) { - 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; - } - 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_freeVals(f); } - rpc_srv_freeVars(f); - vals = NULL; - argc = 0; } ret = send(c->cli_sock, buf, Limit, 0); @@ -254,7 +173,7 @@ makeReply: 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; @@ -264,6 +183,7 @@ makeReply: shutdown(c->cli_sock, SHUT_RDWR); close(c->cli_sock); memset(c, 0, sizeof(rpc_cli_t)); + free(buf); return (void*) (long)ret; } @@ -320,7 +240,7 @@ rpc_srv_dispatchVars(void *arg) 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; } else @@ -364,7 +284,7 @@ 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; } @@ -380,7 +300,7 @@ makeReply: 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; @@ -390,7 +310,7 @@ makeReply: 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); } // ------------------------------------------------- @@ -461,6 +381,17 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s close(srv->srv_blob.server.cli_sock); return -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, sizeof srv->srv_blob.server.cli_sa) == -1) { LOGERR; @@ -479,12 +410,10 @@ 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 */ return 0; @@ -538,12 +467,12 @@ 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); register int i; @@ -568,6 +497,9 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) break; if (i >= srv->srv_numcli) { usleep(1000000); +#ifdef HAVE_PTHREAD_YIELD + pthread_yield(); +#endif continue; } @@ -607,6 +539,7 @@ 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 + * @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 @@ -614,7 +547,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) */ 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; @@ -631,6 +564,8 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i } if (!Port) Port = RPC_DEFPORT; + if (!netBuf) + netBuf = BUFSIZ; if (csHost && family != AF_LOCAL) { host = gethostbyname2(csHost, family); if (!host) { @@ -670,6 +605,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; @@ -703,6 +639,19 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i free(srv); return NULL; } + 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, sizeof srv->srv_server.cli_sa) == -1) { LOGERR; close(srv->srv_server.cli_sock); @@ -723,9 +672,9 @@ 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; } @@ -778,12 +727,12 @@ rpc_srv_endServer(rpc_srv_t * __restrict srv) } /* - * 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); register int i; @@ -797,6 +746,9 @@ 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; @@ -808,6 +760,9 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) break; if (i >= srv->srv_numcli) { usleep(1000000); +#ifdef HAVE_PTHREAD_YIELD + pthread_yield(); +#endif continue; } @@ -845,12 +800,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;