--- libaitrpc/inc/aitrpc.h	2012/05/16 13:52:58	1.8.2.14
+++ libaitrpc/inc/aitrpc.h	2012/05/17 08:42:32	1.8.2.17
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.8.2.14 2012/05/16 13:52:58 misho Exp $
+* $Id: aitrpc.h,v 1.8.2.17 2012/05/17 08:42:32 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -74,16 +74,18 @@ SUCH DAMAGE.
 
 #define CALL_TAG_MAX		65535
 
-#define CALL_BLOBSHUTDOWN	65530
-#define CALL_BLOBCLIENTS	65529
-#define CALL_BLOBVARS		65528
+#define CALL_SRVPING		65534
 
-#define CALL_SRVSHUTDOWN	65534
-#define CALL_SRVCLIENTS		65533
-#define CALL_SRVCALLS		65532
-#define CALL_SRVSESSIONS	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 {
@@ -168,6 +170,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 */
@@ -220,11 +224,11 @@ typedef struct {
  * (*rpc_callback_t)() - Callback type definition for RPC call in server process
  *
  * @arg1 = current execution RPC call function
- * @arg2 = number of items in input array from call request
+ * @arg2 = RPC packet header
  * @arg3 = input array with values from RPC call execution request
  * return: -1 error or >-1 success execution
  */
-typedef int (*rpc_callback_t)(rpc_func_t *, int, array_t *);
+typedef int (*rpc_callback_t)(rpc_func_t *, struct tagRPCCall *, array_t *);
 
 
 // -----------------------------------------------------------------------
@@ -254,6 +258,13 @@ inline int rpc_chkPktSession(rpc_sess_t *p, rpc_sess_t
  */
 inline int rpc_addPktSession(rpc_sess_t *p, rpc_sess_t *s);
 /*
+ * rpc_register_srvPing() - Register ping service function
+ *
+ * @srv = RPC server instance
+ * return: -1 error or 0 ok
+ */
+inline int rpc_register_srvPing(rpc_srv_t * __restrict srv);
+/*
  * rpc_register_srvServices() - Register internal service functions
  *
  * @srv = RPC server instance
@@ -501,13 +512,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
  *