--- libaitrpc/src/srv.c 2011/09/01 14:28:41 1.4.2.6 +++ libaitrpc/src/srv.c 2011/10/31 14:45:26 1.5.2.6 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.4.2.6 2011/09/01 14:28:41 misho Exp $ +* $Id: srv.c,v 1.5.2.6 2011/10/31 14:45:26 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -60,6 +60,8 @@ rpc_srv_dispatchCall(void *arg) u_char *buf; int ret, argc = 0, Limit = 0; register int i; + uint16_t tag = 0; + uint32_t hash = 0; if (!arg) { rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t procced RPC client ...\n"); @@ -97,33 +99,38 @@ 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"); + if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) { + rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n"); ret = -5; goto makeReply; } else Limit = sizeof(struct tagRPCCall); + tag = rpc->call_tag; + hash = rpc->call_hash; + /* RPC is OK! Go decapsulate variables ... */ - if (rpc->call_argc) { - arr = io_buffer2vals(buf + Limit, s->srv_netbuf - Limit, rpc->call_argc, 1); + if (ntohs(rpc->call_argc)) { + arr = io_buffer2vals(buf + Limit, s->srv_netbuf - Limit, + ntohs(rpc->call_argc), 1); if (!arr) { ret = -5; goto makeReply; } - } + } else + arr = NULL; /* execute call */ argc = 0; 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"); + if (!(f = rpc_srv_getCall(s, ntohs(tag), ntohl(hash)))) { + rpc_SetErr(EPROGUNAVAIL, "Error:: call not found into RPC server ...\n"); ret = -6; } else if ((ret = rpc_srv_execCall(f, rpc, arr)) == -1) @@ -145,11 +152,11 @@ makeReply: Limit = sizeof(struct tagRPCRet); memcpy(&rrpc->ret_session, &ses, sizeof(rpc_sess_t)); - rrpc->ret_tag = rpc->call_tag; - rrpc->ret_hash = rpc->call_hash; - rrpc->ret_errno = rpc_Errno; - rrpc->ret_retcode = ret; - rrpc->ret_argc = argc; + rrpc->ret_tag = tag; + rrpc->ret_hash = hash; + rrpc->ret_errno = htonl(rpc_Errno); + rrpc->ret_retcode = htonl(ret); + rrpc->ret_argc = htons(argc); if (argc && arr) { /* Go Encapsulate variables ... */ @@ -157,7 +164,7 @@ makeReply: 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 += i; @@ -173,7 +180,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; @@ -240,7 +247,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 @@ -284,7 +291,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; } @@ -300,7 +307,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; @@ -310,7 +317,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); } // ------------------------------------------------- @@ -326,10 +333,7 @@ int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir) { int n = 1; - 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; + io_sockaddr_t sa; if (!srv) { rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init BLOB server ...\n"); @@ -353,25 +357,25 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s srv->srv_blob.server.cli_parent = srv; memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa); - switch (srv->srv_server.cli_sa.sa_family) { + switch (srv->srv_server.cli_sa.sa.sa_family) { case AF_INET: - sin->sin_port = htons(Port); - memcpy(&srv->srv_blob.server.cli_sa, sin, sizeof(struct sockaddr)); + sa.sin.sin_port = htons(Port); + memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa); break; case AF_INET6: - sin6->sin6_port = htons(Port); - memcpy(&srv->srv_blob.server.cli_sa, sin6, sizeof(struct sockaddr)); + sa.sin6.sin6_port = htons(Port); + memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa); break; case AF_LOCAL: - strlcat(sun->sun_path, ".blob", sizeof sun->sun_path); - memcpy(&srv->srv_blob.server.cli_sa, sun, sizeof(struct sockaddr)); + strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path); + memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa); 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); + srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0); if (srv->srv_blob.server.cli_sock == -1) { LOGERR; return -1; @@ -392,7 +396,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s close(srv->srv_blob.server.cli_sock); return -1; } - if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa, + if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa, sizeof srv->srv_blob.server.cli_sa) == -1) { LOGERR; close(srv->srv_blob.server.cli_sock); @@ -444,17 +448,17 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) /* 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) + if (c->cli_sa.sa.sa_family) shutdown(c->cli_sock, SHUT_RDWR); close(srv->srv_blob.server.cli_sock); + pthread_mutex_lock(&srv->srv_blob.mtx); if (srv->srv_blob.clients) { free(srv->srv_blob.clients); 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; rpc_srv_blobFree(srv, f); @@ -467,14 +471,14 @@ 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); + socklen_t salen = sizeof(io_sockaddr_t); register int i; rpc_cli_t *c; fd_set fds; @@ -493,12 +497,13 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) 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) + if (!c->cli_sa.sa.sa_family) break; if (i >= srv->srv_numcli) { - usleep(1000000); #ifdef HAVE_PTHREAD_YIELD pthread_yield(); +#else + usleep(1000000); #endif continue; } @@ -514,7 +519,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) if (!ret) continue; - c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa, &salen); + c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen); if (c->cli_sock == -1) { LOGERR; continue; @@ -528,7 +533,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) pthread_detach(c->cli_tid); } - srv->srv_blob.state = disable; + srv->srv_blob.state = kill; return 0; } @@ -552,10 +557,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i rpc_srv_t *srv = NULL; int n = 1; struct hostent *host = NULL; - 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; + io_sockaddr_t sa; if (!concurentClients || !regProgID || (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) { @@ -574,24 +576,25 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i } } memset(&sa, 0, sizeof sa); - sa.sa_family = family; + sa.sa.sa_family = family; switch (family) { case AF_INET: - sin->sin_len = sizeof(struct sockaddr_in); - sin->sin_port = htons(Port); + sa.sin.sin_len = sizeof(struct sockaddr_in); + sa.sin.sin_port = htons(Port); if (csHost) - memcpy(&sin->sin_addr, host->h_addr, host->h_length); + memcpy(&sa.sin.sin_addr, host->h_addr, host->h_length); break; case AF_INET6: - sin6->sin6_len = sizeof(struct sockaddr_in6); - sin6->sin6_port = htons(Port); + sa.sin6.sin6_len = sizeof(struct sockaddr_in6); + sa.sin6.sin6_port = htons(Port); if (csHost) - memcpy(&sin6->sin6_addr, host->h_addr, host->h_length); + memcpy(&sa.sin6.sin6_addr, host->h_addr, host->h_length); break; case AF_LOCAL: - sun->sun_len = sizeof(struct sockaddr_un); + sa.sun.sun_len = sizeof(struct sockaddr_un); if (csHost) - strlcpy(sun->sun_path, csHost, sizeof sun->sun_path); + strlcpy(sa.sun.sun_path, csHost, sizeof sa.sun.sun_path); + unlink(sa.sun.sun_path); break; default: rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n"); @@ -613,18 +616,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i srv->srv_server.cli_tid = pthread_self(); srv->srv_server.cli_parent = srv; - 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; - } + memcpy(&srv->srv_server.cli_sa, &sa, sizeof sa); /* create server socket */ srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0); @@ -652,7 +644,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i free(srv); return NULL; } - if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa, sizeof srv->srv_server.cli_sa) == -1) { + if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa.sa, sizeof srv->srv_server.cli_sa) == -1) { LOGERR; close(srv->srv_server.cli_sock); free(srv); @@ -680,61 +672,62 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i /* * rpc_srv_endServer() Destroy RPC server, close all opened sockets and free resources - * @srv = RPC Server instance + * @psrv = RPC Server instance * return: none */ void -rpc_srv_endServer(rpc_srv_t * __restrict srv) +rpc_srv_endServer(rpc_srv_t ** __restrict psrv) { rpc_cli_t *c; register int i; rpc_func_t *f; - if (!srv) { + if (!psrv || !*psrv) { rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n"); return; } - rpc_srv_endBLOBServer(srv); + rpc_srv_endBLOBServer(*psrv); /* 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) { + for (i = 0, c = (*psrv)->srv_clients; i < (*psrv)->srv_numcli && c; i++, c++) + if (c->cli_sa.sa.sa_family) { shutdown(c->cli_sock, SHUT_RDWR); close(c->cli_sock); } - close(srv->srv_server.cli_sock); + close((*psrv)->srv_server.cli_sock); - if (srv->srv_clients) { - free(srv->srv_clients); - srv->srv_clients = NULL; - srv->srv_numcli = 0; + if ((*psrv)->srv_clients) { + free((*psrv)->srv_clients); + (*psrv)->srv_clients = NULL; + (*psrv)->srv_numcli = 0; } /* detach exported calls */ - pthread_mutex_lock(&srv->srv_mtx); - while ((f = srv->srv_funcs)) { - srv->srv_funcs = f->func_next; + pthread_mutex_lock(&(*psrv)->srv_mtx); + while ((f = (*psrv)->srv_funcs)) { + (*psrv)->srv_funcs = f->func_next; + rpc_srv_destroyVars(f); free(f); } - pthread_mutex_unlock(&srv->srv_mtx); + pthread_mutex_unlock(&(*psrv)->srv_mtx); - while (pthread_mutex_trylock(&srv->srv_mtx) == EBUSY); - pthread_mutex_destroy(&srv->srv_mtx); + while (pthread_mutex_trylock(&(*psrv)->srv_mtx) == EBUSY); + pthread_mutex_destroy(&(*psrv)->srv_mtx); - free(srv); - srv = NULL; + free(*psrv); + *psrv = NULL; } /* - * 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); + socklen_t salen = sizeof(io_sockaddr_t); register int i; rpc_cli_t *c; fd_set fds; @@ -746,6 +739,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; @@ -753,12 +749,13 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) 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) + if (!c->cli_sa.sa.sa_family) break; if (i >= srv->srv_numcli) { - usleep(1000000); #ifdef HAVE_PTHREAD_YIELD pthread_yield(); +#else + usleep(1000000); #endif continue; } @@ -774,7 +771,7 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv) if (!ret) continue; - c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa, &salen); + c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen); if (c->cli_sock == -1) { LOGERR; continue; @@ -821,7 +818,7 @@ rpc_srv_execCall(rpc_func_t * __restrict call, struct func = dlsym(dl, (char*) call->func_name); if (func) - ret = func(call, rpc->call_argc, args); + ret = func(call, ntohs(rpc->call_argc), args); else { rpc_SetErr(ENOEXEC, "Error:: Can`t find function %s!\n", dlerror()); ret = -1;