--- libaitrpc/inc/defs.h	2012/03/14 13:29:11	1.3.6.3
+++ libaitrpc/inc/defs.h	2013/11/14 21:44:14	1.14
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: defs.h,v 1.3.6.3 2012/03/14 13:29:11 misho Exp $
+* $Id: defs.h,v 1.14 2013/11/14 21:44:14 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, 2012
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,33 +47,41 @@ SUCH DAMAGE.
 #define __DEFS_H
 
 
-#define DEF_RPC_TIMEOUT		3
+#ifndef DEF_RPC_TIMEOUT
+#define DEF_RPC_TIMEOUT		10
+#endif
+
+#define RPC_SCHED_POLLING	1
+#define RPC_BLOB_TIMEOUT	60	/* 60 seconds */
 #define RPC_ERROR(x)		htonl((x))
 
+#ifndef STRSIZ
 #define STRSIZ			256
+#endif
+#define RPC_MIN_BUFSIZ		512
 
+#define CB_ACCEPTCLIENT		0
+#define CB_CLOSECLIENT		1
+#define CB_RXPACKET		2
+#define CB_TXPACKET		3
 
 #define BLOB_FILE		"%s/BLOB-%0X"
 
 
 #define LOGERR	do { \
 			rpc_Errno = errno; \
-			strlcpy(rpc_Error, strerror(errno), STRSIZ); \
+			strlcpy(rpc_Error, strerror(errno), sizeof rpc_Error); \
 		} while(0)
 
-#ifdef NDEBUG
-#define FTRACE()
-#define LOGGER()
-#else
-#define FTRACE()		ioTRACE(0)
-#define LOGGER(fmt, ...) 	ioLOGGER(LOG_NOTICE, (fmt), ## __VA_ARGS__)
-#endif
 
-
 extern int rpc_Errno;
-extern char rpc_Error[];
+extern char rpc_Error[STRSIZ];
 
-inline void rpc_SetErr(int eno, char *estr, ...);
+void rpc_freeCli(rpc_cli_t * __restrict);
+void rpc_freeBLOBCli(rpc_cli_t * __restrict);
+
+inline int rpc_funcs_cmp(struct tagRPCFunc *, struct tagRPCFunc *);
+AVL_PROTOTYPE(tagRPCFuncs, tagRPCFunc, func_node, rpc_funcs_cmp);
 
 
 #endif