--- libaitrpc/inc/aitrpc.h	2012/05/16 14:08:52	1.8.2.15
+++ libaitrpc/inc/aitrpc.h	2012/05/17 09:32:51	1.8.2.18
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.8.2.15 2012/05/16 14:08:52 misho Exp $
+* $Id: aitrpc.h,v 1.8.2.18 2012/05/17 09:32:51 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 */
@@ -194,6 +198,7 @@ typedef struct {
 	rpc_sess_t			srv_session;	/* RPC session registration info */
 	int				srv_netbuf;	/* size of network buffer */
 
+	pthread_t			srv_tid;	/* RPC exec pthread */
 	sched_root_task_t		*srv_root;	/* RPC server scheduler */
 	intptr_t			srv_kill;	/* Scheduler condition variable */
 
@@ -203,6 +208,7 @@ typedef struct {
 	TAILQ_HEAD(, tagRPCFunc)	srv_funcs;	/* RPC functions list */
 
 	struct {
+		pthread_t			tid;		/* BLOB exec pthread */
 		sched_root_task_t		*root;		/* BLOB server scheduler */
 		intptr_t			kill;		/* BLOB server state: ==0 disable | !=0 enable */
 
@@ -220,11 +226,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 +260,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
@@ -299,14 +312,14 @@ void rpc_srv_endServer(rpc_srv_t ** __restrict psrv);
  * return: -1 error or 0 ok, infinite loop ...
  */
 int rpc_srv_loopServer(rpc_srv_t * __restrict srv);
-#define rpc_srv_execServer(_srv, _sync)	do { assert((_srv)); pthread_t __tid; \
+#define rpc_srv_execServer(_srv, _sync)	do { assert((_srv)); \
 						if (!(_srv)->srv_kill) { \
-							pthread_create(&__tid, NULL, (void*(*)(void*)) \
+							pthread_create(&(_srv)->srv_tid, NULL, (void*(*)(void*)) \
 									rpc_srv_loopServer, (_srv)); \
 							if ((_sync)) \
-								pthread_join(__tid, (void**) (_sync)); \
+								pthread_join((_srv)->srv_tid, (void**) (_sync)); \
 							else \
-								pthread_detach(__tid); \
+								pthread_detach((_srv)->srv_tid); \
 						} } while (0)
 
 /*
@@ -332,11 +345,12 @@ void rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
  * return: -1 error or 0 ok, infinite loop ...
  */
 int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv);
-#define rpc_srv_execBLOBServer(_srv)	do { assert((_srv)); pthread_t __tid; \
+#define rpc_srv_execBLOBServer(_srv)	do { assert((_srv)); \
 						if (!(_srv)->srv_kill && !(_srv)->srv_blob.kill) { \
-							pthread_create(&__tid, NULL, (void*(*)(void*)) \
+							pthread_create(&(_srv)->srv_blob.tid, NULL, \
+									(void*(*)(void*)) \
 									rpc_srv_loopBLOBServer, (_srv)); \
-							pthread_detach(__tid); \
+							pthread_detach((_srv)->srv_blob.tid); \
 						} \
 					} while (0)