--- libaitrpc/inc/aitrpc.h	2012/11/19 21:50:26	1.12
+++ libaitrpc/inc/aitrpc.h	2013/01/17 16:18:46	1.12.4.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.12 2012/11/19 21:50:26 misho Exp $
+* $Id: aitrpc.h,v 1.12.4.1 2013/01/17 16:18:46 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
@@ -58,11 +58,11 @@ SUCH DAMAGE.
 #endif
 #include <sys/socket.h>
 #include <sys/queue.h>
-#include <aitio.h>
+#include <elwix.h>
 #include <aitsched.h>
 
 
-#define RPC_VERSION		4
+#define RPC_VERSION		5
 #define RPC_DEFPORT		2611
 
 /* RPC call request flags */
@@ -191,7 +191,7 @@ typedef struct tagBLOB {
 typedef struct {
 	int		cli_id;		/* slot id */
 	int		cli_sock;	/* socket fd */
-	io_sockaddr_t	cli_sa;		/* host address */
+	sockaddr_t	cli_sa;		/* host address */
 	ait_val_t	cli_buf;	/* network buffer */
 
 	array_t		*cli_vars;	/* function return variables */
@@ -492,7 +492,7 @@ int rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_v
  *
  * @cli = Client instance
  * @var = BLOB variable
- * @data = BLOB data, must be io_free after use!
+ * @data = BLOB data, must be e_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);
@@ -509,7 +509,7 @@ int rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_va
  *
  * @cli = Client instance
  * @var = BLOB variable
- * @data = BLOB data, must be io_free after use!
+ * @data = BLOB data, must be e_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, 
@@ -545,7 +545,7 @@ void rpc_cli_closeClient(rpc_cli_t ** __restrict cli);
  * @noreply = We not want RPC reply
  * @tag = Function tag for execution
  * @in_vars = IN RPC call array of rpc values, may be NULL
- * @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with io_freeVars()
+ * @out_vars = OUT returned array of rpc values, if !=NULL must be free after use with ait_freeVars()
  * return: -1 error or != -1 ok result
  */
 int rpc_cli_execCall(rpc_cli_t *cli, int noreply, unsigned short tag,