--- libaitrpc/src/srv.c	2010/06/24 11:01:46	1.1.1.1.2.9
+++ libaitrpc/src/srv.c	2010/07/07 15:18:22	1.1.1.1.2.15
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.1.1.1.2.9 2010/06/24 11:01:46 misho Exp $
+* $Id: srv.c,v 1.1.1.1.2.15 2010/07/07 15:18:22 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -14,13 +14,13 @@ rpc_srv_dispatchCall(void *arg)
 {
 	rpc_cli_t *c = arg;
 	rpc_srv_t *s;
-	rpc_val_t *vals, *v = NULL;
+	rpc_val_t *vals = NULL, *v = NULL;
 	rpc_func_t *f;
 	struct tagRPCCall *rpc;
 	struct tagRPCRet rrpc;
 	fd_set fds;
 	u_char buf[BUFSIZ], *data;
-	int ret, argc, Limit = 0;
+	int ret, argc = 0, Limit = 0;
 	register int i;
 
 	if (!arg) {
@@ -57,7 +57,7 @@ rpc_srv_dispatchCall(void *arg)
 		if (memcmp(&rpc->call_session, &s->srv_session, sizeof rpc->call_session)) {
 			rpc_SetErr(EINVAL, "Error:: get invalid RPC session ...\n");
 			ret = -5;
-			break;
+			goto makeReply;
 		}
 		// RPC is OK! Go decapsulate variables ...
 		if (rpc->call_argc) {
@@ -74,6 +74,12 @@ rpc_srv_dispatchCall(void *arg)
 						v[i].val.string = (int8_t*) data;
 						data += v[i].val_len + 1;
 						break;
+					case blob:
+						if (s->srv_blob.state == disable) {
+							rpc_SetErr(ENOTSUP, "Error:: BLOB server is disabled\n");
+							ret = -5;
+							goto makeReply;
+						}
 					default:
 						break;
 				}
@@ -86,11 +92,12 @@ rpc_srv_dispatchCall(void *arg)
 			rpc_SetErr(EINVAL, "Error:: call not found into RPC server ...\n");
 			ret = -6;
 		} else
-			if ((ret = rpc_srv_execCall(s, f, rpc, v)) == -1)
+			if ((ret = rpc_srv_execCall(f, rpc, v)) == -1)
 				ret = -6;
 			else
 				argc = rpc_srv_getValsCall(f, &vals);
 
+makeReply:
 		memcpy(&rrpc.ret_session, &rpc->call_session, sizeof rrpc.ret_session);
 		rrpc.ret_tag = rpc->call_tag;
 		rrpc.ret_hash = rpc->call_hash;
@@ -131,6 +138,13 @@ rpc_srv_dispatchCall(void *arg)
 						data += vals[i].val_len + 1;
 						Limit += vals[i].val_len + 1;
 						break;
+					case blob:
+						if (s->srv_blob.state == disable) {
+							rpc_SetErr(ENOTSUP, "Error:: BLOB server is disabled\n");
+							rrpc.ret_retcode = ret = -5;
+							rrpc.ret_argc = 0;
+							break;
+						}
 					default:
 						break;
 				}
@@ -178,6 +192,12 @@ rpc_srv_dispatchVars(void *arg)
 
 	cx = -1;
 	do {
+		// check for disable service at this moment?
+		if (s->srv_blob.state == disable) {
+			ret = 0;
+			break;
+		}
+
 		FD_ZERO(&fds);
 		FD_SET(c->cli_sock, &fds);
 		ret = select(c->cli_sock + 1, &fds, NULL, NULL, NULL);
@@ -191,7 +211,7 @@ rpc_srv_dispatchVars(void *arg)
 			ret = -3;
 			break;
 		}
-		if (!ret) {		// receive EOF
+		if (!ret || s->srv_blob.state == disable) {	// receive EOF or disable service
 			ret = 0;
 			break;
 		}
@@ -206,7 +226,7 @@ rpc_srv_dispatchVars(void *arg)
 				blob->hdr_seq != cx) {
 			rpc_SetErr(EINVAL, "Error:: get invalid BLOB session in seq=%d...\n", blob->hdr_seq);
 			ret = -5;
-			break;
+			goto makeReply;
 		}
 		// Go to proceed packet ...
 		switch (blob->hdr_cmd) {
@@ -217,6 +237,7 @@ rpc_srv_dispatchVars(void *arg)
 					ret = -6;
 					break;
 				}
