--- libaitrpc/inc/aitrpc.h	2011/09/01 11:39:26	1.3.2.5
+++ libaitrpc/inc/aitrpc.h	2011/10/31 14:45:26	1.4.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.3.2.5 2011/09/01 11:39:26 misho Exp $
+* $Id: aitrpc.h,v 1.4.2.3 2011/10/31 14:45:26 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -59,7 +59,7 @@ SUCH DAMAGE.
 #include <aitio.h>
 
 
-#define RPC_VERSION		1
+#define RPC_VERSION		2
 #define RPC_DEFPORT		2611
 
 
@@ -79,9 +79,9 @@ SUCH DAMAGE.
 /* RPC types */
 
 typedef enum {
-	disable, enable, kill, 	/* for blob.state */
-	ok, error, 		/* for blob reply */
-	get, set, unset		/* for blob request */
+	disable, enable, running, kill, 	/* for blob.state */
+	ok, error, 				/* for blob reply */
+	get, set, unset				/* for blob request */
 } cmd_type_t;
 
 
@@ -116,8 +116,8 @@ typedef struct {
 typedef struct tagRPCFunc {
 	uint16_t		func_tag;
 	uint32_t		func_hash;
-	int8_t			func_file[MAXPATHLEN];
-	int8_t			func_name[UCHAR_MAX + 1];
+	char			func_file[MAXPATHLEN];
+	char			func_name[UCHAR_MAX + 1];
 
 	array_t			*func_vars;
 
@@ -159,7 +159,7 @@ struct tagBLOBHdr {
 /* Network RPC client & server elements */
 
 typedef struct {
-	struct sockaddr	cli_sa;		// host info
+	io_sockaddr_t	cli_sa;		// host info
 	int		cli_sock;	// socket fd
 	pthread_t	cli_tid;	// TID of thread
 
@@ -225,6 +225,22 @@ inline int rpc_GetErrno();
 inline const char *rpc_GetError();
 
 
+/*
+ * rpc_chkPktSession() Check session in RPC packet
+ * @p = packet session
+ * @s = active session
+ * return: -1 error or 0 ok
+ */
+inline int rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t *s);
+/*
+ * rpc_addPktSession() Add session into RPC packet
+ * @p = packet session
+ * @s = active session
+ * return: -1 error or 0 ok
+ */
+inline int rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s);
+
+
 /* RPC Server side functions */
 
 /*
@@ -242,16 +258,24 @@ rpc_srv_t *rpc_srv_initServer(u_int regProgID, u_int r
 		int netBuf, u_short family, const char *csHost, u_short Port);
 /*
  * rpc_srv_endServer() Destroy RPC server, close all opened sockets and free resources
- * @srv = RPC Server instance
+ * @psrv = RPC Server instance
  * return: none
  */
-void rpc_srv_endServer(rpc_srv_t * __restrict srv);
+void rpc_srv_endServer(rpc_srv_t ** __restrict psrv);
 /*
- * rpc_srv_execServer() Execute Main server loop and wait for clients requests
+ * rpc_srv_loopServer() Execute Main server loop and wait for clients requests
  * @srv = RPC Server instance
  * return: -1 error or 0 ok, infinite loop ...
  */
-int rpc_srv_execServer(rpc_srv_t * __restrict srv);
+int rpc_srv_loopServer(rpc_srv_t * __restrict srv);
+#define rpc_srv_execServer(_srv, _sync)	do { assert((_srv)); pthread_t __tid; \
+						pthread_create(&__tid, NULL, (void*(*)(void*)) \
+								rpc_srv_loopServer, (_srv)); \
+						if ((_sync)) \
+							pthread_join(__tid, (void**) (_sync)); \
+						else \
+							pthread_detach(__tid); \
+					} while (0)
 
 /*
  * rpc_srv_initBLOBServer() Init & create BLOB Server
@@ -268,11 +292,19 @@ int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv,
  */
 void rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv);
 /*
- * rpc_srv_execBLOBServer() Execute Main BLOB server loop and wait for clients requests
+ * rpc_srv_loopBLOB() Execute Main BLOB server loop and wait for clients requests
  * @srv = RPC Server instance
  * return: -1 error or 0 ok, infinite loop ...
  */
-int rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv);
+int rpc_srv_loopBLOB(rpc_srv_t * __restrict srv);
+#define rpc_srv_execBLOBServer(_srv)	do { assert((_srv)); pthread_t __tid; \
+						if ((_srv)->srv_blob.state == enable) { \
+							pthread_create(&__tid, NULL, (void*(*)(void*)) \
+									rpc_srv_loopBLOB, (_srv)); \
+							pthread_detach(__tid); \
+							(_srv)->srv_blob.state = running; \
+						} \
+					} while (0)
 
 /*
  * rpc_srv_registerCall() Register call to RPC server
@@ -437,7 +469,7 @@ int rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_v
  * @data = BLOB data, must be 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 ** data);
+int rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** __restrict data);
 /*
  * rpc_cli_delBLOB() Delete BLOB from server
  * @cli = Client instance
@@ -452,7 +484,7 @@ int rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_va
  * @data = BLOB data, must be 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, void ** data);
+inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** __restrict data);