--- libaitrpc/inc/aitrpc.h	2014/11/26 00:49:46	1.24.2.4
+++ libaitrpc/inc/aitrpc.h	2015/01/18 00:03:01	1.25.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.24.2.4 2014/11/26 00:49:46 misho Exp $
+* $Id: aitrpc.h,v 1.25.2.3 2015/01/18 00:03:01 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
@@ -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_EXT		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,14 +409,14 @@ 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
@@ -414,14 +429,16 @@ int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
  */
 rpc_srv_t *rpc_srv_initServer2(u_char InstID, int concurentClients, int netBuf, 
 		const char *csIface);
-#define rpc_srv_endServer2(x)	rpc_srv_endServer((x))
+
 /*
- * rpc_srv_loopServer2() - Execute Main layer2 server loop and wait for clients requests
+ * rpc_srv_initServerExt() - Init & create pipe RPC Server
  *
- * @srv = RPC Server instance
- * return: -1 error or 0 ok, infinite loop ...
+ * @InstID = Instance for authentication & recognition
+ * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
+ * @fd = File descriptor
+ * return: NULL == error or !=NULL bind and created RPC server instance
  */
-int rpc_srv_loopServer2(rpc_srv_t * __restrict srv);
+rpc_srv_t *rpc_srv_initServerExt(u_char InstID, int netBuf, int fd);
 
 /*
  * rpc_srv_registerCall() - Register call to RPC server