--- libaitrpc/src/srv.c 2024/02/26 18:25:32 1.30.2.10 +++ libaitrpc/src/srv.c 2025/03/31 12:21:07 1.33 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: srv.c,v 1.30.2.10 2024/02/26 18:25:32 misho Exp $ +* $Id: srv.c,v 1.33 2025/03/31 12:21:07 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 - 2024 +Copyright 2004 - 2025 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -147,6 +147,11 @@ _allocClient(rpc_srv_t * __restrict srv, sockaddr_t * /* alloc empty buffer */ AIT_SET_BUFSIZ(&c->cli_buf, 0, srv->srv_netbuf); + if (!AIT_GET_BUF(&c->cli_buf)) { + array_Del(srv->srv_clients, n, 0); + e_free(c); + c = NULL; + } } return c; @@ -308,7 +313,7 @@ rxPacket(sched_task_t *task) { rpc_cli_t *c = TASK_ARG(task); rpc_srv_t *s = c->cli_parent; - int len, noreply = 0, rlen = AIT_LEN(&c->cli_buf); + int len, noreply = 0, rlen; #if 0 u_short crc; #endif @@ -538,7 +543,7 @@ rxUDPPacket(sched_task_t *task) #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)) + if (!rpc || rlen < sizeof(struct tagRPCCall)) goto end; else len = ntohl(rpc->call_len); @@ -682,7 +687,7 @@ rxRAWPacket(sched_task_t *task) 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) + if (!h || rlen < ntohs(h->ip_len) || h->ip_p != IPPROTO_ERPC) goto end; else { rlen -= sizeof(struct ip); @@ -692,7 +697,7 @@ rxRAWPacket(sched_task_t *task) #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) + if (!h || rlen < ntohs(h->ip6_plen) || h->ip6_nxt != IPPROTO_ERPC) goto end; else { rlen -= sizeof(struct ip6_hdr); @@ -702,7 +707,7 @@ rxRAWPacket(sched_task_t *task) rpc = (struct tagRPCCall*) AIT_GET_BUF(&b); #endif } - if (rlen < sizeof(struct tagRPCCall)) + if (!rpc || rlen < sizeof(struct tagRPCCall)) goto end; else len = ntohl(rpc->call_len); @@ -998,7 +1003,7 @@ 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); + int len, noreply = 0, rlen; struct tagRPCCall *rpc; struct timespec ts = { DEF_RPC_TIMEOUT, 0 }; sockaddr_t sa; @@ -1009,7 +1014,7 @@ rxEXTPacket(sched_task_t *task) 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)) + if (!rpc || rlen < sizeof(struct tagRPCCall)) goto end; else len = ntohl(rpc->call_len); @@ -1557,7 +1562,7 @@ rpc_srv_initServer(u_char InstID, int concurentClients /* init functions */ pthread_mutex_init(&srv->srv_funcs.mtx, NULL); SLIST_INIT(&srv->srv_funcs); - AVL_INIT(&srv->srv_funcs); + RB_INIT(&srv->srv_funcs); /* init scheduler */ srv->srv_root = schedBegin(); @@ -1566,8 +1571,7 @@ rpc_srv_initServer(u_char InstID, int concurentClients pthread_mutex_destroy(&srv->srv_funcs.mtx); e_free(srv); return NULL; - } else - schedSignalDispatch(srv->srv_root, 42); + } /* init pool for clients */ srv->srv_clients = array_Init(concurentClients); @@ -1689,7 +1693,6 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv) schedPolling(srv->srv_root, &ts, NULL); /* main rpc loop */ schedRun(srv->srv_root, &srv->srv_kill); - schedSignalDispatch(srv->srv_root, 0); /* close all clients connections & server socket */ for (i = 0; i < array_Size(srv->srv_clients); i++) { @@ -1719,7 +1722,7 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv) AIT_FREE_VAL(&f->func_name); e_free(f); } - srv->srv_funcs.avlh_root = NULL; + srv->srv_funcs.rbh_root = NULL; RPC_FUNCS_UNLOCK(&srv->srv_funcs); return 0; @@ -1819,7 +1822,7 @@ rpc_srv_initServer2(u_char InstID, int concurentClient /* init functions */ pthread_mutex_init(&srv->srv_funcs.mtx, NULL); SLIST_INIT(&srv->srv_funcs); - AVL_INIT(&srv->srv_funcs); + RB_INIT(&srv->srv_funcs); /* init scheduler */ srv->srv_root = schedBegin(); @@ -1828,8 +1831,7 @@ rpc_srv_initServer2(u_char InstID, int concurentClient pthread_mutex_destroy(&srv->srv_funcs.mtx); e_free(srv); return NULL; - } else - schedSignalDispatch(srv->srv_root, 42); + } /* init pool for clients */ srv->srv_clients = array_Init(concurentClients); @@ -1938,7 +1940,7 @@ rpc_srv_initServerExt(u_char InstID, int netBuf, int f /* init functions */ pthread_mutex_init(&srv->srv_funcs.mtx, NULL); SLIST_INIT(&srv->srv_funcs); - AVL_INIT(&srv->srv_funcs); + RB_INIT(&srv->srv_funcs); /* init scheduler */ srv->srv_root = schedBegin(); @@ -1947,8 +1949,7 @@ rpc_srv_initServerExt(u_char InstID, int netBuf, int f pthread_mutex_destroy(&srv->srv_funcs.mtx); e_free(srv); return NULL; - } else - schedSignalDispatch(srv->srv_root, 42); + } /* init pool for clients */ srv->srv_clients = array_Init(1);