--- libaitrpc/src/srv.c 2015/01/15 01:42:37 1.24 +++ libaitrpc/src/srv.c 2016/08/08 13:21:13 1.29 @@ -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.29 2016/08/08 13:21:13 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 - 2016 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -58,24 +58,30 @@ 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 *); static void *txBPFPacket(sched_task_t *); -static sched_task_func_t cbProto[SOCK_BPF + 1][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 */ +/* 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, NULL /*rxUDPPacket*/, txUDPPacket }, /* SOCK_DGRAM */ + { rxRAWPacket, freeClient, NULL /*rxRAWPacket*/, txRAWPacket }, /* SOCK_RAW */ + { rxBPFPacket, freeClient, NULL /*rxBPFPacket*/, txBPFPacket }, /* SOCK_BPF */ + { rxEXTPacket, freeClient, NULL /*rxEXTPacket*/, txEXTPacket } /* SOCK_EXT */ }; /* Global Signal Argument when kqueue support disabled */ static volatile uintptr_t _glSigArg = 0; - void rpc_freeCli(rpc_cli_t * __restrict c) { @@ -116,7 +122,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 @@ -148,7 +157,7 @@ freeClient(sched_task_t *task) { rpc_freeCli(TASK_ARG(task)); - return NULL; + taskExit(task, NULL); } static void * @@ -161,7 +170,7 @@ closeClient(sched_task_t *task) /* close client socket */ shutdown(sock, SHUT_RDWR); close(sock); - return NULL; + taskExit(task, NULL); } static void * @@ -172,8 +181,7 @@ txPacket(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); - struct pollfd pfd; + int ret, wlen = sizeof(struct tagRPCCall); #ifdef TCP_SESSION_TIMEOUT struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; @@ -188,34 +196,35 @@ txPacket(sched_task_t *task) 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_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + } else if (rpc_pktFreeSpace(c) > s->srv_netbuf) { + rpc_SetErr(EMSGSIZE, "Message too long"); - rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); + rpc->call_argc ^= rpc->call_argc; + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + } else { + 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; - rpc->call_rep.ret = RPC_ERROR(-1); - rpc->call_rep.eno = RPC_ERROR(rpc_Errno); + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); } else wlen += ret; } } + /* Free return values */ + ait_freeVars(&c->cli_vars); + rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; #if 0 /* calculate CRC */ @@ -224,30 +233,14 @@ txPacket(sched_task_t *task) #endif /* 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 = send(TASK_FD(task), buf, MIN(wlen, s->srv_netbuf), MSG_NOSIGNAL); - if (ret == -1) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); - return NULL; - } + ret = send(TASK_FD(task), buf, wlen, MSG_NOSIGNAL); + if (ret == -1) { + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); } - return NULL; + taskExit(task, NULL); } static void * @@ -259,7 +252,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) { @@ -269,9 +262,9 @@ execCall(sched_task_t *task) rpc_SetErr(ERPCMISMATCH, "#%d - %s", elwix_GetErrno(), elwix_GetError()); rpc->call_argc ^= rpc->call_argc; - rpc->call_rep.ret = RPC_ERROR(-1); - rpc->call_rep.eno = RPC_ERROR(rpc_Errno); - return NULL; + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + taskExit(task, NULL); } } else arr = NULL; @@ -280,33 +273,33 @@ execCall(sched_task_t *task) 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); + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); } else { /* if client doesn't want reply */ - argc = RPC_CHK_NOREPLY(rpc); - rpc->call_rep.ret = RPC_ERROR(rpc_srv_execCall(c, rpc, f->func_name, arr)); + RPC_SET_RETURN(rpc, rpc_srv_execCall(c, rpc, f->func_name, arr)); if (rpc->call_rep.ret == htonl(-1)) { if (!rpc->call_rep.eno) { LOGERR; - rpc->call_rep.eno = RPC_ERROR(rpc_Errno); + RPC_SET_ERRNO(rpc, rpc_Errno); } rpc->call_argc ^= rpc->call_argc; + ait_freeVars(&c->cli_vars); } else { rpc->call_rep.eno ^= rpc->call_rep.eno; - if (argc) { + rpc->call_argc ^= rpc->call_argc; + if (TASK_VAL(task)) { /* without reply */ ait_freeVars(&c->cli_vars); - 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)); } } } array_Destroy(&arr); - return NULL; + taskExit(task, NULL); } static void * @@ -314,13 +307,12 @@ rxPacket(sched_task_t *task) { rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; - int len, rlen, noreply, estlen; + int len, noreply = 0, rlen = AIT_LEN(&c->cli_buf); #if 0 u_short crc; #endif u_char *buf = AIT_GET_BUF(&c->cli_buf); - struct tagRPCCall *rpc = (struct tagRPCCall*) buf; - struct pollfd pfd; + struct tagRPCCall b, *rpc = (struct tagRPCCall*) buf; #ifdef TCP_SESSION_TIMEOUT struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; @@ -329,71 +321,71 @@ rxPacket(sched_task_t *task) TASK_ARG(task), ts, TASK_ARG(task), 0); #endif - memset(buf, 0, sizeof(struct tagRPCCall)); - rlen = recv(TASK_FD(task), rpc, sizeof(struct tagRPCCall), MSG_PEEK); - if (rlen < sizeof(struct tagRPCCall)) { + /* prepare rx */ + len = recv(TASK_FD(task), &b, sizeof b, MSG_PEEK); + if (len == sizeof b) + rlen = ntohl(b.call_len); + + rlen = recv(TASK_FD(task), buf, rlen, 0); + if (rlen == -1) { /* close connection */ schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], TASK_ARG(task), 0, NULL, 0); - return NULL; - } else { - estlen = ntohl(rpc->call_len); - if (estlen > AIT_LEN(&c->cli_buf)) - AIT_RE_BUF(&c->cli_buf, estlen); - rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); - buf = AIT_GET_BUF(&c->cli_buf); - len = estlen; + taskExit(task, NULL); } + if (rlen < sizeof(struct tagRPCCall)) { + rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); - /* 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[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); - return NULL; - } - rlen = recv(TASK_FD(task), buf, len, 0); - if (rlen == -1) { - /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], - TASK_ARG(task), 0, NULL, 0); - return NULL; - } + rpc->call_argc ^= rpc->call_argc; + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + goto err; + } else + len = ntohl(rpc->call_len); + if (rlen < len || len > AIT_LEN(&c->cli_buf)) { + rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); + + rpc->call_argc ^= rpc->call_argc; + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + goto err; } - len = estlen; + /* skip loop packet */ + if (rpc->call_io & RPC_ACK) { + schedReadSelf(task); + taskExit(task, NULL); + } + #if 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"); - return NULL; + + rpc->call_argc ^= rpc->call_argc; + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + goto err; } #endif - noreply = RPC_CHK_NOREPLY(rpc); - /* check RPC packet session info */ if (rpc_chkPktSession(&rpc->call_session, &s->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, TASK_ARG(task), (int) noreply, rpc, len); + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + goto err; } + noreply = RPC_CHK_NOREPLY(rpc); + + /* execute RPC call */ + schedEvent(TASK_ROOT(task), execCall, TASK_ARG(task), (int) noreply, rpc, len); +err: /* send RPC reply */ if (!noreply) schedWrite(TASK_ROOT(task), cbProto[s->srv_proto][CB_TXPACKET], @@ -401,7 +393,7 @@ rxPacket(sched_task_t *task) /* lets get next packet */ schedReadSelf(task); - return NULL; + taskExit(task, NULL); } static void * @@ -409,7 +401,7 @@ acceptClients(sched_task_t *task) { rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; - socklen_t salen = sizeof(sockaddr_t); + socklen_t salen = E_SOCKADDR_MAX; int sock; #ifdef TCP_SESSION_TIMEOUT struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; @@ -445,7 +437,7 @@ acceptClients(sched_task_t *task) c->cli_sock, NULL, 0); end: schedReadSelf(task); - return NULL; + taskExit(task, NULL); } @@ -457,9 +449,8 @@ txUDPPacket(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, 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], @@ -469,65 +460,52 @@ txUDPPacket(sched_task_t *task) 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_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + } else if (rpc_pktFreeSpace(c) > s->srv_netbuf) { + rpc_SetErr(EMSGSIZE, "Message too long"); - rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); + rpc->call_argc ^= rpc->call_argc; + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + } else { + 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; - rpc->call_rep.ret = RPC_ERROR(-1); - rpc->call_rep.eno = RPC_ERROR(rpc_Errno); + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, 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 */ - 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 = 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; - } + ret = sendto(TASK_FD(task), buf, wlen, MSG_NOSIGNAL, + &c->cli_sa.sa, e_addrlen(&c->cli_sa)); + if (ret == -1) { + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); } - return NULL; + taskExit(task, NULL); } static void * @@ -535,35 +513,50 @@ rxUDPPacket(sched_task_t *task) { rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; - int len, rlen, noreply, estlen; + int len, noreply = 0, rlen; u_short crc; - u_char *buf, b[sizeof(struct tagRPCCall)]; - struct tagRPCCall *rpc = (struct tagRPCCall*) b; + struct tagRPCCall *rpc; sockaddr_t sa; - socklen_t salen; + socklen_t salen = E_SOCKADDR_MAX; struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; - struct pollfd pfd; + ait_val_t b = AIT_VAL_INIT; /* receive connect packet */ - salen = sa.ss.ss_len = sizeof(sockaddr_t); - rlen = recvfrom(TASK_FD(task), b, sizeof b, MSG_PEEK, &sa.sa, &salen); - if (rlen < sizeof(struct tagRPCCall)) { - rpc_SetErr(ERPCMISMATCH, "Short RPC packet"); + AIT_SET_BUF(&b, NULL, srv->srv_netbuf); +#ifndef __linux__ + sa.ss.ss_len = salen; +#endif + rlen = recvfrom(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b), 0, &sa.sa, &salen); + rpc = (struct tagRPCCall*) AIT_GET_BUF(&b); + if (rlen < sizeof(struct tagRPCCall)) goto end; - } + else + len = ntohl(rpc->call_len); + if (rlen < len || len > srv->srv_netbuf) + goto end; + /* 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; + if (crc != crcFletcher16((u_short*) rpc, len / 2)) + goto end; + + /* check RPC packet session info */ + if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) + 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 { - estlen = ntohl(rpc->call_len); - if (estlen > AIT_LEN(&c->cli_buf)) - AIT_RE_BUF(&c->cli_buf, estlen); + memcpy(AIT_GET_BUF(&c->cli_buf), AIT_GET_BUF(&b), len); 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); @@ -574,78 +567,196 @@ rxUDPPacket(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); + noreply = RPC_CHK_NOREPLY(rpc); + + /* 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); + taskExit(task, NULL); +} + + +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, 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_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + } else if (rpc_pktFreeSpace(c) > s->srv_netbuf) { + rpc_SetErr(EMSGSIZE, "Message too long"); + + rpc->call_argc ^= rpc->call_argc; + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + } else { + 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_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, 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, wlen, MSG_NOSIGNAL, + &c->cli_sa.sa, e_addrlen(&c->cli_sa)); + if (ret == -1) { + /* close connection */ + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); + } + + taskExit(task, NULL); +} + +static void * +rxRAWPacket(sched_task_t *task) +{ + rpc_srv_t *srv = TASK_ARG(task); + rpc_cli_t *c = NULL; + int len, noreply = 0, rlen; + u_short crc; + struct tagRPCCall *rpc; + sockaddr_t sa; + socklen_t salen = E_SOCKADDR_MAX; + 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); +#ifndef __linux__ + sa.ss.ss_len = salen; +#endif + 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*) (h + 1); } - 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); + } else { +#ifdef IPV6_REMOVE_HEADER + struct ip6_hdr *h; + h = (struct ip6_hdr*) AIT_GET_BUF(&b); + if (rlen < ntohs(h->ip6_plen) || h->ip6_nxt != IPPROTO_ERPC) goto end; + else { + rlen -= sizeof(struct ip6_hdr); + rpc = (struct tagRPCCall*) (h + 1); } - if (e_addrcmp(&c->cli_sa, &sa, 42)) - rlen ^= rlen; /* skip if arrive from different address */ +#else + rpc = (struct tagRPCCall*) AIT_GET_BUF(&b); +#endif } - len = estlen; + if (rlen < sizeof(struct tagRPCCall)) + goto end; + else + len = ntohl(rpc->call_len); + if (rlen < len || len > srv->srv_netbuf) + goto end; + /* 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; - 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); + if (crc != crcFletcher16((u_short*) rpc, len / 2)) 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"); + if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) + goto end; - rpc->call_argc ^= rpc->call_argc; - rpc->call_rep.ret = RPC_ERROR(-1); - rpc->call_rep.eno = RPC_ERROR(errno); + 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 { - /* execute RPC call */ - schedEvent(TASK_ROOT(task), execCall, c, (int) noreply, rpc, 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); } + noreply = RPC_CHK_NOREPLY(rpc); + + /* 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; + taskExit(task, NULL); } static void * txBPFPacket(sched_task_t *task) { +#ifndef __linux__ 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); + int ret, wlen = sizeof(struct tagRPCCall); struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; struct ether_header *eh; ait_val_t b = AIT_VAL_INIT; @@ -658,45 +769,48 @@ txBPFPacket(sched_task_t *task) 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_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + } else if (rpc_pktFreeSpace(c) > s->srv_netbuf) { + rpc_SetErr(EMSGSIZE, "Message too long"); - rpc->call_argc = htons(array_Size(RPC_RETVARS(c))); + rpc->call_argc ^= rpc->call_argc; + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + } else { + 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); + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); } else wlen += ret; } } + /* 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; rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2)); /* send reply */ - AIT_SET_BUF(&b, NULL, MIN(wlen, s->srv_netbuf) + ETHER_HDR_LEN); + AIT_SET_BUF(&b, NULL, wlen + 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)); + memcpy(eh + 1, buf, wlen); ret = write(TASK_FD(task), AIT_GET_BUF(&b), AIT_LEN(&b)); AIT_FREE_VAL(&b); @@ -704,15 +818,18 @@ txBPFPacket(sched_task_t *task) /* close connection */ schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], TASK_ARG(task), 0, NULL, 0); - return NULL; } +#else + rpc_SetErr(ENOTSUP, "Feature isn't supported on Linux!"); +#endif - return NULL; + taskExit(task, NULL); } static void * rxBPFPacket(sched_task_t *task) { +#ifndef __linux__ rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; int len, rlen, noreply; @@ -730,30 +847,49 @@ rxBPFPacket(sched_task_t *task) 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"); + rlen < ETHER_HDR_LEN + sizeof(struct tagRPCCall)) goto end; - } else { + else { rlen = h->bh_caplen; eh = (struct ether_header*) (AIT_GET_BUF(&b) + h->bh_hdrlen); 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); } + if (rlen < sizeof(struct tagRPCCall)) + goto end; + else + len = ntohl(rpc->call_len); + if (rlen < len || len > srv->srv_netbuf) + goto end; +#ifdef CHECK_ETHACK + /* skip loop packet */ + if (rpc->call_io & RPC_ACK) + goto end; +#endif + + /* check integrity of packet */ + crc = ntohs(rpc->call_crc); + rpc->call_crc ^= rpc->call_crc; + if (crc != crcFletcher16((u_short*) rpc, len / 2)) + goto end; + + /* check RPC packet session info */ + if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) + 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)); + memcpy(AIT_GET_BUF(&c->cli_buf), rpc, len); rpc = (struct tagRPCCall*) AIT_GET_BUF(&c->cli_buf); c->cli_sock = TASK_FD(task); @@ -765,39 +901,149 @@ rxBPFPacket(sched_task_t *task) 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"); + noreply = RPC_CHK_NOREPLY(rpc); + + /* execute RPC call */ + schedEvent(TASK_ROOT(task), execCall, c, (int) noreply, rpc, len); + + /* send RPC reply */ + if (!noreply) + schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], + c, TASK_FD(task), rpc, len); +end: + AIT_FREE_VAL(&b); + schedReadSelf(task); +#else + rpc_SetErr(ENOTSUP, "Feature isn't supported on Linux!"); +#endif + + taskExit(task, 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, 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_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + } else if (rpc_pktFreeSpace(c) > s->srv_netbuf) { + rpc_SetErr(EMSGSIZE, "Message too long"); + + rpc->call_argc ^= rpc->call_argc; + RPC_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + } else { + 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_SET_RETURN(rpc, -1); + RPC_SET_ERRNO(rpc, rpc_Errno); + } else + wlen += ret; + } + } + + /* Free return values */ + ait_freeVars(&RPC_RETVARS(c)); + + rpc->call_len = htonl(wlen); + rpc->call_io = RPC_ACK; + + /* send reply */ + ret = write(TASK_FD(task), buf, wlen); + if (ret == -1) { /* close connection */ - schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_CLOSECLIENT], - c, 0, NULL, 0); - goto end; + schedEvent(TASK_ROOT(task), cbProto[s->srv_proto][CB_CLOSECLIENT], + TASK_ARG(task), 0, NULL, 0); } - noreply = RPC_CHK_NOREPLY(rpc); + taskExit(task, NULL); +} +static void * +rxEXTPacket(sched_task_t *task) +{ + rpc_srv_t *srv = TASK_ARG(task); + rpc_cli_t *c = NULL; + int len, noreply = 0, rlen = AIT_LEN(&c->cli_buf); + struct tagRPCCall *rpc; + struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; + sockaddr_t sa; + ait_val_t b = AIT_VAL_INIT; + + 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)); + rpc = (struct tagRPCCall*) AIT_GET_BUF(&b); + if (rlen < sizeof(struct tagRPCCall)) + goto end; + else + len = ntohl(rpc->call_len); + if (rlen < len || len > srv->srv_netbuf) + goto end; + + /* skip loop packet */ + if (rpc->call_io & RPC_ACK) + goto end; + /* check RPC packet session info */ - if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) { - rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); + if (rpc_chkPktSession(&rpc->call_session, &srv->srv_session)) + goto end; - rpc->call_argc ^= rpc->call_argc; - rpc->call_rep.ret = RPC_ERROR(-1); - rpc->call_rep.eno = RPC_ERROR(errno); + 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 { - /* execute RPC call */ - schedEvent(TASK_ROOT(task), execCall, c, (int) noreply, rpc, len); + memcpy(AIT_GET_BUF(&c->cli_buf), AIT_GET_BUF(&b), len); + 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); + + /* execute RPC call */ + schedEvent(TASK_ROOT(task), execCall, c, (int) noreply, rpc, len); + /* send RPC reply */ if (!noreply) - schedEvent(TASK_ROOT(task), cbProto[srv->srv_proto][CB_TXPACKET], + 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; + taskExit(task, NULL); } /* ------------------------------------------------------ */ @@ -828,7 +1074,7 @@ closeBLOBClient(sched_task_t *task) /* close client socket */ shutdown(sock, SHUT_RDWR); close(sock); - return NULL; + taskExit(task, NULL); } static void * @@ -845,7 +1091,7 @@ txBLOB(sched_task_t *task) schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0); } - return NULL; + taskExit(task, NULL); } static void * @@ -862,7 +1108,7 @@ rxBLOB(sched_task_t *task) if (rlen < 1) { /* close blob connection */ schedEvent(TASK_ROOT(task), closeBLOBClient, c, 42, NULL, 0); - return NULL; + taskExit(task, NULL); } /* check BLOB packet */ @@ -870,7 +1116,7 @@ rxBLOB(sched_task_t *task) rpc_SetErr(ERPCMISMATCH, "Short BLOB packet"); schedReadSelf(task); - return NULL; + taskExit(task, NULL); } /* check RPC packet session info */ @@ -886,7 +1132,7 @@ rxBLOB(sched_task_t *task) if (!(b = rpc_srv_getBLOB(s, ntohl(blob.hdr_var)))) { rpc_SetErr(EINVAL, "Var=%x not found", ntohl(blob.hdr_var)); blob.hdr_cmd = no; - blob.hdr_ret = RPC_ERROR(-1); + RPC_SET_BLOB_RET(&blob, -1); break; } else blob.hdr_len = htonl(b->blob_len); @@ -897,7 +1143,7 @@ rxBLOB(sched_task_t *task) rpc_srv_blobUnmap(b); } else { blob.hdr_cmd = error; - blob.hdr_ret = RPC_ERROR(-1); + RPC_SET_BLOB_RET(&blob, -1); } break; case set: @@ -911,32 +1157,36 @@ rxBLOB(sched_task_t *task) rpc_srv_blobUnmap(b); } else { blob.hdr_cmd = error; - blob.hdr_ret = RPC_ERROR(-1); + RPC_SET_BLOB_RET(&blob, -1); } break; case unset: if (rpc_srv_unregisterBLOB(s, ntohl(blob.hdr_var)) == -1) { blob.hdr_cmd = error; - blob.hdr_ret = RPC_ERROR(-1); + RPC_SET_BLOB_RET(&blob, -1); } break; default: rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob.hdr_cmd); blob.hdr_cmd = error; - blob.hdr_ret = RPC_ERROR(-1); + RPC_SET_BLOB_RET(&blob, -1); } end: memcpy(AIT_ADDR(&c->cli_buf), &blob, sizeof blob); schedWrite(TASK_ROOT(task), txBLOB, TASK_ARG(task), TASK_FD(task), NULL, 0); schedReadSelf(task); - return NULL; + taskExit(task, NULL); } static void * flushBLOB(sched_task_t *task) { +#ifdef atomic_load_acq_ptr uintptr_t sigArg = atomic_load_acq_ptr(&_glSigArg); +#else + uintptr_t sigArg = *((volatile uintptr_t*) &_glSigArg); +#endif rpc_srv_t *srv = sigArg ? (void*) sigArg : TASK_ARG(task); rpc_blob_t *b, *tmp; @@ -947,7 +1197,7 @@ flushBLOB(sched_task_t *task) e_free(b); } - if (!schedSignalSelf(task)) { + if (sigArg) { /* disabled kqueue support in libaitsched */ struct sigaction sa; @@ -956,9 +1206,11 @@ flushBLOB(sched_task_t *task) sa.sa_handler = (void (*)(int)) flushBLOB; sa.sa_flags = SA_RESTART | SA_RESETHAND; sigaction(SIGFBLOB, &sa, NULL); + return NULL; + } else { + schedSignalSelf(task); + taskExit(task, NULL); } - - return NULL; } static void * @@ -967,7 +1219,7 @@ acceptBLOBClients(sched_task_t *task) rpc_srv_t *srv = TASK_ARG(task); rpc_cli_t *c = NULL; register int i; - socklen_t salen = sizeof(sockaddr_t); + socklen_t salen = E_SOCKADDR_MAX; int sock; #ifdef TCP_NOPUSH int n = 1; @@ -989,7 +1241,7 @@ acceptBLOBClients(sched_task_t *task) if (!c) { LOGERR; srv->srv_kill = srv->srv_blob.kill = 1; - return NULL; + taskExit(task, NULL); } else { memset(c, 0, sizeof(rpc_cli_t)); array_Set(srv->srv_blob.clients, i, c); @@ -1017,7 +1269,7 @@ acceptBLOBClients(sched_task_t *task) schedRead(TASK_ROOT(task), rxBLOB, c, c->cli_sock, NULL, 0); end: schedReadSelf(task); - return NULL; + taskExit(task, NULL); } /* ------------------------------------------------------ */ @@ -1034,6 +1286,7 @@ int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir) { int n = 1; + socklen_t salen; if (!srv || srv->srv_kill) { rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server"); @@ -1052,19 +1305,22 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s srv->srv_blob.server.cli_parent = srv; - memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof(sockaddr_t)); + memcpy(&srv->srv_blob.server.cli_sa, &srv->srv_server.cli_sa, sizeof srv->srv_blob.server.cli_sa); switch (srv->srv_blob.server.cli_sa.sa.sa_family) { case AF_INET: srv->srv_blob.server.cli_sa.sin.sin_port = htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin.sin_port) + 1); + salen = sizeof srv->srv_blob.server.cli_sa.sin; break; case AF_INET6: srv->srv_blob.server.cli_sa.sin6.sin6_port = htons(Port ? Port : ntohs(srv->srv_blob.server.cli_sa.sin6.sin6_port) + 1); + salen = sizeof srv->srv_blob.server.cli_sa.sin6; break; case AF_LOCAL: strlcat(srv->srv_blob.server.cli_sa.sun.sun_path, ".blob", sizeof srv->srv_blob.server.cli_sa.sun.sun_path); + salen = sizeof srv->srv_blob.server.cli_sa.sun; break; default: AIT_FREE_VAL(&srv->srv_blob.dir); @@ -1097,8 +1353,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s AIT_FREE_VAL(&srv->srv_blob.dir); return -1; } - if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa, - srv->srv_blob.server.cli_sa.sa.sa_len) == -1) { + if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa, salen) == -1) { LOGERR; close(srv->srv_blob.server.cli_sock); AIT_FREE_VAL(&srv->srv_blob.dir); @@ -1144,6 +1399,9 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) srv->srv_blob.kill = 1; + if (srv->srv_blob.server.cli_sa.sa.sa_family == AF_LOCAL) + unlink(srv->srv_blob.server.cli_sa.sun.sun_path); + schedEnd(&srv->srv_blob.root); } @@ -1175,7 +1433,11 @@ rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) /* disabled kqueue support in libaitsched */ struct sigaction sa; +#ifdef atomic_store_rel_ptr atomic_store_rel_ptr(&_glSigArg, (uintptr_t) srv); +#else + *((volatile uintptr_t*) &_glSigArg) = (uintptr_t) srv; +#endif memset(&sa, 0, sizeof sa); sigemptyset(&sa.sa_mask); @@ -1241,15 +1503,16 @@ rpc_srv_initServer(u_char InstID, int concurentClients int n = 1; rpc_srv_t *srv = NULL; sockaddr_t sa = E_SOCKADDR_INIT; + socklen_t salen; - 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; } - if (!e_gethostbyname(csHost, Port, &sa)) - return NULL; - if (!Port) + if (!Port && proto < SOCK_RAW) Port = RPC_DEFPORT; + if (!(salen = e_gethostbyname(csHost, Port, &sa))) + return NULL; if (!proto) proto = SOCK_STREAM; if (netBuf < RPC_MIN_BUFSIZ) @@ -1305,7 +1568,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); @@ -1318,6 +1582,8 @@ rpc_srv_initServer(u_char InstID, int concurentClients LOGERR; goto err; } + if (srv->srv_proto == SOCK_STREAM) + setsockopt(srv->srv_server.cli_sock, IPPROTO_TCP, TCP_NODELAY, &n, sizeof n); n = srv->srv_netbuf; if (setsockopt(srv->srv_server.cli_sock, SOL_SOCKET, SO_SNDBUF, &n, sizeof n) == -1) { LOGERR; @@ -1327,8 +1593,7 @@ rpc_srv_initServer(u_char InstID, int concurentClients LOGERR; goto err; } - if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa.sa, - srv->srv_server.cli_sa.sa.sa_len) == -1) { + if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa.sa, salen) == -1) { LOGERR; goto err; } else @@ -1361,10 +1626,16 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv) /* if send kill to blob server */ rpc_srv_endBLOBServer(*psrv); + /* wait for BLOB server done */ + while (*(&(*psrv)->srv_blob.root)) + usleep(1000); (*psrv)->srv_kill = 1; sleep(RPC_SCHED_POLLING); + if ((*psrv)->srv_server.cli_sa.sa.sa_family == AF_LOCAL) + unlink((*psrv)->srv_server.cli_sa.sun.sun_path); + schedEnd(&(*psrv)->srv_root); pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx); @@ -1424,7 +1695,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); @@ -1478,6 +1750,7 @@ rpc_srv_execCall(rpc_cli_t * __restrict cli, struct ta rpc_srv_t * rpc_srv_initServer2(u_char InstID, int concurentClients, int netBuf, const char *csIface) { +#ifndef __linux__ int n = 1; rpc_srv_t *srv = NULL; sockaddr_t sa = E_SOCKADDR_INIT; @@ -1604,5 +1877,78 @@ err: /* error condition */ schedEnd(&srv->srv_root); pthread_mutex_destroy(&srv->srv_funcs.mtx); e_free(srv); +#else + rpc_SetErr(ENOTSUP, "Feature isn't supported on Linux!"); +#endif + 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; }