--- libaitrpc/inc/aitrpc.h	2011/11/03 15:32:21	1.5
+++ libaitrpc/inc/aitrpc.h	2012/03/12 14:53:07	1.5.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.5 2011/11/03 15:32:21 misho Exp $
+* $Id: aitrpc.h,v 1.5.2.2 2012/03/12 14:53:07 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__)
@@ -57,9 +58,10 @@ SUCH DAMAGE.
 #endif
 #include <sys/socket.h>
 #include <aitio.h>
+#include <aitsched.h>
 
 
-#define RPC_VERSION		2
+#define RPC_VERSION		3
 #define RPC_DEFPORT		2611
 
 
@@ -88,14 +90,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 +109,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 +117,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 +173,7 @@ typedef struct {
 } rpc_cli_t;
 
 
-// BLOB registration element!
+/* BLOB registration element! */
 typedef struct tagBLOB {
 	uint32_t	blob_var;
 
@@ -179,21 +184,21 @@ typedef struct tagBLOB {
 } rpc_blob_t;
 
 typedef struct {
-	rpc_sess_t	srv_session;	// RPC session registration info
-	int		srv_numcli;	// maximum concurent client connections
-	int		srv_netbuf;	// size of network buffer size
+	rpc_sess_t		srv_session;	// RPC session registration info
+	int			srv_numcli;	// maximum concurent client connections
+	int			srv_netbuf;	// size of network buffer size
 
-	rpc_cli_t	srv_server;	// RPC server socket
-	rpc_cli_t	*srv_clients;	// connected rpc client sockets
+	rpc_cli_t		srv_server;	// RPC server socket
+	rpc_cli_t		*srv_clients;	// connected rpc client sockets
 
-	rpc_func_t	*srv_funcs;	// registered functions list
+	rpc_func_t		*srv_funcs;	// registered functions list
 
-	pthread_mutex_t	srv_mtx;
-	cmd_type_t	srv_kill;
+	pthread_mutex_t		srv_mtx;
+	cmd_type_t		srv_kill;
 
 	struct {
 		cmd_type_t	state;		// BLOB server state: ==0 disable | !=0 enable
-		char		dir[UCHAR_MAX + 1];
+		char		*dir;
 
 		rpc_cli_t	server;		// BLOB server socket
 		rpc_cli_t	*clients;	// connected blob client sockets
@@ -201,7 +206,9 @@ typedef struct {
 		rpc_blob_t	*blobs;		// registered blob variables list
 
 		pthread_mutex_t	mtx;
-	} 		srv_blob;
+	} 			srv_blob;
+
+	sched_root_task_t	*srv_sched;
 } rpc_srv_t;