--- libaitrpc/src/srv.c 2015/01/15 01:42:37 1.24 +++ libaitrpc/src/srv.c 2015/01/21 21:17:05 1.25 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.24 2015/01/15 01:42:37 misho Exp $ +* $Id: srv.c,v 1.25 2015/01/21 21:17:05 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2014 +Copyright 2004 - 2015 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -63,12 +63,17 @@ static void *txUDPPacket(sched_task_t *); static void *rxBPFPacket(sched_task_t *); static void *txBPFPacket(sched_task_t *); -static sched_task_func_t cbProto[SOCK_BPF + 1][4] = { +/* SOCK_EXT */ +static void *rxEXTPacket(sched_task_t *); +static void *txEXTPacket(sched_task_t *); + +static sched_task_func_t cbProto[SOCK_MAX_SUPPORT][4] = { { acceptClients, closeClient, rxPacket, txPacket }, /* SOCK_STREAM */ { acceptClients, closeClient, rxPacket, txPacket }, /* SOCK_STREAM */ { rxUDPPacket, freeClient, rxUDPPacket, txUDPPacket }, /* SOCK_DGRAM */ { NULL, NULL, NULL, NULL }, /* SOCK_RAW */ - { rxBPFPacket, freeClient, rxBPFPacket, txBPFPacket } /* SOCK_BPF */ + { rxBPFPacket, freeClient, rxBPFPacket, txBPFPacket }, /* SOCK_BPF */ + { rxEXTPacket, freeClient, rxEXTPacket, txEXTPacket } /* SOCK_EXT */ }; /* Global Signal Argument when kqueue support disabled */ @@ -116,7 +121,10 @@ _allocClient(rpc_srv_t * __restrict srv, sockaddr_t * rpc_cli_t *c = NULL; int n; - n = _check4freeslot(srv, sa); + if (srv->srv_proto != SOCK_EXT) + n = _check4freeslot(srv, sa); + else + n = 0; if (n == -1) return NULL; else @@ -198,7 +206,7 @@ txPacket(sched_task_t *task) buf = AIT_GET_BUF(&c->cli_buf); rpc = (struct tagRPCCall*) buf; - rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); + rpc->call_argc = (u_char) array_Size(RPC_RETVARS(c)); /* Go Encapsulate variables */ ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, RPC_RETVARS(c)); @@ -216,6 +224,7 @@ txPacket(sched_task_t *task) } rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; #if 0 /* calculate CRC */ @@ -259,7 +268,7 @@ execCall(sched_task_t *task) array_t *arr = NULL; u_char *buf = AIT_GET_BUF(&c->cli_buf); struct tagRPCCall *rpc = (struct tagRPCCall*) buf; - int argc = ntohs(rpc->call_argc); + int argc = rpc->call_argc; /* Go decapsulate variables ... */ if (argc) { @@ -300,7 +309,7 @@ execCall(sched_task_t *task) rpc->call_argc ^= rpc->call_argc; } else { /* reply */ - rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); + rpc->call_argc = (u_char) array_Size(RPC_RETVARS(c)); } } } @@ -370,6 +379,12 @@ rxPacket(sched_task_t *task) } len = estlen; + /* skip loop packet */ + if (rpc->call_io & RPC_ACK) { + schedReadSelf(task); + return NULL; + } + #if 0 /* check integrity of packet */ crc = ntohs(rpc->call_crc); @@ -480,7 +495,7 @@ txUDPPacket(sched_task_t *task) buf = AIT_GET_BUF(&c->cli_buf); rpc = (struct tagRPCCall*) buf; - rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); + rpc->call_argc = (u_char) array_Size(RPC_RETVARS(c)); /* Go Encapsulate variables */ ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, RPC_RETVARS(c)); @@ -497,6 +512,7 @@ txUDPPacket(sched_task_t *task) } rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; /* calculate CRC */ rpc->call_crc ^= rpc->call_crc; @@ -602,6 +618,10 @@ rxUDPPacket(sched_task_t *task) } len = estlen; + /* skip loop packet */ + if (rpc->call_io & RPC_ACK) + goto end; + /* check integrity of packet */ crc = ntohs(rpc->call_crc); rpc->call_crc ^= rpc->call_crc; @@ -669,7 +689,7 @@ txBPFPacket(sched_task_t *task) buf = AIT_GET_BUF(&c->cli_buf); rpc = (struct tagRPCCall*) buf; - rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); + rpc->call_argc = (u_char) array_Size(RPC_RETVARS(c)); /* Go Encapsulate variables */ ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, RPC_RETVARS(c)); @@ -686,6 +706,7 @@ txBPFPacket(sched_task_t *task) } rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; /* calculate CRC */ rpc->call_crc ^= rpc->call_crc; @@ -738,6 +759,13 @@ rxBPFPacket(sched_task_t *task) eh = (struct ether_header*) (AIT_GET_BUF(&b) + h->bh_hdrlen); rlen -= ETHER_HDR_LEN; rpc = (struct tagRPCCall*) (eh + 1); + +#if 0 + /* skip loop packet */ + if (rpc->call_io & RPC_ACK) + goto end; +#endif + if (eh->ether_type != ntohs(RPC_DEFPORT)) goto end; else @@ -800,6 +828,138 @@ end: return NULL; } + +static void * +txEXTPacket(sched_task_t *task) +{ + rpc_cli_t *c = TASK_ARG(task); + rpc_srv_t *s = c->cli_parent; + rpc_func_t *f = NULL; + u_char *buf = AIT_GET_BUF(&c->cli_buf); + struct tagRPCCall *rpc = (struct tagRPCCall*) buf; + int ret, len, wlen = sizeof(struct tagRPCCall); + struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; + + schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); + schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), ts, TASK_ARG(task), 0); + + if (rpc->call_argc) { + f = rpc_srv_getCall(s, ntohs(rpc->call_tag)); + if (!f) { + rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server"); + rpc->call_argc ^= rpc->call_argc; + rpc->call_rep.ret = RPC_ERROR(-1); + rpc->call_rep.eno = RPC_ERROR(rpc_Errno); + } else { + /* calc estimated length */ + len = ait_resideVars(RPC_RETVARS(c)) + wlen; + if (len > AIT_LEN(&c->cli_buf)) + AIT_RE_BUF(&c->cli_buf, len); + buf = AIT_GET_BUF(&c->cli_buf); + rpc = (struct tagRPCCall*) buf; + + rpc->call_argc = (u_char) array_Size(RPC_RETVARS(c)); + /* Go Encapsulate variables */ + ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, + RPC_RETVARS(c)); + /* Free return values */ + ait_freeVars(&RPC_RETVARS(c)); + if (ret == -1) { + rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); + rpc->call_argc ^= rpc->call_argc; + rpc->call_rep.ret = RPC_ERROR(-1); + rpc->call_rep.eno = RPC_ERROR(rpc_Errno); + } else + wlen += ret; + } + } + + rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; + + /* send reply */ + ret = write(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf)); + if (ret == -1) { + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); + return NULL; + } + + return NULL; +} + +static void * +rxEXTPacket(sched_task_t *task) +{ + rpc_srv_t *srv = TASK_ARG(task); + rpc_cli_t *c = NULL; + int len, rlen, noreply; + struct tagRPCCall *rpc; + struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; + ait_val_t b = AIT_VAL_INIT; + sockaddr_t sa; + + memset(&sa, 0, sizeof sa); + /* receive connect packet */ + AIT_SET_BUF(&b, NULL, srv->srv_netbuf); + rlen = read(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b)); + if (rlen < sizeof(struct tagRPCCall)) { + rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); + goto end; + } else { + rpc = (struct tagRPCCall*) AIT_GET_BUF(&b); + + /* skip loop packet */ + if (rpc->call_io & RPC_ACK) + goto end; + } + + c = _allocClient(srv, &sa); + if (!c) { + EVERBOSE(1, "RPC client quota exceeded! Connection will be shutdown!\n"); + usleep(2000); /* blocked client delay */ + goto end; + } else { + len = ntohl(rpc->call_len); + if (len > AIT_LEN(&c->cli_buf)) + AIT_RE_BUF(&c->cli_buf, len); + memcpy(AIT_GET_BUF(&c->cli_buf), rpc, AIT_LEN(&c->cli_buf)); + rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); + + c->cli_sock = TASK_FD(task); + + /* armed timer for close stateless connection */ + schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, c, NULL); + schedTimer(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], + c, ts, c, 0); + } + + noreply = RPC_CHK_NOREPLY(rpc); + + /* check RPC packet session info */ + if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) { + rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); + + rpc->call_argc ^= rpc->call_argc; + rpc->call_rep.ret = RPC_ERROR(-1); + rpc->call_rep.eno = RPC_ERROR(errno); + } else { + /* execute RPC call */ + schedEvent(TASK_ROOT(task), execCall, c, (int) noreply, rpc, len); + } + + /* send RPC reply */ + if (!noreply) + schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], + c, TASK_FD(task), rpc, len); +end: + AIT_FREE_VAL(&b); + schedReadSelf(task); + return NULL; +} + /* ------------------------------------------------------ */ void @@ -1242,7 +1402,7 @@ rpc_srv_initServer(u_char InstID, int concurentClients rpc_srv_t *srv = NULL; sockaddr_t sa = E_SOCKADDR_INIT; - if (!concurentClients || (proto < 0 || proto > SOCK_DGRAM)) { + if (!concurentClients || (proto < 0 || proto > SOCK_RAW)) { rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server"); return NULL; } @@ -1424,7 +1584,8 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv) } array_Destroy(&srv->srv_clients); - close(srv->srv_server.cli_sock); + if (srv->srv_proto != SOCK_EXT) + close(srv->srv_server.cli_sock); /* detach exported calls */ RPC_FUNCS_LOCK(&srv->srv_funcs); @@ -1605,4 +1766,73 @@ err: /* error condition */ pthread_mutex_destroy(&srv->srv_funcs.mtx); e_free(srv); return NULL; +} + +/* + * rpc_srv_initServerExt() - Init & create pipe RPC Server + * + * @InstID = Instance for authentication & recognition + * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) + * @fd = File descriptor + * return: NULL == error or !=NULL bind and created RPC server instance + */ +rpc_srv_t * +rpc_srv_initServerExt(u_char InstID, int netBuf, int fd) +{ + rpc_srv_t *srv = NULL; + +#ifdef HAVE_SRANDOMDEV + srandomdev(); +#else + time_t tim; + + srandom((time(&tim) ^ getpid())); +#endif + + srv = e_malloc(sizeof(rpc_srv_t)); + if (!srv) { + LOGERR; + return NULL; + } else + memset(srv, 0, sizeof(rpc_srv_t)); + + srv->srv_proto = SOCK_EXT; + srv->srv_netbuf = (netBuf < RPC_MIN_BUFSIZ) ? + getpagesize() : E_ALIGN(netBuf, 2); + srv->srv_session.sess_version = RPC_VERSION; + srv->srv_session.sess_instance = InstID; + + srv->srv_server.cli_parent = srv; + srv->srv_server.cli_sock = fd; + + /* init functions */ + pthread_mutex_init(&srv->srv_funcs.mtx, NULL); + SLIST_INIT(&srv->srv_funcs); + AVL_INIT(&srv->srv_funcs); + + /* init scheduler */ + srv->srv_root = schedBegin(); + if (!srv->srv_root) { + rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); + pthread_mutex_destroy(&srv->srv_funcs.mtx); + e_free(srv); + return NULL; + } + + /* init pool for clients */ + srv->srv_clients = array_Init(1); + if (!srv->srv_clients) { + rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); + schedEnd(&srv->srv_root); + pthread_mutex_destroy(&srv->srv_funcs.mtx); + e_free(srv); + return NULL; + } + + fcntl(srv->srv_server.cli_sock, F_SETFL, + fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK); + + rpc_register_srvPing(srv); + + return srv; }