--- libaitrpc/src/srv.c	2011/09/01 14:28:41	1.4.2.6
+++ libaitrpc/src/srv.c	2011/09/03 12:39:27	1.4.2.8
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.4.2.6 2011/09/01 14:28:41 misho Exp $
+* $Id: srv.c,v 1.4.2.8 2011/09/03 12:39:27 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -97,14 +97,14 @@ rpc_srv_dispatchCall(void *arg)
 			break;
 		}
 		if (ret < sizeof(struct tagRPCCall)) {
-			rpc_SetErr(EMSGSIZE, "Error:: too short RPC packet ...\n");
+			rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n");
 			ret = -4;
 			break;
 		} else
 			rpc = (struct tagRPCCall*) buf;
 		/* check RPC packet session info */
 		if (memcmp(&rpc->call_session, &s->srv_session, sizeof rpc->call_session)) {
-			rpc_SetErr(EINVAL, "Error:: get invalid RPC session ...\n");
+			rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n");
 			ret = -5;
 			goto makeReply;
 		} else
@@ -123,7 +123,7 @@ rpc_srv_dispatchCall(void *arg)
 		argc = 0;
 		memcpy(&ses, &rpc->call_session, sizeof ses);
 		if (!(f = rpc_srv_getCall(s, rpc->call_tag, rpc->call_hash))) {
-			rpc_SetErr(EINVAL, "Error:: call not found into RPC server ...\n");
+			rpc_SetErr(EPROGUNAVAIL, "Error:: call not found into RPC server ...\n");
 			ret = -6;
 		} else
 			if ((ret = rpc_srv_execCall(f, rpc, arr)) == -1)
@@ -157,7 +157,7 @@ makeReply:
 				rpc_srv_freeVals(f);
 				argc = 0;
 				ret = -7;
-				rpc_SetErr(EMSGSIZE, "Error:: in prepare RPC packet values (-7) ...\n");
+				rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n");
 				goto makeReply;
 			} else {
 				Limit += i;
@@ -173,7 +173,7 @@ makeReply:
 			break;
 		}
 		if (ret != Limit) {
-			rpc_SetErr(ECANCELED, "Error:: in send RPC request, should be send %d bytes, "
+			rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, "
 					"really is %d\n", Limit, ret);
 			ret = -9;
 			break;
@@ -240,7 +240,7 @@ rpc_srv_dispatchVars(void *arg)
 			break;
 		}
 		if (ret < sizeof(struct tagBLOBHdr)) {
-			rpc_SetErr(EMSGSIZE, "Error:: too short BLOB packet ...\n");
+			rpc_SetErr(ERPCMISMATCH, "Error:: too short BLOB packet ...\n");
 			ret = -4;
 			break;
 		} else
@@ -284,7 +284,7 @@ rpc_srv_dispatchVars(void *arg)
 					ret = -7;
 				break;
 			default:
-				rpc_SetErr(EINVAL, "Error:: unsupported BLOB command (%d)...\n", 
+				rpc_SetErr(EPROCUNAVAIL, "Error:: unsupported BLOB command (%d)...\n", 
 						blob->hdr_cmd);
 				ret = -7;
 		}
@@ -300,7 +300,7 @@ makeReply:
 			break;
 		}
 		if (ret != sizeof buf) {
-			rpc_SetErr(ECANCELED, "Error:: in send BLOB reply, should be send %d bytes, "
+			rpc_SetErr(EPROCUNAVAIL, "Error:: in send BLOB reply, should be send %d bytes, "
 					"really is %d\n", sizeof buf, ret);
 			ret = -9;
 			break;
@@ -310,7 +310,7 @@ makeReply:
 	shutdown(c->cli_sock, SHUT_RDWR);
 	close(c->cli_sock);
 	memset(c, 0, sizeof(rpc_cli_t));
-	return (void*) (long)ret;
+	return (void*) ((long)ret);
 }
 
 // -------------------------------------------------
@@ -437,10 +437,12 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 	} else
 		srv->srv_blob.state = kill;
 
+	/*
 	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN);
 	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBCLIENTS);
 	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS);
 	rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSTATE);
+	*/
 
 	/* close all clients connections & server socket */
 	for (i = 0, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++)
@@ -467,12 +469,12 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 }
 
 /*
- * rpc_srv_execBLOBServer() Execute Main BLOB server loop and wait for clients requests
+ * rpc_srv_loopBLOB() Execute Main BLOB server loop and wait for clients requests
  * @srv = RPC Server instance
  * return: -1 error or 0 ok, infinite loop ...
  */
 int
-rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
+rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 {
 	socklen_t salen = sizeof(struct sockaddr);
 	register int i;
@@ -727,12 +729,12 @@ rpc_srv_endServer(rpc_srv_t * __restrict srv)
 }
 
 /*
- * rpc_srv_execServer() Execute Main server loop and wait for clients requests
+ * rpc_srv_loopServer() Execute Main server loop and wait for clients requests
  * @srv = RPC Server instance
  * return: -1 error or 0 ok, infinite loop ...
  */
 int
-rpc_srv_execServer(rpc_srv_t * __restrict srv)
+rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 {
 	socklen_t salen = sizeof(struct sockaddr);
 	register int i;
@@ -745,6 +747,9 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start RPC server ...\n");
 		return -1;
 	}
+
+	/* activate BLOB server worker if srv->srv_blob.state == enable */
+	rpc_srv_execBLOBServer(srv);
 
 	if (listen(srv->srv_server.cli_sock, SOMAXCONN) == -1) {
 		LOGERR;