+				printf("++++++ %p\n", b);
 
 				if (rpc_srv_blobMap(s, b) != -1) {
 					ret = rpc_srv_sendBLOB(c, b);
@@ -244,7 +265,9 @@ rpc_srv_dispatchVars(void *arg)
 						blob->hdr_cmd);
 				ret = -7;
 		}
+		cx++;
 
+makeReply:
 		// Replay to client!
 		blob->hdr_cmd = ret < 0 ? error : ok;
 		blob->hdr_seq = ret;
@@ -259,6 +282,8 @@ rpc_srv_dispatchVars(void *arg)
 			ret = -9;
 			break;
 		}
+		cx = -1;
+
 	} while (ret > -1);
 
 	shutdown(c->cli_sock, SHUT_RDWR);
@@ -343,6 +368,7 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0);
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 0);
 	rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 0);
+	rpc_srv_registerCall(srv, NULL, CALL_BLOBSTATE, 1);
 	pthread_mutex_unlock(&srv->srv_mtx);
 
 	srv->srv_blob.state = enable;	// enable BLOB
@@ -367,17 +393,25 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 	} else
 		srv->srv_blob.state = disable;
 
+	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);
+
 	for (i = 0, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++)
 		if (c->cli_sa.sa_family)
 			shutdown(c->cli_sock, SHUT_RDWR);
 	close(srv->srv_blob.server.cli_sock);
 
-	if (srv->srv_blob.clients)
+	if (srv->srv_blob.clients) {
 		free(srv->srv_blob.clients);
+		srv->srv_blob.clients = NULL;
+	}
 
 	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);
 		free(f);
 	}
 	pthread_mutex_unlock(&srv->srv_blob.mtx);
@@ -400,7 +434,7 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 	int ret;
 	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
 
-	if (!srv || !srv->srv_blob.state) {
+	if (!srv || srv->srv_blob.state == disable) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t start BLOB server ...\n");
 		return -1;
 	}
@@ -410,11 +444,11 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 		return -1;
 	}
 
-	while (!rpc_Kill) {
+	while (!blob_Kill && !rpc_Kill) {
 		for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++)
 			if (!c->cli_sa.sa_family)
 				break;
-		if (c && c->cli_sa.sa_family && c->cli_parent) {
+		if (i >= srv->srv_numcli) {
 			usleep(1000000);
 			continue;
 		}
@@ -443,6 +477,8 @@ rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv)
 		}
 	}
 
+	srv->srv_blob.state = disable;
+
 	return 0;
 }
 
@@ -583,6 +619,7 @@ rpc_srv_endServer(rpc_srv_t * __restrict srv)
 
 	if (srv->srv_clients) {
 		free(srv->srv_clients);
+		srv->srv_clients = NULL;
 		srv->srv_numcli = 0;
 	}
 
@@ -628,7 +665,7 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 		for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++)
 			if (!c->cli_sa.sa_family)
 				break;
-		if (c && c->cli_sa.sa_family && c->cli_parent) {
+		if (i >= srv->srv_numcli) {
 			usleep(1000000);
 			continue;
 		}
@@ -664,21 +701,20 @@ rpc_srv_execServer(rpc_srv_t * __restrict srv)
 
 /*
  * rpc_srv_execCall() Execute registered call from RPC server
- * @data = RPC const data
  * @call = Register RPC call
  * @rpc = IN RPC call structure
  * @args = IN RPC call array of rpc values
  * return: -1 error, !=-1 ok
  */
 int
-rpc_srv_execCall(void * const data, rpc_func_t * __restrict call, 
-		struct tagRPCCall * __restrict rpc, rpc_val_t * __restrict args)
+rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, 
+		rpc_val_t * __restrict args)
 {
 	void *dl;
 	rpc_callback_t func;
 	int ret;
 
-	if (!data || !call || !rpc) {
+	if (!call || !rpc || !call->func_parent) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t exec call from RPC server ...\n");
 		return -1;
 	}
@@ -691,7 +727,7 @@ rpc_srv_execCall(void * const data, rpc_func_t * __res
 
 	func = dlsym(dl, (char*) call->func_name);
 	if (func)
-		ret = func(data, call, rpc->call_argc, args);
+		ret = func(call, rpc->call_argc, args);
 	else {
 		rpc_SetErr(ENOEXEC, "Error:: Can`t find function %s!\n", dlerror());
 		ret = -1;