--- libaitrpc/src/srv.c	2012/05/15 16:06:13	1.9.2.4
+++ libaitrpc/src/srv.c	2012/05/15 20:49:25	1.9.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: srv.c,v 1.9.2.4 2012/05/15 16:06:13 misho Exp $
+* $Id: srv.c,v 1.9.2.6 2012/05/15 20:49:25 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -52,7 +52,7 @@ closeClient(sched_task_t *task)
 	rpc_cli_t *c = TASK_ARG(task);
 	rpc_srv_t *s = c->cli_parent;
 
-	schedCancelby(s->srv_root, taskMAX, CRITERIA_FD, (void*) c->cli_sock, NULL);
+	schedCancelby(s->srv_root, taskMAX, CRITERIA_ARG, TASK_ARG(task), NULL);
 
 	/* close client socket */
 	if (TASK_VAL(task))
@@ -81,7 +81,7 @@ txPacket(sched_task_t *task)
 	memcpy(buf, TASK_DATA(task), wlen);
 
 	if (rpc->call_argc) {
-		f = rpc_srv_getCall(s, ntohs(rpc->call_tag), ntohl(rpc->call_hash));
+		f = rpc_srv_getCall(s, ntohs(rpc->call_tag));
 		if (!f) {
 			rpc->call_argc ^= rpc->call_argc;
 			rpc->call_rep.ret = RPC_ERROR(-1);
@@ -143,7 +143,7 @@ execCall(sched_task_t *task)
 		}
 	}
 
-	if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag), ntohl(rpc->call_hash)))) {
+	if (!(f = rpc_srv_getCall(s, ntohs(rpc->call_tag)))) {
 		rpc_SetErr(EPROGUNAVAIL, "Function not found at RPC server");
 		rpc->call_argc ^= rpc->call_argc;
 		rpc->call_rep.ret = RPC_ERROR(-1);
@@ -265,18 +265,19 @@ acceptClients(sched_task_t *task)
 		c->cli_parent = srv;
 	}
 
+	/* alloc empty buffer */
+	AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf);
+
 	/* accept client */
 	c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen);
 	if (c->cli_sock == -1) {
 		LOGERR;
+		AIT_FREE_VAL(&c->cli_buf);
 		io_arrayDel(srv->srv_clients, i, 42);
 		goto end;
 	} else
 		fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK);
 
-	/* alloc empty buffer */
-	AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf);
-
 	schedRead(TASK_ROOT(task), rxPacket, c, c->cli_sock, NULL, 0);
 end:
 	schedReadSelf(task);
@@ -707,7 +708,7 @@ rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
  * return: NULL == error or !=NULL bind and created RPC server instance
  */
 rpc_srv_t *
-rpc_srv_initServer(u_int regProgID, u_int regProcID, int concurentClients, 
+rpc_srv_initServer(u_int regProgID, u_char regProcID, int concurentClients, 
 		int netBuf, const char *csHost, u_short Port)
 {
 	int n = 1;
@@ -736,7 +737,6 @@ rpc_srv_initServer(u_int regProgID, u_int regProcID, i
 
 	srv->srv_netbuf = netBuf;
 	srv->srv_session.sess_version = RPC_VERSION;
-	srv->srv_session.sess_timeout = DEF_RPC_TIMEOUT;
 	srv->srv_session.sess_program = regProgID;
 	srv->srv_session.sess_process = regProcID;
 
@@ -824,6 +824,7 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 		if (c) {
 			shutdown(c->cli_sock, SHUT_RDWR);
 			close(c->cli_sock);
+
 			free(c);
 			io_arrayDel((*psrv)->srv_clients, i, 0);
 		}
@@ -836,7 +837,6 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 	TAILQ_FOREACH_SAFE(f, &(*psrv)->srv_funcs, func_node, tmp) {
 		io_freeVars(&f->func_vars);
 		AIT_FREE_VAL(&f->func_name);
-		AIT_FREE_VAL(&f->func_file);
 		free(f);
 	}
 
@@ -854,21 +854,18 @@ rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
 int
 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 {
-	/*
-	int ret;
-	*/
-
 	if (!srv) {
 		rpc_SetErr(EINVAL, "Invalid parameter can`t start RPC server");
 		return -1;
 	}
 
+	fcntl(srv->srv_server.cli_sock, F_SETFL, 
+			fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK);
+
 	if (listen(srv->srv_server.cli_sock, io_arraySize(srv->srv_clients)) == -1) {
 		LOGERR;
 		return -1;
-	} else
-		fcntl(srv->srv_server.cli_sock, F_SETFL, 
-				fcntl(srv->srv_server.cli_sock, F_GETFL) | O_NONBLOCK);
+	}
 
 	if (!schedRead(srv->srv_root, acceptClients, srv, srv->srv_server.cli_sock, NULL, 0)) {
 		rpc_SetErr(sched_GetErrno(), "%s", sched_GetError());
@@ -881,7 +878,6 @@ rpc_srv_loopServer(rpc_srv_t * __restrict srv)
 }
 
 
-#if 0
 /*
  * rpc_srv_execCall() Execute registered call from RPC server
  *
@@ -894,30 +890,13 @@ int
 rpc_srv_execCall(rpc_func_t * __restrict call, struct tagRPCCall * __restrict rpc, 
 		array_t * __restrict args)
 {
-	void *dl;
 	rpc_callback_t func;
-	int ret;
 
-	if (!call || !rpc || !call->func_parent) {
+	if (!call || !rpc || !call->func_parent || !AIT_ADDR(&call->func_name)) {
 		rpc_SetErr(EINVAL, "Invalid parameter can`t exec function");
 		return -1;
 	}
 
-	dl = dlopen(AIT_ADDR(&call->func_file), RTLD_NOW);
-	if (!dl) {
-		rpc_SetErr(ENOENT, "Can`t attach module %s!", dlerror());
-		return -1;
-	}
-
-	func = dlsym(dl, (const char*) AIT_GET_STR(&call->func_name));
-	if (func)
-		ret = func(call, ntohs(rpc->call_argc), args);
-	else {
-		rpc_SetErr(ENOEXEC, "Can`t find function %s!", dlerror());
-		ret = -1;
-	}
-
-	dlclose(dl);
-	return ret;
+	func = AIT_GET_LIKE(&call->func_name, rpc_callback_t);
+	return func(call, ntohs(rpc->call_argc), args);
 }
-#endif