--- libaitrpc/inc/aitrpc.h	2014/12/16 23:52:07	1.24.2.5
+++ 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.24.2.5 2014/12/16 23:52:07 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
@@ -416,25 +429,6 @@ 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
- *
- * @srv = RPC Server instance
- * return: -1 error or 0 ok, infinite loop ...
- */
-int rpc_srv_loopServer2(rpc_srv_t * __restrict srv);
-#define rpc_srv_execServer2(_srv, _sync) \
-	do { assert((_srv)); \
-		if (!(_srv)->srv_kill) { \
-			pthread_create(&(_srv)->srv_tid, NULL, (void*(*)(void*)) \
-					rpc_srv_loopServer2, (_srv)); \
-			if ((_sync)) \
-				pthread_join((_srv)->srv_tid, (void**) (_sync)); \
-			else \
-				pthread_detach((_srv)->srv_tid); \
-	} } while (0)
-#define rpc_srv_killServer2(x)	rpc_srv_killServer((x))
 
 /*
  * rpc_srv_registerCall() - Register call to RPC server