--- libaitrpc/inc/aitrpc.h	2012/05/18 15:24:33	1.8.2.24
+++ libaitrpc/inc/aitrpc.h	2012/11/19 21:50:26	1.12
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.8.2.24 2012/05/18 15:24:33 misho Exp $
+* $Id: aitrpc.h,v 1.12 2012/11/19 21:50:26 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -159,11 +159,24 @@ typedef struct tagRPCFunc {
 	ait_val_t		func_name;
 
 	void			*func_parent;
-	TAILQ_ENTRY(tagRPCFunc)	func_node;
+
+	SLIST_ENTRY(tagRPCFunc)	func_next;
+	AVL_ENTRY(tagRPCFunc)	func_node;
 } rpc_func_t;
 #define RPC_FUNC_SERVER(x)	((rpc_srv_t*) (x)->func_parent)
 
+/* Tree root node */
+typedef struct tagRPCFuncs {
+	pthread_mutex_t		mtx;
 
+	struct tagRPCFunc	*slh_first;
+	struct tagRPCFunc	*avlh_root;
+} rpc_funcs_t;
+#define RPC_FUNCS_LOCK(x)	pthread_mutex_lock(&(x)->mtx)
+#define RPC_FUNCS_UNLOCK(x)	pthread_mutex_unlock(&(x)->mtx)
+#define RPC_FUNCS_ISEMPTY(x)	AVL_EMPTY((x))
+
+
 /* BLOB register element */
 typedef struct tagBLOB {
 	uint32_t		blob_var;	/* BLOB id */
@@ -192,6 +205,7 @@ typedef struct {
 typedef struct {
 	rpc_sess_t			srv_session;	/* RPC session registration info */
 	int				srv_netbuf;	/* size of network buffer */
+	int				srv_proto;	/* Server protocol */
 
 	pthread_t			srv_tid;	/* RPC exec pthread */
 	sched_root_task_t		*srv_root;	/* RPC server scheduler */
@@ -200,7 +214,7 @@ typedef struct {
 	rpc_cli_t			srv_server;	/* RPC server socket */
 	array_t				*srv_clients;	/* connected rpc client sockets */
 
-	TAILQ_HEAD(, tagRPCFunc)	srv_funcs;	/* RPC functions list */
+	rpc_funcs_t			srv_funcs;	/* RPC functions */
 
 	struct {
 		pthread_t			tid;		/* BLOB exec pthread */
@@ -288,11 +302,12 @@ int rpc_register_blobServices(rpc_srv_t * __restrict s
  * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
  * @csHost = Host name or address for bind server, if NULL any address
  * @Port = Port for bind server, if Port == 0 default port is selected
+ * @proto = Protocol, if == 0 choose SOCK_STREAM
  * return: NULL == error or !=NULL bind and created RPC server instance
  */
 rpc_srv_t *rpc_srv_initServer(unsigned int regProgID, unsigned char regProcID, 
 		int concurentClients, int netBuf, 
-		const char *csHost, unsigned short Port);
+		const char *csHost, unsigned short Port, int proto);
 /*
  * rpc_srv_endServer() - Destroy RPC server, close all opened sockets and free resources
  *
@@ -477,7 +492,7 @@ int rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_v
  *
  * @cli = Client instance
  * @var = BLOB variable
- * @data = BLOB data, must be free after use!
+ * @data = BLOB data, must be io_free after use!
  * return: -1 error, 0 ok, 1 remote error
  */
 int rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** __restrict data);
@@ -494,7 +509,7 @@ int rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_va
  *
  * @cli = Client instance
  * @var = BLOB variable
- * @data = BLOB data, must be free after use!
+ * @data = BLOB data, must be io_free after use!
  * return: -1 error, 0 ok, >0 remote error
  */
 inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, 
@@ -511,10 +526,11 @@ inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli,
  * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
  * @csHost = Host name or IP address for bind server
  * @Port = Port for bind server, if Port == 0 default port is selected
+ * @proto = Protocol, if == 0 choose SOCK_STREAM
  * return: NULL == error or !=NULL connection to RPC server established
  */
 rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, unsigned char ProcID, int netBuf, 
-		const char *csHost, unsigned short Port);
+		const char *csHost, unsigned short Port, int proto);
 /*
  * rpc_cli_closeClient() - Close connection to RPC server and free resources
  *
@@ -534,6 +550,13 @@ void rpc_cli_closeClient(rpc_cli_t ** __restrict cli);
  */
 int rpc_cli_execCall(rpc_cli_t *cli, int noreply, unsigned short tag, 
 		array_t * __restrict in_vars, array_t ** __restrict out_vars);
+/*
+ * rpc_cli_freeCall() - Free resouce allocated by RPC call
+ *
+ * @out_vars = Returned array with variables from RPC call
+ * return: none
+ */
+inline void rpc_cli_freeCall(array_t ** __restrict out_vars);
 /*
  * rpc_cli_ping() - Ping RPC server
  *