--- libaitrpc/inc/aitrpc.h	2012/05/17 16:42:43	1.8.2.22
+++ libaitrpc/inc/aitrpc.h	2012/05/28 08:02:00	1.9.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.8.2.22 2012/05/17 16:42:43 misho Exp $
+* $Id: aitrpc.h,v 1.9.2.1 2012/05/28 08:02:00 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -94,22 +94,14 @@ typedef enum {
 } cmd_type_t;
 
 
-#define RPC_CALLBACK_CHECK_INPUT(_f)	do { \
-						assert((_f)); \
-						if (!(_f)) { \
+#define RPC_CALLBACK_CHECK_INPUT(x)	do { \
+						assert((x)); \
+						if (!(x)) { \
 							rpc_SetErr(EINVAL, \
 									"Invalid callback parameters ..."); \
 							return -1; \
 						} \
 					} while (0)
-#define RPC_CALLBACK_CHK_ARGS(_f, _n)	do { \
-						RPC_CALLBACK_CHECK_INPUT((_f)); \
-						if ((_f) && io_arraySize((_f)->func_vars) < _n) { \
-							rpc_SetErr(EINVAL, \
-									"Not enough number of arguments!"); \
-							return -1; \
-						} \
-					} while (0)
 
 
 /* RPC session identification */
@@ -146,6 +138,7 @@ struct tagRPCCall {
 	uint16_t	call_argc;
 	ait_val_t	call_argv[0];
 } __packed;			/* size == 24 bytes */
+#define RPC_CHK_NOREPLY(x)	((x)->call_req.flags & RPC_NOREPLY)
 
 /* Network BLOB packet - Header */
 
@@ -165,12 +158,9 @@ struct tagBLOBHdr {
 typedef struct tagRPCFunc {
 	ait_val_t		func_name;
 
-	array_t			*func_vars;
-
 	void			*func_parent;
 	TAILQ_ENTRY(tagRPCFunc)	func_node;
 } rpc_func_t;
-#define RPC_FUNC_RETVARS(x)	((x)->func_vars)
 #define RPC_FUNC_SERVER(x)	((rpc_srv_t*) (x)->func_parent)
 
 
@@ -191,8 +181,13 @@ typedef struct {
 	io_sockaddr_t	cli_sa;		/* host address */
 	ait_val_t	cli_buf;	/* network buffer */
 
+	array_t		*cli_vars;	/* function return variables */
+
 	void		*cli_parent;	/* pointer to parent rpc_srv_t for server or to rpc_sess_t for client */
 } rpc_cli_t;
+#define RPC_RETVARS(x)		((x)->cli_vars)
+#define RPC_SRV_SERVER(x)	((rpc_srv_t*) (x)->cli_parent)
+#define RPC_CLI_SESSION(x)	((rpc_sess_t*) (x)->cli_parent)
 
 typedef struct {
 	rpc_sess_t			srv_session;	/* RPC session registration info */
@@ -225,12 +220,12 @@ typedef struct {
 /* 
  * (*rpc_callback_t)() - Callback type definition for RPC call in server process
  *
- * @arg1 = current execution RPC call function
+ * @arg1 = RPC client
  * @arg2 = RPC packet header
  * @arg3 = input array with values from RPC call execution request
  * return: -1 error or >-1 success execution
  */
-typedef int (*rpc_callback_t)(rpc_func_t *, struct tagRPCCall *, array_t *);
+typedef int (*rpc_callback_t)(rpc_cli_t *, struct tagRPCCall *, array_t *);
 
 
 /* ----------------------------------------------------------------------- */
@@ -304,7 +299,7 @@ rpc_srv_t *rpc_srv_initServer(unsigned int regProgID, 
  * @psrv = RPC Server instance
  * return: none
  */
-void rpc_srv_endServer(rpc_srv_t ** __restrict psrv);
+inline void rpc_srv_endServer(rpc_srv_t ** __restrict psrv);
 /*
  * rpc_srv_loopServer() - Execute Main server loop and wait for clients requests
  *
@@ -360,11 +355,9 @@ int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
  * @srv = RPC Server instance
  * @tag = Function tag
  * @funcaddr = Function address
- * @args = Number of return function arguments
  * return: -1 error, 0 already registered tag or 1 register ok
  */
-int rpc_srv_registerCall(rpc_srv_t * __restrict srv, unsigned short tag, 
-		void *funcaddr, unsigned short args);
+int rpc_srv_registerCall(rpc_srv_t * __restrict srv, unsigned short tag, void *funcaddr);
 /*
  * rpc_srv_unregisterCall() - Unregister call from RPC server
  *
@@ -382,15 +375,16 @@ int rpc_srv_unregisterCall(rpc_srv_t * __restrict srv,
  */
 inline rpc_func_t *rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t tag);
 /*
- * rpc_srv_execCall() - Execute registered call from RPC server
+ * rpc_srv_execCall() Execute registered call from RPC server
  *
- * @call = Register RPC call
+ * @cli = RPC client
  * @rpc = IN RPC call structure
+ * @funcname = Execute RPC function
  * @args = IN RPC calling arguments from RPC client
  * return: -1 error, !=-1 ok
  */
-int rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, 
-		array_t * __restrict args);
+int rpc_srv_execCall(rpc_cli_t * __restrict cli, struct tagRPCCall * __restrict rpc, 
+		ait_val_t funcname, array_t * __restrict args);
 
 
 /*
@@ -483,7 +477,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);
@@ -500,7 +494,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,