--- libaitrpc/inc/aitrpc.h	2011/08/18 15:38:18	1.2.4.1
+++ libaitrpc/inc/aitrpc.h	2011/08/19 07:39:29	1.2.4.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitrpc.h,v 1.2.4.1 2011/08/18 15:38:18 misho Exp $
+* $Id: aitrpc.h,v 1.2.4.5 2011/08/19 07:39:29 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -87,7 +87,7 @@ typedef enum {
 } rpc_type_t;
 
 typedef enum {
-	disable, enable, 		// for blob.state
+	disable, enable, kill, 		// for blob.state
 	ok, error, 			// for blob reply
 	get, set, unset			// for blob request
 } cmd_type_t;
@@ -267,7 +267,8 @@ struct tagBLOBHdr {
 
 typedef struct {
 	struct sockaddr	cli_sa;		// host info
-	int		cli_sock;	// socket
+	int		cli_sock;	// socket fd
+	int		cli_type;	// socket type
 	pthread_t	cli_tid;	// TID of thread
 
 	void		*cli_parent;	// pointer to parent rpc_srv_t for server or to rpc_sess_t for client
@@ -294,9 +295,10 @@ typedef struct {
 	rpc_func_t	*srv_funcs;	// registered functions list
 
 	pthread_mutex_t	srv_mtx;
+	cmd_type_t	srv_kill;
 
 	struct {
-		int		state;		// BLOB server state: ==0 disable | !=0 enable
+		cmd_type_t	state;		// BLOB server state: ==0 disable | !=0 enable
 		char		dir[UCHAR_MAX + 1];
 
 		rpc_cli_t	server;		// BLOB server socket
@@ -323,10 +325,10 @@ typedef int (*rpc_callback_t)(rpc_func_t *, int, rpc_v
 
 /* Error support functions */
 
-// cli_GetErrno() Get error code of last operation
-inline int cli_GetErrno();
-// cli_GetError() Get error text of last operation
-inline const char *cli_GetError();
+// rpc_GetErrno() Get error code of last operation
+inline int rpc_GetErrno();
+// rpc_GetError() Get error text of last operation
+inline const char *rpc_GetError();
 
 
 /* RPC Server side functions */
@@ -359,11 +361,13 @@ int rpc_srv_execServer(rpc_srv_t * __restrict srv);
 
 /*
  * rpc_srv_initBLOBServer() Init & create BLOB Server
+ * @srv = RPC server instance
+ * @sockType = Socket type, like SOCK_STREAM, SOCK_DGRAM or SOCK_RAW
  * @Port = Port for bind server, if Port == 0 default port is selected
  * @diskDir = Disk place for BLOB file objects
  * return: -1 == error or 0 bind and created BLOB server instance
  */
-int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir);
+int rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, int sockType, u_short Port, const char *diskDir);
 /*
  * rpc_srv_endBLOBServer() Destroy BLOB server, close all opened sockets and free resources
  * @srv = RPC Server instance