--- libaitrpc/src/cli.c	2014/11/26 00:50:04	1.22.6.2
+++ libaitrpc/src/cli.c	2015/01/18 01:03:49	1.23.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.22.6.2 2014/11/26 00:50:04 misho Exp $
+* $Id: cli.c,v 1.23.2.2 2015/01/18 01:03:49 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 <info@elwix.org>
 
-Copyright 2004 - 2014
+Copyright 2004 - 2015
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -350,7 +350,11 @@ 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_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;
@@ -638,6 +642,16 @@ rpc_cli_openClient2(u_char InstID, int netBuf, const c
 	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;
@@ -646,7 +660,7 @@ rpc_cli_openClient2(u_char InstID, int netBuf, const c
 			return NULL;
 	} else
 		strlcpy(szIface, csIface, sizeof szIface);
-	if (e_getifacebyname(szIface, &sal))
+	if (!e_getifacebyname(szIface, &sal))
 		return NULL;
 
 	cli = e_malloc(sizeof(rpc_cli_t));
@@ -689,6 +703,10 @@ rpc_cli_openClient2(u_char InstID, int netBuf, const c
 		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;
@@ -728,6 +746,71 @@ rpc_cli_closeClient2(rpc_cli_t ** __restrict cli)
 		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);