--- libaitrpc/inc/aitrpc.h	2012/05/16 09:02:47	1.8.2.10
+++ libaitrpc/inc/aitrpc.h	2012/05/16 14:08:52	1.8.2.15
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.8.2.10 2012/05/16 09:02:47 misho Exp $
+* $Id: aitrpc.h,v 1.8.2.15 2012/05/16 14:08:52 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -72,31 +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_BLOBSTATE		"rpcBLOBServerState"
-#define CALL_BLOBSTATE_ID	65527
+#define CALL_BLOBSHUTDOWN	65530
+#define CALL_BLOBCLIENTS	65529
+#define CALL_BLOBVARS		65528
 
-#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	65534
+#define CALL_SRVCLIENTS		65533
+#define CALL_SRVCALLS		65532
+#define CALL_SRVSESSIONS	65531
 
 
 /* RPC types */
 
 typedef enum {
-	disable, enable, running, kill, 	/* for blob.state */
 	ok, error, no, 				/* for blob reply */
 	get, set, unset				/* for blob request */
 } cmd_type_t;
@@ -165,7 +155,7 @@ struct tagBLOBHdr {
 	uint32_t	hdr_ret;
 	uint16_t	hdr_crc;
 	uint8_t		hdr_pad;
-} __packed;
+} __packed;			/* size == 22 bytes */
 
 /* Network RPC client & server elements */
 
@@ -511,14 +501,11 @@ 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)
- * @Timeout = RPC timeout in seconds, if =0 set default RPC timeout
- * @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 int ProcID, int netBuf, 
-		unsigned char Timeout, unsigned short family, 
+rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, unsigned char ProcID, int netBuf, 
 		const char *csHost, unsigned short Port);
 /*
  * rpc_cli_closeClient() - Close connection to RPC server and free resources
@@ -526,19 +513,18 @@ rpc_cli_t *rpc_cli_openClient(unsigned int ProgID, uns
  * @cli = RPC Client session
  * return: none
  */
-void rpc_cli_closeClient(rpc_cli_t * __restrict cli);
+void rpc_cli_closeClient(rpc_cli_t ** __restrict cli);
 /*
  * rpc_cli_execCall() - Execute RPC call
  *
  * @cli = RPC Client session
  * @noreply = We not want RPC reply
- * @csModule = Module name, if NULL self binary
- * @csFunc = Function name for execute
+ * @tag = Function tag for execution
  * @in_vars = IN RPC call array of rpc values
  * @out_vars = OUT returned array of rpc values, must be free after use with rpc_cli_freeVals()
  * return: -1 error or != -1 ok result
  */
-int rpc_cli_execCall(rpc_cli_t *cli, int noreply, const char *csModule, const char *csFunc, 
+int rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short tag, 
 		array_t * __restrict in_vars, array_t ** __restrict out_vars);
 
 
@@ -556,7 +542,7 @@ rpc_cli_t *rpc_cli_openBLOBClient(rpc_cli_t * __restri
  * @cli = BLOB Client session
  * return: none
  */
-void rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli);
+void rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli);
 
 
 #endif