--- libaitrpc/src/srv.c 2014/12/17 01:31:21 1.23.6.4 +++ libaitrpc/src/srv.c 2015/01/15 01:41:53 1.23.6.8 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.23.6.4 2014/12/17 01:31:21 misho Exp $ +* $Id: srv.c,v 1.23.6.8 2015/01/15 01:41:53 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -587,7 +587,7 @@ rxUDPPacket(sched_task_t *task) rpc_SetErr(ETIMEDOUT, "Timeout reached! Client not respond"); schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], c, 0, NULL, 0); - return NULL; + goto end; } salen = sa.ss.ss_len = sizeof(sockaddr_t); rlen = recvfrom(TASK_FD(task), buf, len, 0, &sa.sa, &salen); @@ -595,7 +595,7 @@ rxUDPPacket(sched_task_t *task) /* close connection */ schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], c, 0, NULL, 0); - return NULL; + goto end; } if (e_addrcmp(&c->cli_sa, &sa, 42)) rlen ^= rlen; /* skip if arrive from different address */ @@ -607,7 +607,10 @@ rxUDPPacket(sched_task_t *task) rpc->call_crc ^= rpc->call_crc; if (crc != crcFletcher16((u_short*) rpc, len / 2)) { rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet"); - return NULL; + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], + c, 0, NULL, 0); + goto end; } noreply = RPC_CHK_NOREPLY(rpc); @@ -642,9 +645,10 @@ txBPFPacket(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; + struct ether_header *eh; + ait_val_t b = AIT_VAL_INIT; schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, TASK_ARG(task), NULL); schedTimer(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], @@ -659,9 +663,9 @@ txBPFPacket(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; @@ -670,7 +674,7 @@ txBPFPacket(sched_task_t *task) ret = ait_vars2buffer(buf + wlen, AIT_LEN(&c->cli_buf) - wlen, RPC_RETVARS(c)); /* Free return values */ - ait_freeVars(&c->cli_vars); + ait_freeVars(&RPC_RETVARS(c)); if (ret == -1) { rpc_SetErr(EBADRPC, "Prepare RPC packet failed"); rpc->call_argc ^= rpc->call_argc; @@ -688,27 +692,19 @@ txBPFPacket(sched_task_t *task) rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); /* 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; - } + AIT_SET_BUF(&b, NULL, MIN(wlen, s->srv_netbuf) + ETHER_HDR_LEN); + eh = (struct ether_header*) AIT_GET_BUF(&b); + memcpy(eh->ether_dhost, LLADDR(&c->cli_sa.sdl), ETHER_ADDR_LEN); + eh->ether_type = htons(RPC_DEFPORT); + memcpy(eh + 1, buf, MIN(wlen, s->srv_netbuf)); + + ret = write(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b)); + AIT_FREE_VAL(&b); + 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; @@ -719,29 +715,33 @@ rxBPFPacket(sched_task_t *task) { rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; - int len, rlen, noreply, estlen; + int len, rlen, noreply; u_short crc; - u_char *buf; struct tagRPCCall *rpc; sockaddr_t sa; - socklen_t salen; struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - struct pollfd pfd; struct bpf_hdr *h; struct ether_header *eh; ait_val_t b = AIT_VAL_INIT; /* receive connect packet */ - salen = sa.ss.ss_len = sizeof(sockaddr_t); AIT_SET_BUF(&b, NULL, srv->srv_netbuf); rlen = read(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b)); - if (rlen < sizeof(struct bpf_hdr) + ETHER_HDR_LEN + sizeof(struct tagRPCCall)) { + h = (struct bpf_hdr*) AIT_GET_BUF(&b); + rlen -= h->bh_hdrlen; + if (rlen < h->bh_datalen || h->bh_caplen != h->bh_datalen || + rlen < ETHER_HDR_LEN + sizeof(struct tagRPCCall)) { rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); goto end; } else { - h = (struct bpf_hdr*) AIT_GET_BUF(&b); + rlen = h->bh_caplen; eh = (struct ether_header*) (AIT_GET_BUF(&b) + h->bh_hdrlen); - buf = (u_char*) (eh + 1); + rlen -= ETHER_HDR_LEN; + rpc = (struct tagRPCCall*) (eh + 1); + if (eh->ether_type != ntohs(RPC_DEFPORT)) + goto end; + else + e_getlinkbymac((const ether_addr_t*) eh->ether_shost, &sa); } c = _allocClient(srv, &sa); @@ -750,12 +750,11 @@ rxBPFPacket(sched_task_t *task) 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); - buf = AIT_GET_BUF(&c->cli_buf); - len = estlen; c->cli_sock = TASK_FD(task); memcpy(&c->cli_sa, &sa, sizeof c->cli_sa); @@ -766,40 +765,15 @@ rxBPFPacket(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); - return NULL; - } - salen = sa.ss.ss_len = sizeof(sockaddr_t); - rlen = recvfrom(TASK_FD(task), buf, len, 0, &sa.sa, &salen); - if (rlen == -1) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], - c, 0, NULL, 0); - return NULL; - } - if (e_addrcmp(&c->cli_sa, &sa, 42)) - rlen ^= rlen; /* skip if arrive from different address */ - } - len = estlen; - /* 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"); - return NULL; + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], + c, 0, NULL, 0); + goto end; } noreply = RPC_CHK_NOREPLY(rpc); @@ -818,7 +792,7 @@ rxBPFPacket(sched_task_t *task) /* send RPC reply */ if (!noreply) - schedWrite(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], + schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], c, TASK_FD(task), rpc, len); end: AIT_FREE_VAL(&b);