--- libaitrpc/src/srv.c	2015/01/15 01:42:37	1.24
+++ libaitrpc/src/srv.c	2015/01/18 00:03:01	1.24.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.24 2015/01/15 01:42:37 misho Exp $
+* $Id: srv.c,v 1.24.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
@@ -63,12 +63,15 @@ static void *txUDPPacket(sched_task_t *);
 static void *rxBPFPacket(sched_task_t *);
 static void *txBPFPacket(sched_task_t *);
 
-static sched_task_func_t cbProto[SOCK_BPF + 1][4] = {
+/* SOCK_EXT */
+
+static sched_task_func_t cbProto[SOCK_MAX_SUPPORT][4] = {
 	{ acceptClients, closeClient, rxPacket, txPacket },	/* SOCK_STREAM */
 	{ acceptClients, closeClient, rxPacket, txPacket },	/* SOCK_STREAM */
 	{ rxUDPPacket, freeClient, rxUDPPacket, txUDPPacket }, 	/* SOCK_DGRAM */
 	{ NULL, NULL, NULL, NULL },				/* SOCK_RAW */
-	{ rxBPFPacket, freeClient, rxBPFPacket, txBPFPacket }	/* SOCK_BPF */
+	{ rxBPFPacket, freeClient, rxBPFPacket, txBPFPacket }, 	/* SOCK_BPF */
+	{ NULL, NULL, NULL, NULL }	/* SOCK_EXT */
 };
 
 /* Global Signal Argument when kqueue support disabled */
@@ -1242,7 +1245,7 @@ rpc_srv_initServer(u_char InstID, int concurentClients
 	rpc_srv_t *srv = NULL;
 	sockaddr_t sa = E_SOCKADDR_INIT;
 
-	if (!concurentClients || (proto < 0 || proto > SOCK_DGRAM)) {
+	if (!concurentClients || (proto < 0 || proto > SOCK_RAW)) {
 		rpc_SetErr(EINVAL, "Invalid parameters can`t init RPC server");
 		return NULL;
 	}
@@ -1605,4 +1608,72 @@ err:	/* error condition */
 	pthread_mutex_destroy(&srv->srv_funcs.mtx);
 	e_free(srv);
 	return NULL;
+}
+
+/*
+ * rpc_srv_initServerExt() - Init & create pipe RPC Server
+ *
+ * @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
+ */
+rpc_srv_t *
+rpc_srv_initServerExt(u_char InstID, int netBuf, int fd)
+{
+	rpc_srv_t *srv = NULL;
+
+#ifdef HAVE_SRANDOMDEV
+	srandomdev();
+#else
+	time_t tim;
+
+	srandom((time(&tim) ^ getpid()));
+#endif
+
+	srv = e_malloc(sizeof(rpc_srv_t));
+	if (!srv) {
+		LOGERR;
+		return NULL;
+	} else
+		memset(srv, 0, sizeof(rpc_srv_t));
+
+	srv->srv_proto = SOCK_EXT;
+	srv->srv_netbuf = netBuf;
+	srv->srv_session.sess_version = RPC_VERSION;
+	srv->srv_session.sess_instance = InstID;
+
+	srv->srv_server.cli_parent = srv;
+	srv->srv_server.cli_sock = fd;
+
+	/* init functions */
+	pthread_mutex_init(&srv->srv_funcs.mtx, NULL);
+	SLIST_INIT(&srv->srv_funcs);
+	AVL_INIT(&srv->srv_funcs);
+
+	/* init scheduler */
+	srv->srv_root = schedBegin();
+	if (!srv->srv_root) {
+		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
+		pthread_mutex_destroy(&srv->srv_funcs.mtx);
+		e_free(srv);
+		return NULL;
+	}
+
+	/* init pool for clients */
+	srv->srv_clients = array_Init(1);
+	if (!srv->srv_clients) {
+		rpc_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
+		schedEnd(&srv->srv_root);
+		pthread_mutex_destroy(&srv->srv_funcs.mtx);
+		e_free(srv);
+		return NULL;
+	}
+
+	fcntl(srv->srv_server.cli_sock, F_SETFL, 
+			fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK);
+
+	rpc_register_srvPing(srv);
+
+	return srv;
 }