--- libaitrpc/inc/defs.h	2013/08/21 15:28:15	1.12.2.2
+++ 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.12.2.2 2013/08/21 15:28:15 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
@@ -47,8 +47,10 @@ SUCH DAMAGE.
 #define __DEFS_H
 
 
+#ifndef DEF_RPC_TIMEOUT
 #define DEF_RPC_TIMEOUT		10
-#define RPC_PINGDATA		4221
+#endif
+
 #define RPC_SCHED_POLLING	1
 #define RPC_BLOB_TIMEOUT	60	/* 60 seconds */
 #define RPC_ERROR(x)		htonl((x))
@@ -63,7 +65,6 @@ SUCH DAMAGE.
 #define CB_RXPACKET		2
 #define CB_TXPACKET		3
 
-
 #define BLOB_FILE		"%s/BLOB-%0X"
 
 
@@ -72,17 +73,9 @@ SUCH DAMAGE.
 			strlcpy(rpc_Error, strerror(errno), sizeof rpc_Error); \
 		} while(0)
 
-#define RPC_ISNEXTBUF(x)	(AIT_FLAG0(array((x)->cli_buf, 0, ait_val_t*)) == 1)
-#define RPC_CLR_NEXTBUF(x)	(AIT_FLAG0(array((x)->cli_buf, 0, ait_val_t*)) = 0)
-#define RPC_SET_NEXTBUF(x)	(AIT_FLAG0(array((x)->cli_buf, 0, ait_val_t*)) = 1)
 
-
 extern int rpc_Errno;
 extern char rpc_Error[STRSIZ];
-
-ait_val_t *rpc_getBufVar(rpc_cli_t * __restrict);
-u_char *rpc_getBuffer(rpc_cli_t * __restrict);
-struct tagRPCCall *rpc_getHeader(rpc_cli_t * __restrict);
 
 void rpc_freeCli(rpc_cli_t * __restrict);
 void rpc_freeBLOBCli(rpc_cli_t * __restrict);