--- libaitrpc/src/cli.c 2013/12/15 23:01:02 1.21 +++ libaitrpc/src/cli.c 2015/01/21 21:17:05 1.24 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.21 2013/12/15 23:01:02 misho Exp $ +* $Id: cli.c,v 1.24 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2015 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -282,7 +282,7 @@ rpc_cli_reconnectClient(rpc_cli_t * __restrict cli) void rpc_cli_closeClient(rpc_cli_t ** __restrict cli) { - if (!cli || !*cli) + if (!cli || !*cli || (*cli)->cli_id == SOCK_BPF) return; if ((*cli)->cli_id == SOCK_STREAM) @@ -350,26 +350,44 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res do { if (type == SOCK_STREAM) ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, NULL, buf, blen); - else + else if (type == SOCK_EXT) { + ret = rpc_Read(sock, type, 0, NULL, buf, blen); + if (estlen) /* hack for skip sanity checks */ + ret += sizeof(struct tagRPCCall); + } else if (type == SOCK_BPF) { + ret = rpc_Read(sock, type, 0, sa, AIT_GET_BUF(pkt), AIT_LEN(pkt)); + if (ret > 0) + estlen = ret; + } else ret = rpc_Read(sock, type, !estlen ? MSG_PEEK : 0, sa, buf, blen); if (ret < 1) return ret; + /* 1st read for RPC header */ + if (ret < sizeof(struct tagRPCCall)) { + rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); + return -1; + } + + /* check for loop request */ + if (!estlen && !(rpc->call_io & RPC_ACK)) + continue; + /* check for response from known address */ if (!estlen) { - /* 1st read for RPC header */ - if (ret < sizeof(struct tagRPCCall)) { - rpc_SetErr(ERPCMISMATCH, "Short RPC packet %d bytes", ret); - return -1; - } - /* calc estimated length */ estlen = ntohl(rpc->call_len); if (estlen > AIT_LEN(pkt)) AIT_RE_BUF(pkt, estlen); + blen = estlen; buf = AIT_GET_BUF(pkt); + + if (type == SOCK_EXT) { + blen -= sizeof(struct tagRPCCall); + buf += sizeof(struct tagRPCCall); + } + rpc = (struct tagRPCCall*) buf; - blen = estlen; continue; } @@ -377,7 +395,7 @@ rpc_pkt_Receive(int sock, int type, sockaddr_t * __res break; } while (42); - if (ret < sizeof(struct tagRPCCall) || estlen != ret) { + if (estlen != ret) { rpc_SetErr(ERPCMISMATCH, "RPC packet mismatch estimate %d bytes, but received %d\n", estlen, ret); return -1; @@ -423,7 +441,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t if (!vars) rpc->call_argc = 0; else - rpc->call_argc = htons(array_Size(vars)); + rpc->call_argc = (u_char) array_Size(vars); /* set reply */ rpc->call_req.flags = (uint64_t) htonl(noreply ? RPC_NOREPLY : RPC_REPLY); @@ -440,6 +458,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t /* total packet length */ rpc->call_len = htonl(len); + rpc->call_io = RPC_REQ; if (!nocrc) { /* calculate CRC */ @@ -454,7 +473,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t * rpc_pkt_Replay() - Decode RPC Replay packet * * @pkt = Packet buffer - * @sess = RPC session info + * @sess = RPC session info, if =NULL don't check session * @tag = Function tag * @vars = Function argument array of values, may be NULL * @nocrc = Without CRC calculation @@ -469,7 +488,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t u_char *buf; uint16_t crc; - if (!pkt || !sess) { + if (!pkt) { rpc_SetErr(EINVAL, "Invalid argument(s)!"); return -1; } else @@ -487,7 +506,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t } /* check RPC packet session info */ - if (rpc_chkPktSession(&rpc->call_session, sess)) { + if (sess && rpc_chkPktSession(&rpc->call_session, sess)) { rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session"); return -1; } @@ -501,7 +520,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t strerror(ntohl(rpc->call_rep.eno))); return -1; } - len = ntohs(rpc->call_argc) * sizeof(ait_val_t); + len = rpc->call_argc * sizeof(ait_val_t); if (len > AIT_LEN(pkt) - sizeof(struct tagRPCCall)) { rpc_SetErr(EMSGSIZE, "Reply RPC packet not enough buffer space ..."); return -1; @@ -512,13 +531,13 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t } /* RPC is OK! Go de-marshaling variables ... */ - if (vars && ntohs(rpc->call_argc)) { + if (vars && rpc->call_argc) { #ifdef CLI_RES_ZCOPY *vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len, - ntohs(rpc->call_argc), 42); + rpc->call_argc, 42); #else *vars = ait_buffer2vars(buf + sizeof(struct tagRPCCall), len, - ntohs(rpc->call_argc), 0); + rpc->call_argc, 0); #endif if (!*vars) { rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError()); @@ -550,7 +569,7 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!"); return -1; } else { - if (cli->cli_id == SOCK_STREAM) + if (cli->cli_id == SOCK_STREAM || cli->cli_id == SOCK_EXT) type = cli->cli_id; buf = AIT_GET_BUF(&cli->cli_buf); } @@ -617,4 +636,202 @@ rpc_cli_ping(rpc_cli_t *cli) rpc_cli_freeCall(&arr); return ret; +} + + +/* + * rpc_cli_openClient2() - Connect to layer2 RPC Server + * + * @InstID = InstID for RPC session request + * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) + * @csIface = Interface name for bind client, if NULL first interface on host + * @csHost = Host ethernet address + * return: NULL == error or !=NULL connection to RPC server established + */ +rpc_cli_t * +rpc_cli_openClient2(u_char InstID, int netBuf, const char *csIface, const char *csHost) +{ + rpc_cli_t *cli = NULL; + sockaddr_t sa = E_SOCKADDR_INIT, sal = E_SOCKADDR_INIT; + char szIface[64], szStr[STRSIZ]; + register int i; + struct ifreq ifr; + int n = 1; + struct bpf_insn insns[] = { + BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 12), + BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, RPC_DEFPORT, 0, 1), + BPF_STMT(BPF_RET + BPF_K, -1), + BPF_STMT(BPF_RET + BPF_K, 0), + }; + struct bpf_program fcode = { + .bf_len = sizeof(insns) / sizeof(struct bpf_insn), + .bf_insns = insns + }; + + if (!csHost || !e_getlinkbyname(csHost, &sa)) + return NULL; + if (!csIface) { + if (e_get1stiface(szIface, sizeof szIface)) + return NULL; + } else + strlcpy(szIface, csIface, sizeof szIface); + if (!e_getifacebyname(szIface, &sal)) + return NULL; + + cli = e_malloc(sizeof(rpc_cli_t)); + if (!cli) { + LOGERR; + return NULL; + } else + memset(cli, 0, sizeof(rpc_cli_t)); + + /* build session */ + cli->cli_parent = e_malloc(sizeof(rpc_sess_t)); + if (!cli->cli_parent) { + LOGERR; + e_free(cli); + return NULL; + } else { + ((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION; + ((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID; + } + + cli->cli_id = SOCK_BPF; + memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa); + + /* connect to RPC server */ + for (i = 0; i < 10; i++) { + memset(szStr, 0, sizeof szStr); + snprintf(szStr, sizeof szStr, "/dev/bpf%d", i); + cli->cli_sock = open(szStr, O_RDWR); + if (cli->cli_sock > STDERR_FILENO) + break; + } + if (cli->cli_sock < 3) { + LOGERR; + e_free(cli->cli_parent); + e_free(cli); + return NULL; + } + + if (ioctl(cli->cli_sock, BIOCIMMEDIATE, &n) == -1) { + LOGERR; + goto err; + } + if (ioctl(cli->cli_sock, BIOCSETF, &fcode) == -1) { + LOGERR; + goto err; + } + n = (netBuf < RPC_MIN_BUFSIZ) ? getpagesize() : E_ALIGN(netBuf, 2); + if (ioctl(cli->cli_sock, BIOCSBLEN, &n) == -1) { + LOGERR; + goto err; + } else + AIT_SET_BUFSIZ(&cli->cli_buf, 0, n); + + memset(&ifr, 0, sizeof ifr); + strlcpy(ifr.ifr_name, szIface, sizeof ifr.ifr_name); + if (ioctl(cli->cli_sock, BIOCSETIF, &ifr) == -1) { + LOGERR; + goto err; + } else + fcntl(cli->cli_sock, F_SETFL, + fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); + + return cli; +err: + AIT_FREE_VAL(&cli->cli_buf); + if (cli->cli_sock > 2) + close(cli->cli_sock); + e_free(cli->cli_parent); + e_free(cli); + return NULL; +} + +/* + * rpc_cli_closeClient2() - Close layer2 connection to RPC server and free resources + * + * @cli = RPC Client session + * return: none + */ +void +rpc_cli_closeClient2(rpc_cli_t ** __restrict cli) +{ + if (!cli || !*cli || (*cli)->cli_id != SOCK_BPF) + return; + + close((*cli)->cli_sock); + + AIT_FREE_VAL(&(*cli)->cli_buf); + + if ((*cli)->cli_parent) + e_free((*cli)->cli_parent); + + e_free(*cli); + *cli = NULL; +} + +/* + * rpc_cli_openClientExt() - Connect to pipe RPC Server + * + * @InstID = InstID for RPC session request + * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet) + * @fd = File descriptor + * return: NULL == error or !=NULL connection to RPC server established + */ +rpc_cli_t * +rpc_cli_openClientExt(u_char InstID, int netBuf, int fd) +{ + rpc_cli_t *cli = NULL; + int n; + + cli = e_malloc(sizeof(rpc_cli_t)); + if (!cli) { + LOGERR; + return NULL; + } else + memset(cli, 0, sizeof(rpc_cli_t)); + + /* build session */ + cli->cli_parent = e_malloc(sizeof(rpc_sess_t)); + if (!cli->cli_parent) { + LOGERR; + e_free(cli); + return NULL; + } else { + ((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION; + ((rpc_sess_t*) cli->cli_parent)->sess_instance = InstID; + } + + cli->cli_id = SOCK_EXT; + cli->cli_sock = fd; + + n = (netBuf < RPC_MIN_BUFSIZ) ? getpagesize() : E_ALIGN(netBuf, 2); + AIT_SET_BUFSIZ(&cli->cli_buf, 0, n); + + fcntl(cli->cli_sock, F_SETFL, + fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK); + + return cli; +} + +/* + * rpc_cli_closeClientExt() - Close pipe connection to RPC server and free resources + * + * @cli = RPC Client session + * return: none + */ +void +rpc_cli_closeClientExt(rpc_cli_t ** __restrict cli) +{ + if (!cli || !*cli || (*cli)->cli_id != SOCK_EXT) + return; + + AIT_FREE_VAL(&(*cli)->cli_buf); + + if ((*cli)->cli_parent) + e_free((*cli)->cli_parent); + + e_free(*cli); + *cli = NULL; }