--- libaitrpc/inc/aitrpc.h	2014/03/27 23:11:05	1.23.4.2
+++ libaitrpc/inc/aitrpc.h	2015/01/15 20:27:49	1.25.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.23.4.2 2014/03/27 23:11:05 misho Exp $
+* $Id: aitrpc.h,v 1.25.2.1 2015/01/15 20:27:49 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -65,6 +65,19 @@ SUCH DAMAGE.
 #define RPC_VERSION		7
 #define RPC_DEFPORT		2611
 
+/* Additional ELWIX RPC supporting protocols */
+#ifndef SOCK_STREAM
+#define SOCK_STREAM		1	/* stream socket */
+#endif
+#ifndef SOCK_DGRAM
+#define SOCK_DGRAM		2	/* datagram socket */
+#endif
+#ifndef SOCK_RAW
+#define SOCK_RAW		3	/* raw-protocol interface */
+#endif
+#define SOCK_BPF		4	/* ethernet interface */
+#define SOCK_PIPE		5	/* bi-directional pipe interface */
+
 /* RPC call request flags */
 
 #define RPC_REPLY		0x0
@@ -360,16 +373,18 @@ void rpc_srv_endServer(rpc_srv_t ** __restrict psrv);
  * return: -1 error or 0 ok, infinite loop ...
  */
 int rpc_srv_loopServer(rpc_srv_t * __restrict srv);
-#define rpc_srv_execServer(_srv, _sync)	do { assert((_srv)); \
-						if (!(_srv)->srv_kill) { \
-							pthread_create(&(_srv)->srv_tid, NULL, (void*(*)(void*)) \
-									rpc_srv_loopServer, (_srv)); \
-							if ((_sync)) \
-								pthread_join((_srv)->srv_tid, (void**) (_sync)); \
-							else \
-								pthread_detach((_srv)->srv_tid); \
-						} } while (0)
-#define rpc_srv_killServer(_srv)	(assert((_srv)), (_srv)->srv_blob.kill = 1, (_srv)->srv_kill = 1)
+#define rpc_srv_execServer(_srv, _sync) \
+	do { assert((_srv)); \
+		if (!(_srv)->srv_kill) { \
+			pthread_create(&(_srv)->srv_tid, NULL, (void*(*)(void*)) \
+					rpc_srv_loopServer, (_srv)); \
+			if ((_sync)) \
+				pthread_join((_srv)->srv_tid, (void**) (_sync)); \
+			else \
+				pthread_detach((_srv)->srv_tid); \
+	} } while (0)
+#define rpc_srv_killServer(_srv) \
+	(assert((_srv)), (_srv)->srv_blob.kill = 1, (_srv)->srv_kill = 1)
 
 /*
  * rpc_srv_initBLOBServer() - Init & create BLOB Server
@@ -394,16 +409,28 @@ void rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
  * return: -1 error or 0 ok, infinite loop ...
  */
 int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv);
-#define rpc_srv_execBLOBServer(_srv)	do { assert((_srv)); \
-						if (!(_srv)->srv_kill && !(_srv)->srv_blob.kill) { \
-							pthread_create(&(_srv)->srv_blob.tid, NULL, \
-									(void*(*)(void*)) \
-									rpc_srv_loopBLOBServer, (_srv)); \
-							pthread_detach((_srv)->srv_blob.tid); \
-						} \
-					} while (0)
+#define rpc_srv_execBLOBServer(_srv) \
+	do { assert((_srv)); \
+		if (!(_srv)->srv_kill && !(_srv)->srv_blob.kill) { \
+			pthread_create(&(_srv)->srv_blob.tid, NULL, \
+					(void*(*)(void*)) rpc_srv_loopBLOBServer, (_srv)); \
+			pthread_detach((_srv)->srv_blob.tid); \
+		} \
+	} while (0)
 
 /*
+ * rpc_srv_initServer2() - Init & create layer2 RPC Server
+ *
+ * @InstID = Instance for authentication & recognition
+ * @concurentClients = Concurent clients at same time to this server
+ * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
+ * @csIface = Interface name for bind server, if NULL first interface on host
+ * return: NULL == error or !=NULL bind and created RPC server instance
+ */
+rpc_srv_t *rpc_srv_initServer2(u_char InstID, int concurentClients, int netBuf, 
+		const char *csIface);
+
+/*
  * rpc_srv_registerCall() - Register call to RPC server
  *
  * @srv = RPC Server instance
@@ -627,7 +654,7 @@ int rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_se
  * 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
@@ -678,6 +705,26 @@ rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restri
  * return: none
  */
 void rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli);
+
+
+/*
+ * 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_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);
 
 
 #endif