--- libaitrpc/inc/aitrpc.h	2012/05/16 13:47:15	1.8.2.13
+++ libaitrpc/inc/aitrpc.h	2012/05/17 07:53:03	1.8.2.16
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.8.2.13 2012/05/16 13:47:15 misho Exp $
+* $Id: aitrpc.h,v 1.8.2.16 2012/05/17 07:53:03 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -72,25 +72,21 @@ SUCH DAMAGE.
 
 /* RPC builtin registed calls */
 
-#define CALL_MAX_ID		65535
+#define CALL_TAG_MAX		65535
 
-#define CALL_BLOBSHUTDOWN	"rpcBLOBServerShutdown"
-#define CALL_BLOBSHUTDOWN_ID	65530
-#define CALL_BLOBCLIENTS	"rpcBLOBServerClients"
-#define CALL_BLOBCLIENTS_ID	65529
-#define CALL_BLOBVARS		"rpcBLOBServerVars"
-#define CALL_BLOBVARS_ID	65528
+#define CALL_SRVPING		65535
+#define CALL_BLOBPING		65534
 
-#define CALL_SRVSHUTDOWN	"rpcServerShutdown"
-#define CALL_SRVSHUTDOWN_ID	65534
-#define CALL_SRVCLIENTS		"rpcServerClients"
-#define CALL_SRVCLIENTS_ID	65533
-#define CALL_SRVCALLS		"rpcServerCalls"
-#define CALL_SRVCALLS_ID	65532
-#define CALL_SRVSESSIONS	"rpcServerSessions"
-#define CALL_SRVSESSIONS_ID	65531
+#define CALL_SRVSHUTDOWN	65533
+#define CALL_SRVCLIENTS		65532
+#define CALL_SRVCALLS		65531
+#define CALL_SRVSESSIONS	65530
 
+#define CALL_BLOBSHUTDOWN	65529
+#define CALL_BLOBCLIENTS	65528
+#define CALL_BLOBVARS		65527
 
+
 /* RPC types */
 
 typedef enum {
@@ -175,6 +171,8 @@ typedef struct tagRPCFunc {
 	void			*func_parent;
 	TAILQ_ENTRY(tagRPCFunc)	func_node;
 } rpc_func_t;
+#define RPC_FUNC_RETVARS(x)	((x)->func_vars)
+#define RPC_FUNC_SERVER(x)	((rpc_srv_t*) (x)->func_parent)
 
 
 /* BLOB register element */
@@ -508,13 +506,12 @@ inline int rpc_cli_getBLOB(rpc_cli_t * __restrict cli,
  * @ProgID = ProgramID for RPC session request
  * @ProcID = ProcessID for RPC session request
  * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet)
- * @family = Family socket type, AF_INET or AF_INET6
  * @csHost = Host name or IP address for bind server
  * @Port = Port for bind server, if Port == 0 default port is selected
  * return: NULL == error or !=NULL connection to RPC server established
  */
 rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, unsigned char ProcID, int netBuf, 
-		unsigned short family, const char *csHost, unsigned short Port);
+		const char *csHost, unsigned short Port);
 /*
  * rpc_cli_closeClient() - Close connection to RPC server and free resources
  *