--- libaitrpc/src/srv.c 2015/01/18 01:03:50 1.24.2.6 +++ libaitrpc/src/srv.c 2015/06/25 22:39:05 1.26.2.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.24.2.6 2015/01/18 01:03:50 misho Exp $ +* $Id: srv.c,v 1.26.2.5 2015/06/25 22:39:05 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -58,6 +58,8 @@ static void *rxUDPPacket(sched_task_t *); static void *txUDPPacket(sched_task_t *); /* SOCK_RAW */ +static void *rxRAWPacket(sched_task_t *); +static void *txRAWPacket(sched_task_t *); /* SOCK_BPF */ static void *rxBPFPacket(sched_task_t *); @@ -71,7 +73,7 @@ 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 */ + { rxRAWPacket, freeClient, rxRAWPacket, txRAWPacket }, /* SOCK_RAW */ { rxBPFPacket, freeClient, rxBPFPacket, txBPFPacket }, /* SOCK_BPF */ { rxEXTPacket, freeClient, rxEXTPacket, txEXTPacket } /* SOCK_EXT */ }; @@ -206,12 +208,10 @@ 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)); - /* Free return values */ - ait_freeVars(&c->cli_vars); if (ret == -1) { rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); @@ -223,7 +223,11 @@ txPacket(sched_task_t *task) } } + /* Free return values */ + ait_freeVars(&c->cli_vars); + rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; #if 0 /* calculate CRC */ @@ -267,7 +271,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,6 +304,7 @@ execCall(sched_task_t *task) rpc->call_rep.eno = RPC_ERROR(rpc_Errno); } rpc->call_argc ^= rpc->call_argc; + ait_freeVars(&c->cli_vars); } else { rpc->call_rep.eno ^= rpc->call_rep.eno; if (argc) { @@ -308,7 +313,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)); } } } @@ -378,6 +383,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); @@ -488,12 +499,10 @@ 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)); - /* Free return values */ - ait_freeVars(&c->cli_vars); if (ret == -1) { rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); rpc->call_argc ^= rpc->call_argc; @@ -504,7 +513,11 @@ txUDPPacket(sched_task_t *task) } } + /* Free return values */ + ait_freeVars(&c->cli_vars); + rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; /* calculate CRC */ rpc->call_crc ^= rpc->call_crc; @@ -610,6 +623,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; @@ -646,6 +663,178 @@ end: static void * +txRAWPacket(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, estlen, 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 */ + estlen = ait_resideVars(RPC_RETVARS(c)) + wlen; + if (estlen > AIT_LEN(&c->cli_buf)) + AIT_RE_BUF(&c->cli_buf, estlen); + 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)); + 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; + } + } + + /* Free return values */ + ait_freeVars(&c->cli_vars); + + rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; + + /* calculate CRC */ + rpc->call_crc ^= rpc->call_crc; + rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); + + /* send reply */ + ret = sendto(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL, + &c->cli_sa.sa, c->cli_sa.sa.sa_len); + 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 * +rxRAWPacket(sched_task_t *task) +{ + rpc_srv_t *srv = TASK_ARG(task); + rpc_cli_t *c = NULL; + int len, rlen, noreply; + u_short crc; + struct tagRPCCall *rpc; + sockaddr_t sa; + socklen_t salen; + struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; + ait_val_t b = AIT_VAL_INIT; + + /* receive connect packet */ + AIT_SET_BUF(&b, NULL, srv->srv_netbuf); + salen = sa.ss.ss_len = sizeof(sockaddr_t); + rlen = recvfrom(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b), 0, &sa.sa, &salen); + if (sa.sa.sa_family == AF_INET) { + struct ip *h; + h = (struct ip*) AIT_GET_BUF(&b); + if (rlen < ntohs(h->ip_len) || h->ip_p != IPPROTO_ERPC) + goto end; + else { + rlen -= sizeof(struct ip); + rpc = (struct tagRPCCall*) + (AIT_GET_BUF(&b) + sizeof(struct ip)); + } + } else { + struct ip6_hdr *h; + h = (struct ip6_hdr*) AIT_GET_BUF(&b); + if (rlen < (ntohs(h->ip6_plen) + sizeof(struct ip6_hdr)) || + h->ip6_nxt != IPPROTO_ERPC) + goto end; + else { + rlen -= sizeof(struct ip6_hdr); + rpc = (struct tagRPCCall*) + (AIT_GET_BUF(&b) + sizeof(struct ip6_hdr)); + } + } + if (rlen < sizeof(struct tagRPCCall)) { + rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); + goto end; + } + + /* 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, len); + rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); + + c->cli_sock = TASK_FD(task); + memcpy(&c->cli_sa, &sa, sizeof c->cli_sa); + + /* 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); + } + + /* check integrity of packet */ + crc = ntohs(rpc->call_crc); + rpc->call_crc ^= rpc->call_crc; + if (crc != crcFletcher16((u_short*) rpc, len / 2)) { + rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], + c, 0, NULL, 0); + goto end; + } + + 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; +} + + +static void * txBPFPacket(sched_task_t *task) { rpc_cli_t *c = TASK_ARG(task); @@ -677,12 +866,10 @@ 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)); - /* Free return values */ - ait_freeVars(&RPC_RETVARS(c)); if (ret == -1) { rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); rpc->call_argc ^= rpc->call_argc; @@ -693,7 +880,11 @@ txBPFPacket(sched_task_t *task) } } + /* Free return values */ + ait_freeVars(&RPC_RETVARS(c)); + rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; /* calculate CRC */ rpc->call_crc ^= rpc->call_crc; @@ -746,6 +937,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 @@ -761,7 +959,7 @@ rxBPFPacket(sched_task_t *task) 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)); + memcpy(AIT_GET_BUF(&c->cli_buf), rpc, len); rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); c->cli_sock = TASK_FD(task); @@ -817,9 +1015,8 @@ txEXTPacket(sched_task_t *task) rpc_func_t *f = NULL; u_char *buf = AIT_GET_BUF(&c->cli_buf); struct tagRPCCall *rpc = (struct tagRPCCall*) buf; - int ret, estlen, wlen = sizeof(struct tagRPCCall); + int ret, len, wlen = sizeof(struct tagRPCCall); struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - struct pollfd pfd; schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], @@ -834,18 +1031,16 @@ txEXTPacket(sched_task_t *task) rpc->call_rep.eno = RPC_ERROR(rpc_Errno); } else { /* calc estimated length */ - estlen = ait_resideVars(RPC_RETVARS(c)) + wlen; - if (estlen > AIT_LEN(&c->cli_buf)) - AIT_RE_BUF(&c->cli_buf, estlen); + 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 = 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)); - /* Free return values */ - ait_freeVars(&c->cli_vars); if (ret == -1) { rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); rpc->call_argc ^= rpc->call_argc; @@ -856,30 +1051,19 @@ txEXTPacket(sched_task_t *task) } } + /* Free return values */ + ait_freeVars(&RPC_RETVARS(c)); + rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; /* send reply */ - pfd.fd = TASK_FD(task); - pfd.events = POLLOUT; - for (; wlen > 0; wlen -= ret, buf += ret) { - if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || - pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { - if (ret) - LOGERR; - else - rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); - return NULL; - } - 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; - } + 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; @@ -890,32 +1074,38 @@ rxEXTPacket(sched_task_t *task) { rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; - int len, rlen, noreply, estlen; - u_char *buf, b[sizeof(struct tagRPCCall)]; - struct tagRPCCall *rpc = (struct tagRPCCall*) b; + int len, rlen, noreply; + struct tagRPCCall *rpc; struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - struct pollfd pfd; + ait_val_t b = AIT_VAL_INIT; + sockaddr_t sa; + memset(&sa, 0, sizeof sa); /* receive connect packet */ - rlen = read(TASK_FD(task), b, sizeof b); + 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, (sockaddr_t*) -1); + 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 { - estlen = ntohl(rpc->call_len); - if (estlen > AIT_LEN(&c->cli_buf)) - AIT_RE_BUF(&c->cli_buf, estlen); + 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); - memcpy(rpc, b, sizeof b); - buf = (u_char*) (rpc + 1); - len = estlen; c->cli_sock = TASK_FD(task); @@ -925,31 +1115,6 @@ rxEXTPacket(sched_task_t *task) c, ts, c, 0); } - /* get next part of packet */ - memset(buf, 0, len); - pfd.fd = TASK_FD(task); - pfd.events = POLLIN | POLLPRI; - for (; len > 0; len -= rlen, buf += rlen) { - if ((rlen = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || - pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { - if (rlen) - LOGERR; - else - rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); - schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], - c, 0, NULL, 0); - goto end; - } - rlen = read(TASK_FD(task), buf, len); - if (rlen == -1) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], - c, 0, NULL, 0); - goto end; - } - } - len = estlen; - noreply = RPC_CHK_NOREPLY(rpc); /* check RPC packet session info */ @@ -969,6 +1134,7 @@ rxEXTPacket(sched_task_t *task) 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; } @@ -1318,6 +1484,9 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) srv->srv_blob.kill = 1; schedEnd(&srv->srv_blob.root); + + if (srv->srv_blob.server.cli_sa.sa.sa_family == AF_LOCAL) + unlink(srv->srv_blob.server.cli_sa.sun.sun_path); } /* @@ -1419,10 +1588,10 @@ rpc_srv_initServer(u_char InstID, int concurentClients rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server"); return NULL; } + if (!Port && proto < SOCK_RAW) + Port = RPC_DEFPORT; if (!e_gethostbyname(csHost, Port, &sa)) return NULL; - if (!Port) - Port = RPC_DEFPORT; if (!proto) proto = SOCK_STREAM; if (netBuf < RPC_MIN_BUFSIZ) @@ -1478,7 +1647,8 @@ rpc_srv_initServer(u_char InstID, int concurentClients } /* create server socket */ - srv->srv_server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, srv->srv_proto, 0); + srv->srv_server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, + srv->srv_proto, srv->srv_proto == SOCK_RAW ? IPPROTO_ERPC : 0); if (srv->srv_server.cli_sock == -1) { LOGERR; array_Destroy(&srv->srv_clients); @@ -1539,6 +1709,9 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv) sleep(RPC_SCHED_POLLING); schedEnd(&(*psrv)->srv_root); + + if ((*psrv)->srv_server.cli_sa.sa.sa_family == AF_LOCAL) + unlink((*psrv)->srv_server.cli_sa.sun.sun_path); pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx); e_free(*psrv);