--- libaitrpc/src/srv.c	2011/09/07 07:24:21	1.5
+++ libaitrpc/src/srv.c	2011/11/03 15:32:21	1.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.5 2011/09/07 07:24:21 misho Exp $
+* $Id: srv.c,v 1.6 2011/11/03 15:32:21 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -60,6 +60,8 @@ rpc_srv_dispatchCall(void *arg)
 	u_char *buf;
 	int ret, argc = 0, Limit = 0;
 	register int i;
+	uint16_t tag = 0;
+	uint32_t hash = 0;
 
 	if (!arg) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameter can`t procced RPC client ...\n");
@@ -99,20 +101,27 @@ rpc_srv_dispatchCall(void *arg)
 		if (ret < sizeof(struct tagRPCCall)) {
 			rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n");
 			ret = -4;
-			break;
+			if (s->srv_kill != kill)
+				continue;
+			else
+				break;
 		} 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;
 		} else
 			Limit = sizeof(struct tagRPCCall);
 
+		tag = rpc->call_tag;
+		hash = rpc->call_hash;
+
 		/* 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_buffer2vars(buf + Limit, s->srv_netbuf - Limit, 
+					ntohs(rpc->call_argc), 1);
 			if (!arr) {
 				ret = -5;
 				goto makeReply;
@@ -123,7 +132,7 @@ rpc_srv_dispatchCall(void *arg)
 		/* 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(tag), ntohl(hash)))) {
 			rpc_SetErr(EPROGUNAVAIL, "Error:: call not found into RPC server ...\n");
 			ret = -6;
 		} else
@@ -146,16 +155,16 @@ makeReply:
 		Limit = sizeof(struct tagRPCRet);
 
 		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_tag = tag;
+		rrpc->ret_hash = hash;
+		rrpc->ret_errno = htonl(rpc_Errno);
+		rrpc->ret_retcode = htonl(ret);
+		rrpc->ret_argc = htons(argc);
 
 		if (argc && arr) {
 			/* Go Encapsulate variables ... */
-			if ((i = io_vals2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) {
-				rpc_srv_freeVals(f);
+			if ((i = io_vars2buffer(buf + Limit, s->srv_netbuf - Limit, arr)) == -1) {
+				io_clrVars(f->func_vars);
 				argc = 0;
 				ret = -7;
 				rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n");
@@ -163,7 +172,7 @@ makeReply:
 			} else {
 				Limit += i;
 
-				rpc_srv_freeVals(f);
+				io_clrVars(f->func_vars);
 			}
 		}
 
@@ -177,7 +186,10 @@ makeReply:
 			rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, "
 					"really is %d\n", Limit, ret);
 			ret = -9;
-			break;
+			if (s->srv_kill != kill)
+				continue;
+			else
+				break;
 		}
 	} while (ret > -1 || s->srv_kill != kill);
 
@@ -243,7 +255,10 @@ rpc_srv_dispatchVars(void *arg)
 		if (ret < sizeof(struct tagBLOBHdr)) {
 			rpc_SetErr(ERPCMISMATCH, "Error:: too short BLOB packet ...\n");
 			ret = -4;
-			break;
+			if (s->srv_kill != kill && s->srv_blob.state != kill)
+				continue;
+			else
+				break;
 		} else
 			blob = (struct tagBLOBHdr*) buf;
 		/* check BLOB packet session info */
@@ -304,7 +319,10 @@ makeReply:
 			rpc_SetErr(EPROCUNAVAIL, "Error:: in send BLOB reply, should be send %d bytes, "
 					"really is %d\n", sizeof buf, ret);
 			ret = -9;
-			break;
+			if (s->srv_kill != kill && s->srv_blob.state != kill)
+				continue;
+			else
+				break;
 		}
 	} while (ret > -1 || s->srv_kill != kill);
 
@@ -327,10 +345,7 @@ int
 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_short Port, const char *diskDir)
 {
 	int n = 1;
-	struct sockaddr sa;
-	struct sockaddr_in *sin = (struct sockaddr_in*) &sa;
-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa;
-	struct sockaddr_un *sun = (struct sockaddr_un*) &sa;
+	io_sockaddr_t sa;
 
 	if (!srv) {
 		rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t init BLOB server ...\n");
@@ -340,8 +355,6 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 		rpc_SetErr(EPERM, "Warning:: Already started BLOB server!\n");
 		return 0;
 	}
-	if (!Port)
-		Port = RPC_DEFPORT + 1;
 
 	memset(&srv->srv_blob, 0, sizeof srv->srv_blob);
 	if (access(diskDir, R_OK | W_OK) == -1) {
@@ -354,25 +367,23 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 	srv->srv_blob.server.cli_parent = srv;
 
 	memcpy(&sa, &srv->srv_server.cli_sa, sizeof sa);
-	switch (srv->srv_server.cli_sa.sa_family) {
+	switch (sa.sa.sa_family) {
 		case AF_INET:
-			sin->sin_port = htons(Port);
-			memcpy(&srv->srv_blob.server.cli_sa, sin, sizeof(struct sockaddr));
+			sa.sin.sin_port = htons(Port ? Port : ntohs(sa.sin.sin_port) + 1);
 			break;
 		case AF_INET6:
-			sin6->sin6_port = htons(Port);
-			memcpy(&srv->srv_blob.server.cli_sa, sin6, sizeof(struct sockaddr));
+			sa.sin6.sin6_port = htons(Port ? Port : ntohs(sa.sin6.sin6_port) + 1);
 			break;
 		case AF_LOCAL:
-			strlcat(sun->sun_path, ".blob", sizeof sun->sun_path);
-			memcpy(&srv->srv_blob.server.cli_sa, sun, sizeof(struct sockaddr));
+			strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path);
 			break;
 		default:
 			return -1;
 	}
+	memcpy(&srv->srv_blob.server.cli_sa, &sa, sizeof sa);
 
 	/* create BLOB server socket */
-	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa_family, SOCK_STREAM, 0);
+	srv->srv_blob.server.cli_sock = socket(srv->srv_server.cli_sa.sa.sa_family, SOCK_STREAM, 0);
 	if (srv->srv_blob.server.cli_sock == -1) {
 		LOGERR;
 		return -1;
@@ -393,8 +404,8 @@ rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
 		close(srv->srv_blob.server.cli_sock);
 		return -1;
 	}
-	if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa, 
-				sizeof srv->srv_blob.server.cli_sa) == -1) {
+	if (bind(srv->srv_blob.server.cli_sock, &srv->srv_blob.server.cli_sa.sa, 
+				srv->srv_blob.server.cli_sa.sa.sa_len) == -1) {
 		LOGERR;
 		close(srv->srv_blob.server.cli_sock);
 		return -1;
@@ -445,7 +456,7 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 
 	/* close all clients connections & server socket */
 	for (i = 0, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++)
-		if (c->cli_sa.sa_family)
+		if (c->cli_sa.sa.sa_family)
 			shutdown(c->cli_sock, SHUT_RDWR);
 	close(srv->srv_blob.server.cli_sock);
 
@@ -475,7 +486,7 @@ rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
 int
 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 {
-	socklen_t salen = sizeof(struct sockaddr);
+	socklen_t salen = sizeof(io_sockaddr_t);
 	register int i;
 	rpc_cli_t *c;
 	fd_set fds;
@@ -494,7 +505,7 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 
 	while (srv->srv_blob.state != kill && srv->srv_kill != kill) {
 		for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++)
-			if (!c->cli_sa.sa_family)
+			if (!c->cli_sa.sa.sa_family)
 				break;
 		if (i >= srv->srv_numcli) {
 #ifdef HAVE_PTHREAD_YIELD
@@ -516,7 +527,7 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
 		if (!ret)
 			continue;
 
-		c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa, &salen);
+		c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen);
 		if (c->cli_sock == -1) {
 			LOGERR;
 			continue;
@@ -554,10 +565,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 	rpc_srv_t *srv = NULL;
 	int n = 1;
 	struct hostent *host = NULL;
-	struct sockaddr sa;
-	struct sockaddr_in *sin = (struct sockaddr_in*) &sa;
-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa;
-	struct sockaddr_un *sun = (struct sockaddr_un*) &sa;
+	io_sockaddr_t sa;
 
 	if (!concurentClients || !regProgID || 
 			(family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) {
@@ -576,24 +584,25 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 		}
 	}
 	memset(&sa, 0, sizeof sa);
-	sa.sa_family = family;
+	sa.sa.sa_family = family;
 	switch (family) {
 		case AF_INET:
-			sin->sin_len = sizeof(struct sockaddr_in);
-			sin->sin_port = htons(Port);
+			sa.sin.sin_len = sizeof(struct sockaddr_in);
+			sa.sin.sin_port = htons(Port);
 			if (csHost)
-				memcpy(&sin->sin_addr, host->h_addr, host->h_length);
+				memcpy(&sa.sin.sin_addr, host->h_addr, host->h_length);
 			break;
 		case AF_INET6:
-			sin6->sin6_len = sizeof(struct sockaddr_in6);
-			sin6->sin6_port = htons(Port);
+			sa.sin6.sin6_len = sizeof(struct sockaddr_in6);
+			sa.sin6.sin6_port = htons(Port);
 			if (csHost)
-				memcpy(&sin6->sin6_addr, host->h_addr, host->h_length);
+				memcpy(&sa.sin6.sin6_addr, host->h_addr, host->h_length);
 			break;
 		case AF_LOCAL:
-			sun->sun_len = sizeof(struct sockaddr_un);
+			sa.sun.sun_len = sizeof(struct sockaddr_un);
 			if (csHost)
-				strlcpy(sun->sun_path, csHost, sizeof sun->sun_path);
+				strlcpy(sa.sun.sun_path, csHost, sizeof sa.sun.sun_path);
+			unlink(sa.sun.sun_path);
 			break;
 		default:
 			rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t start RPC server ...\n");
@@ -615,18 +624,7 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 
 	srv->srv_server.cli_tid = pthread_self();
 	srv->srv_server.cli_parent = srv;
-	switch (family) {
-		case AF_INET:
-			memcpy(&srv->srv_server.cli_sa, sin, sizeof srv->srv_server.cli_sa);
-			break;
-		case AF_INET6:
-			memcpy(&srv->srv_server.cli_sa, sin6, sizeof srv->srv_server.cli_sa);
-			break;
-		case AF_LOCAL:
-			memcpy(&srv->srv_server.cli_sa, sun, sizeof srv->srv_server.cli_sa);
-			unlink(sun->sun_path);
-			break;
-	}
+	memcpy(&srv->srv_server.cli_sa, &sa, sizeof sa);
 
 	/* create server socket */
 	srv->srv_server.cli_sock = socket(family, SOCK_STREAM, 0);
@@ -654,7 +652,8 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 		free(srv);
 		return NULL;
 	}
-	if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa, sizeof srv->srv_server.cli_sa) == -1) {
+	if (bind(srv->srv_server.cli_sock, &srv->srv_server.cli_sa.sa, 
+				srv->srv_server.cli_sa.sa.sa_len) == -1) {
 		LOGERR;
 		close(srv->srv_server.cli_sock);
 		free(srv);
@@ -682,50 +681,51 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 
 /*
  * rpc_srv_endServer() Destroy RPC server, close all opened sockets and free resources
- * @srv = RPC Server instance
+ * @psrv = RPC Server instance
  * return: none
  */
 void
-rpc_srv_endServer(rpc_srv_t * __restrict srv)
+rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 {
 	rpc_cli_t *c;
 	register int i;
 	rpc_func_t *f;
 
-	if (!srv) {
+	if (!psrv || !*psrv) {
 		rpc_SetErr(EINVAL, "Error:: Can`t destroy server because parameter is null!\n");
 		return;
 	}
 
