--- libaitrpc/inc/aitrpc.h	2011/11/03 14:57:56	1.4.2.7
+++ libaitrpc/inc/aitrpc.h	2012/03/12 12:33:32	1.5.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.4.2.7 2011/11/03 14:57:56 misho Exp $
+* $Id: aitrpc.h,v 1.5.2.1 2012/03/12 12:33:32 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -50,6 +50,7 @@ SUCH DAMAGE.
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #if !defined(__NetBSD__)
@@ -59,7 +60,7 @@ SUCH DAMAGE.
 #include <aitio.h>
 
 
-#define RPC_VERSION		2
+#define RPC_VERSION		3
 #define RPC_DEFPORT		2611
 
 
@@ -88,14 +89,16 @@ typedef enum {
 #define RPC_CALLBACK_CHECK_INPUT(_f)	do { \
 						assert((_f)); \
 						if (!(_f)) { \
-							rpc_SetErr(22, "Error:: invalid callback parameters ...\n"); \
+							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(22, "Error:: not enough number of arguments!\n"); \
+							rpc_SetErr(EINVAL, \
+									"Not enough number of arguments!"); \
 							return -1; \
 						} \
 					} while (0)
@@ -105,6 +108,7 @@ typedef enum {
 
 typedef struct {
 	uint8_t		sess_version;
+	uint8_t		sess_timeout;
 	uint32_t	sess_program;
 	uint32_t	sess_process;
 } __packed rpc_sess_t;
@@ -112,7 +116,7 @@ typedef struct {
 
 /* Server managment RPC functions ... */
 
-// RPC function registration element!
+/* RPC function registration element! */
 typedef struct tagRPCFunc {
 	uint16_t		func_tag;
 	uint32_t		func_hash;
@@ -168,7 +172,7 @@ typedef struct {
 } rpc_cli_t;
 
 
-// BLOB registration element!
+/* BLOB registration element! */
 typedef struct tagBLOB {
 	uint32_t	blob_var;
 
@@ -351,19 +355,6 @@ int rpc_srv_execCall(rpc_func_t * __restrict call, str
 		array_t * __restrict args);
 
 
-/*
- * rpc_srv_allocVars() Allocate array for call variables
- * @call = RPC function call
- * @varnum = Number of variables, if ==0 return already allocated variables number
- * return: -1 error, !=-1 return varnum value
- */
-inline int rpc_srv_allocVars(rpc_func_t * __restrict call, int varnum);
-/*
- * rpc_srv_freeVars() Clean values from variables of array
- * @call = RPC function call
- * return: -1 error, !=-1 Returned number of cleaned variables
- */
-inline int rpc_srv_freeVars(rpc_func_t * __restrict call);
 /*
  * rpc_srv_copyVars() Copy variables for RPC call to new variable array
  * @call = RPC function call