--- libaitrpc/src/srv.c 2011/08/19 12:51:50 1.3.2.9 +++ libaitrpc/src/srv.c 2011/08/30 09:07:55 1.4.2.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.3.2.9 2011/08/19 12:51:50 misho Exp $ +* $Id: srv.c,v 1.4.2.2 2011/08/30 09:07:55 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; + ait_val_t *vals = NULL, *v = NULL; rpc_func_t *f = NULL; struct tagRPCCall *rpc; struct tagRPCRet *rrpc; rpc_sess_t ses = { 0 }; fd_set fds; - u_char buf[BUFSIZ], *data; + u_char *buf, *data; int ret, argc = 0, Limit = 0; register int i; @@ -67,6 +67,12 @@ 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); @@ -80,14 +86,14 @@ rpc_srv_dispatchCall(void *arg) ret = -2; break; } - memset(buf, 0, BUFSIZ); - ret = recv(c->cli_sock, buf, BUFSIZ, 0); + 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; } @@ -97,48 +103,49 @@ 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"); + v = (ait_val_t*) (buf + Limit); + if (rpc->call_argc * sizeof(ait_val_t) > s->srv_netbuf - 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! - data = (u_char*) v + rpc->call_argc * sizeof(rpc_val_t); + Limit += rpc->call_argc * sizeof(ait_val_t); + + /* RPC received variables types are OK! */ + data = (u_char*) v + rpc->call_argc * sizeof(ait_val_t); for (i = 0; i < rpc->call_argc; i++) { - switch (v[i].val_type) { + switch (AIT_TYPE(&v[i])) { case buffer: - if (v[i].val_len > BUFSIZ - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n"); + if (AIT_LEN(&v[i]) > s->srv_netbuf - Limit) { + rpc_SetErr(EMSGSIZE, "Error:: too long RPC packet ...\n"); ret = -5; goto makeReply; } else - Limit += v[i].val_len; + Limit += AIT_LEN(&v[i]); v[i].val.buffer = data; - data += v[i].val_len; + data += AIT_LEN(&v[i]); break; case string: - if (v[i].val_len > BUFSIZ - Limit) { - rpc_SetErr(EMSGSIZE, "Error:: Too big RPC packet ...\n"); + if (AIT_LEN(&v[i]) > s->srv_netbuf - Limit) { + rpc_SetErr(EMSGSIZE, "Error:: too long RPC packet ...\n"); ret = -5; goto makeReply; } else - Limit += v[i].val_len; + Limit += AIT_LEN(&v[i]); v[i].val.string = (int8_t*) data; - data += v[i].val_len; + data += AIT_LEN(&v[i]); break; case blob: if (s->srv_blob.state == disable) { @@ -147,16 +154,19 @@ rpc_srv_dispatchCall(void *arg) goto makeReply; } if (s->srv_blob.state == kill) { - rpc_SetErr(ENOTSUP, "Error:: BLOB server is killed\n"); + rpc_SetErr(ENOTSUP, "Error:: BLOB server is gone.\n"); ret = -5; goto makeReply; } default: break; } + + AIT_ADDZCOPY(&v[i]); } } + /* execute call */ argc = 0; vals = NULL; memcpy(&ses, &rpc->call_session, sizeof ses); @@ -169,7 +179,8 @@ rpc_srv_dispatchCall(void *arg) else argc = rpc_srv_getVars(f, &vals); makeReply: - memset(buf, 0, BUFSIZ); + /* made reply */ + memset(buf, 0, s->srv_netbuf); rrpc = (struct tagRPCRet*) buf; Limit = sizeof(struct tagRPCRet); @@ -181,10 +192,11 @@ makeReply: rrpc->ret_argc = argc; if (argc && vals) { - v = (rpc_val_t*) (buf + Limit); - if (argc * sizeof(rpc_val_t) > BUFSIZ - Limit) { + /* Go Encapsulate variables ... */ + v = (ait_val_t*) (buf + Limit); + if (argc * sizeof(ait_val_t) > s->srv_netbuf - Limit) { for (i = 0; i < argc; i++) - RPC_FREE_VAL(&vals[i]); + AIT_FREE_VAL(&vals[i]); rpc_srv_freeVars(f); vals = NULL; argc = 0; @@ -192,13 +204,15 @@ makeReply: rpc_SetErr(EMSGSIZE, "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); + Limit += argc * sizeof(ait_val_t); + memcpy(v, vals, argc * sizeof(ait_val_t)); + + /* RPC send variables types are OK! */ + data = (u_char*) v + argc * sizeof(ait_val_t); for (ret = i = 0; i < argc; i++) { - switch (vals[i].val_type) { + switch (AIT_TYPE(&vals[i])) { case buffer: - if (ret || Limit + vals[i].val_len > BUFSIZ) { + if (ret || Limit + vals[i].val_len > s->srv_netbuf) { rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n"); rrpc->ret_retcode = ret = -7; rrpc->ret_argc = 0; @@ -206,11 +220,11 @@ makeReply: } memcpy(data, vals[i].val.buffer, vals[i].val_len); - data += vals[i].val_len; - Limit += vals[i].val_len; + data += AIT_LEN(&vals[i]); + Limit += AIT_LEN(&vals[i]); break; case string: - if (ret || Limit + vals[i].val_len > BUFSIZ) { + if (ret || Limit + vals[i].val_len > s->srv_netbuf) { rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet (-7) ...\n"); rrpc->ret_retcode = ret = -7; rrpc->ret_argc = 0; @@ -218,8 +232,8 @@ makeReply: } memcpy(data, vals[i].val.string, vals[i].val_len); - data += vals[i].val_len; - Limit += vals[i].val_len; + data += AIT_LEN(&vals[i]); + Limit += AIT_LEN(&vals[i]); break; case blob: if (s->srv_blob.state == disable) { @@ -229,7 +243,7 @@ makeReply: break; } if (s->srv_blob.state == kill) { - rpc_SetErr(ENOTSUP, "Error:: BLOB server is killed\n"); + rpc_SetErr(ENOTSUP, "Error:: BLOB server is gone.\n"); rrpc->ret_retcode = ret = -5; rrpc->ret_argc = 0; break; @@ -238,7 +252,8 @@ makeReply: break; } - RPC_FREE_VAL(&vals[i]); + /* don't add zero copy at this position, because buffer/string must be freed! */ + AIT_FREE_VAL(&vals[i]); } rpc_srv_freeVars(f); vals = NULL; @@ -262,6 +277,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; } @@ -284,10 +300,12 @@ rpc_srv_dispatchVars(void *arg) s = c->cli_parent; do { - // check for disable service at this moment? + /* 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; } @@ -321,13 +339,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))) { @@ -346,7 +364,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); @@ -366,7 +384,7 @@ rpc_srv_dispatchVars(void *arg) } makeReply: - // Replay to client! + /* Replay to client! */ blob->hdr_cmd = ret < 0 ? error : ok; blob->hdr_ret = ret; ret = send(c->cli_sock, buf, sizeof buf, 0); @@ -457,6 +475,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; @@ -482,7 +511,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s rpc_srv_registerCall(srv, NULL, CALL_BLOBSTATE, 1); pthread_mutex_unlock(&srv->srv_mtx); - srv->srv_blob.state = enable; // enable BLOB + srv->srv_blob.state = enable; /* enable BLOB */ return 0; } @@ -564,6 +593,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; } @@ -603,6 +635,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 * @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 @@ -610,7 +643,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; @@ -627,6 +660,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) { @@ -666,6 +701,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; @@ -699,6 +735,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); @@ -804,6 +853,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; } @@ -846,7 +898,7 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) */ int rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, - rpc_val_t * __restrict args) + ait_val_t * __restrict args) { void *dl; rpc_callback_t func;