-	rpc_srv_endBLOBServer(srv);
+	rpc_srv_endBLOBServer(*psrv);
 
 	/* close all clients connections & server socket */
-	for (i = 0, c = srv->srv_clients; i < srv->srv_numcli && c; i++, c++)
-		if (c->cli_sa.sa_family) {
+	for (i = 0, c = (*psrv)->srv_clients; i < (*psrv)->srv_numcli && c; i++, c++)
+		if (c->cli_sa.sa.sa_family) {
 			shutdown(c->cli_sock, SHUT_RDWR);
 			close(c->cli_sock);
 		}
-	close(srv->srv_server.cli_sock);
+	close((*psrv)->srv_server.cli_sock);
 
-	if (srv->srv_clients) {
-		free(srv->srv_clients);
-		srv->srv_clients = NULL;
-		srv->srv_numcli = 0;
+	if ((*psrv)->srv_clients) {
+		free((*psrv)->srv_clients);
+		(*psrv)->srv_clients = NULL;
+		(*psrv)->srv_numcli = 0;
 	}
 
 	/* detach exported calls */
-	pthread_mutex_lock(&srv->srv_mtx);
-	while ((f = srv->srv_funcs)) {
-		srv->srv_funcs = f->func_next;
+	pthread_mutex_lock(&(*psrv)->srv_mtx);
+	while ((f = (*psrv)->srv_funcs)) {
+		(*psrv)->srv_funcs = f->func_next;
+		io_freeVars(&f->func_vars);
 		free(f);
 	}
-	pthread_mutex_unlock(&srv->srv_mtx);
+	pthread_mutex_unlock(&(*psrv)->srv_mtx);
 
-	while (pthread_mutex_trylock(&srv->srv_mtx) == EBUSY);
-	pthread_mutex_destroy(&srv->srv_mtx);
+	while (pthread_mutex_trylock(&(*psrv)->srv_mtx) == EBUSY);
+	pthread_mutex_destroy(&(*psrv)->srv_mtx);
 
-	free(srv);
-	srv = NULL;
+	free(*psrv);
+	*psrv = NULL;
 }
 
 /*
@@ -736,7 +736,7 @@ rpc_srv_endServer(rpc_srv_t * __restrict srv)
 int
 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 {
-	socklen_t salen = sizeof(struct sockaddr);
+	socklen_t salen = sizeof(io_sockaddr_t);
 	register int i;
 	rpc_cli_t *c;
 	fd_set fds;
@@ -758,7 +758,7 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 
 	while (srv->srv_kill != kill) {
 		for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++)
-			if (!c->cli_sa.sa_family)
+			if (!c->cli_sa.sa.sa_family)
 				break;
 		if (i >= srv->srv_numcli) {
 #ifdef HAVE_PTHREAD_YIELD
@@ -780,7 +780,7 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 		if (!ret)
 			continue;
 
-		c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa, &salen);
+		c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen);
 		if (c->cli_sock == -1) {
 			LOGERR;
 			continue;
@@ -827,7 +827,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;