--- libaitrpc/inc/aitrpc.h	2013/12/15 16:27:09	1.21.2.2
+++ libaitrpc/inc/aitrpc.h	2015/01/15 01:42:37	1.25
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.21.2.2 2013/12/15 16:27:09 misho Exp $
+* $Id: aitrpc.h,v 1.25 2015/01/15 01:42:37 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -247,7 +247,11 @@ typedef struct {
  */
 typedef int (*rpc_callback_t)(rpc_cli_t *, struct tagRPCCall *, array_t *);
 
+#define RPC_CALL_DEFINE(x)	int (x)(rpc_cli_t*, struct tagRPCCall*, array_t*)
+#define RPC_CALL_ARGS(arg1, arg2, arg3)	rpc_cli_t* arg1, struct tagRPCCall* arg2, array_t* arg3
+#define RPC_CALL_STDARGS	RPC_CALL_ARGS(cli, rpc, iv)
 
+
 /* ----------------------------------------------------------------------- */
 
 /* Error support functions */
@@ -356,16 +360,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
@@ -390,16 +396,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
@@ -623,7 +641,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
@@ -674,6 +692,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