--- libaitrpc/src/srv.c	2011/09/01 14:55:42	1.4.2.7
+++ libaitrpc/src/srv.c	2011/09/07 09:10:55	1.5.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.4.2.7 2011/09/01 14:55:42 misho Exp $
+* $Id: srv.c,v 1.5.2.2 2011/09/07 09:10:55 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -103,7 +103,7 @@ rpc_srv_dispatchCall(void *arg)
 		} else
 			rpc = (struct tagRPCCall*) buf;
 		/* check RPC packet session info */
-		if (memcmp(&rpc->call_session, &s->srv_session, sizeof rpc->call_session)) {
+		if (rpc_chkPktSession(&rpc->call_session, &s->srv_session)) {
 			rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n");
 			ret = -5;
 			goto makeReply;
@@ -111,18 +111,20 @@ rpc_srv_dispatchCall(void *arg)
 			Limit = sizeof(struct tagRPCCall);
 
 		/* RPC is OK! Go decapsulate variables ... */
-		if (rpc->call_argc) {
-			arr = io_buffer2vals(buf + Limit, s->srv_netbuf - Limit, rpc->call_argc, 1);
+		if (ntohs(rpc->call_argc)) {
+			arr = io_buffer2vals(buf + Limit, s->srv_netbuf - Limit, 
+					ntohs(rpc->call_argc), 1);
 			if (!arr) {
 				ret = -5;
 				goto makeReply;
 			}
-		}
+		} else
+			arr = NULL;
 
 		/* execute call */
 		argc = 0;
 		memcpy(&ses, &rpc->call_session, sizeof ses);
-		if (!(f = rpc_srv_getCall(s, rpc->call_tag, rpc->call_hash))) {
+		if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag), ntohl(rpc->call_hash)))) {
 			rpc_SetErr(EPROGUNAVAIL, "Error:: call not found into RPC server ...\n");
 			ret = -6;
 		} else
@@ -147,9 +149,9 @@ makeReply:
 		memcpy(&rrpc->ret_session, &ses, sizeof(rpc_sess_t));
 		rrpc->ret_tag = rpc->call_tag;
 		rrpc->ret_hash = rpc->call_hash;
-		rrpc->ret_errno = rpc_Errno;
-		rrpc->ret_retcode = ret;
-		rrpc->ret_argc = argc;
+		rrpc->ret_errno = htonl(rpc_Errno);
+		rrpc->ret_retcode = htonl(ret);
+		rrpc->ret_argc = htons(argc);
 
 		if (argc && arr) {
 			/* Go Encapsulate variables ... */
@@ -310,7 +312,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);
 }
 
 // -------------------------------------------------
@@ -448,13 +450,13 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 			shutdown(c->cli_sock, SHUT_RDWR);
 	close(srv->srv_blob.server.cli_sock);
 
+	pthread_mutex_lock(&srv->srv_blob.mtx);
 	if (srv->srv_blob.clients) {
 		free(srv->srv_blob.clients);
 		srv->srv_blob.clients = NULL;
 	}
 
 	/* detach blobs */
-	pthread_mutex_lock(&srv->srv_blob.mtx);
 	while ((f = srv->srv_blob.blobs)) {
 		srv->srv_blob.blobs = f->blob_next;
 		rpc_srv_blobFree(srv, f);
@@ -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;
@@ -496,9 +498,10 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 			if (!c->cli_sa.sa_family)
 				break;
 		if (i >= srv->srv_numcli) {
-			usleep(1000000);
 #ifdef HAVE_PTHREAD_YIELD
 			pthread_yield();
+#else
+			usleep(1000000);
 #endif
 			continue;
 		}
@@ -528,7 +531,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 			pthread_detach(c->cli_tid);
 	}
 
-	srv->srv_blob.state = disable;
+	srv->srv_blob.state = kill;
 
 	return 0;
 }
@@ -727,12 +730,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;
@@ -746,6 +749,9 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 		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;
 		return -1;
@@ -756,9 +762,10 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 			if (!c->cli_sa.sa_family)
 				break;
 		if (i >= srv->srv_numcli) {
-			usleep(1000000);
 #ifdef HAVE_PTHREAD_YIELD
 			pthread_yield();
+#else
+			usleep(1000000);
 #endif
 			continue;
 		}
@@ -821,7 +828,7 @@ rpc_srv_execCall(rpc_func_t * __restrict call, struct 
 
 	func = dlsym(dl, (char*) call->func_name);
 	if (func)
-		ret = func(call, rpc->call_argc, args);
+		ret = func(call, ntohs(rpc->call_argc), args);
 	else {
 		rpc_SetErr(ENOEXEC, "Error:: Can`t find function %s!\n", dlerror());
 		ret = -1;