--- libaitrpc/src/cli.c	2011/09/07 07:24:21	1.5
+++ libaitrpc/src/cli.c	2012/05/14 08:39:05	1.9
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.5 2011/09/07 07:24:21 misho Exp $
+* $Id: cli.c,v 1.9 2012/05/14 08:39:05 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,7 +47,8 @@ SUCH DAMAGE.
 
 
 /*
- * rpc_cli_openBLOBClient() Connect to BLOB Server
+ * rpc_cli_openBLOBClient() - Connect to BLOB Server
+ *
  * @rpccli = RPC Client session
  * @Port = Port for bind server, if Port == 0 default port is selected
  * return: NULL == error or !=NULL connection to BLOB server established
@@ -56,20 +57,15 @@ rpc_cli_t *
 rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, u_short Port)
 {
 	rpc_cli_t *cli = 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;
 	int n;
 
 	if (!rpccli || 
-			(rpccli->cli_sa.sa_family != AF_INET && rpccli->cli_sa.sa_family != AF_INET6 && 
-			 rpccli->cli_sa.sa_family != AF_LOCAL)) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to BLOB server ...\n");
+			(rpccli->cli_sa.sa.sa_family != AF_INET && rpccli->cli_sa.sa.sa_family != AF_INET6 && 
+			 rpccli->cli_sa.sa.sa_family != AF_LOCAL)) {
+		rpc_SetErr(EINVAL, "Invalid parameters can`t connect to BLOB server");
 		return NULL;
 	}
-	if (!Port)
-		Port = RPC_DEFPORT + 1;
 
 	cli = malloc(sizeof(rpc_cli_t));
 	if (!cli) {
@@ -79,23 +75,21 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 		memcpy(cli, rpccli, sizeof(rpc_cli_t));
 
 	memcpy(&sa, &rpccli->cli_sa, sizeof sa);
-	switch (rpccli->cli_sa.sa_family) {
+	switch (sa.sa.sa_family) {
 		case AF_INET:
-			sin->sin_port = htons(Port);
-			memcpy(&cli->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(&cli->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(&cli->cli_sa, sun, sizeof(struct sockaddr));
+			strlcat(sa.sun.sun_path, ".blob", sizeof sa.sun.sun_path);
 			break;
 	}
+	memcpy(&cli->cli_sa, &sa, sizeof sa);
 
 	/* connect to BLOB server */
-	cli->cli_sock = socket(cli->cli_sa.sa_family, SOCK_STREAM, 0);
+	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0);
 	if (cli->cli_sock == -1) {
 		LOGERR;
 		free(cli);
@@ -114,7 +108,7 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 		free(cli);
 		return NULL;
 	}
-	if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -1) {
+	if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {
 		LOGERR;
 		close(cli->cli_sock);
 		free(cli);
@@ -125,7 +119,8 @@ rpc_cli_openBLOBClient(rpc_cli_t * __restrict rpccli, 
 }
 
 /*
- * rpc_cli_closeBLOBClient() Close connection to BLOB server and free resources
+ * rpc_cli_closeBLOBClient() - Close connection to BLOB server and free resources
+ *
  * @cli = BLOB Client session
  * return: none
  */
@@ -133,7 +128,7 @@ void
 rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli)
 {
 	if (!cli) {
-		rpc_SetErr(EINVAL, "Error:: Can`t close connection because parameter is null!\n");
+		rpc_SetErr(EINVAL, "Can`t close connection because parameter is null!");
 		return;
 	}
 
@@ -147,63 +142,65 @@ rpc_cli_closeBLOBClient(rpc_cli_t * __restrict cli)
 // --------------------------------------------------------------
 
 /*
- * rpc_cli_openClient() Connect to RPC Server
+ * rpc_cli_openClient() - Connect to RPC Server
+ *
  * @ProgID = ProgramID for RPC session request
  * @ProcID = ProcessID for RPC session request
  * @netBuf = Network buffer length, if =0 == BUFSIZ (also meaning max RPC packet)
+ * @Timeout = RPC timeout in seconds, if =0 set default RPC timeout
  * @family = Family socket type, AF_INET or AF_INET6
  * @csHost = Host name or IP address for bind server
  * @Port = Port for bind server, if Port == 0 default port is selected
  * return: NULL == error or !=NULL connection to RPC server established
  */
 rpc_cli_t *
-rpc_cli_openClient(u_int ProgID, u_int ProcID, int netBuf, u_short family, const char *csHost, u_short Port)
+rpc_cli_openClient(u_int ProgID, u_int ProcID, int netBuf, u_char Timeout, 
+		u_short family, const char *csHost, u_short Port)
 {
 	rpc_cli_t *cli = NULL;
 	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;
 	int n;
 
 	if (!csHost || (family != AF_INET && family != AF_INET6 && family != AF_LOCAL)) {
-		rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n");
+		rpc_SetErr(EINVAL, "Invalid parameters can`t connect to RPC server ...");
 		return NULL;
 	}
 	if (!Port)
 		Port = RPC_DEFPORT;
 	if (!netBuf)
 		netBuf = BUFSIZ;
+	if (!Timeout)
+		Timeout = DEF_RPC_TIMEOUT;
 	if (csHost && family != AF_LOCAL) {
 		host = gethostbyname2(csHost, family);
 		if (!host) {
-			rpc_SetErr(h_errno, "Error:: %s\n", hstrerror(h_errno));
+			rpc_SetErr(h_errno, "%s", hstrerror(h_errno));
 			return NULL;
 		}
 	}
 	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);
 			break;
 		default:
-			rpc_SetErr(EINVAL, "Error:: Invalid parameters can`t connect to RPC server ...\n");
+			rpc_SetErr(EINVAL, "Invalid parameters can`t connect to RPC server ...");
 			return NULL;
 	}
 
@@ -222,21 +219,12 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
 		return NULL;
 	} else {
 		((rpc_sess_t*) cli->cli_parent)->sess_version = RPC_VERSION;
+		((rpc_sess_t*) cli->cli_parent)->sess_timeout = Timeout;
 		((rpc_sess_t*) cli->cli_parent)->sess_program = ProgID;
 		((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID;
 	}
 
-	switch (family) {
-		case AF_INET:
-			memcpy(&cli->cli_sa, sin, sizeof cli->cli_sa);
-			break;
-		case AF_INET6:
-			memcpy(&cli->cli_sa, sin6, sizeof cli->cli_sa);
-			break;
-		case AF_LOCAL:
-			memcpy(&cli->cli_sa, sun, sizeof cli->cli_sa);
-			break;
-	}
+	memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa);
 
 	/* connect to RPC server */
 	cli->cli_sock = socket(family, SOCK_STREAM, 0);
@@ -261,7 +249,7 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
 		free(cli);
 		return NULL;
 	}
-	if (connect(cli->cli_sock, &cli->cli_sa, sizeof cli->cli_sa) == -1) {
+	if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {
 		LOGERR;
 		close(cli->cli_sock);
 		free(cli->cli_parent);
@@ -273,7 +261,8 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
 }
 
 /*
- * rpc_cli_closeClient() Close connection to RPC server and free resources
+ * rpc_cli_closeClient() - Close connection to RPC server and free resources
+ *
  * @cli = RPC Client session
  * return: none
  */
@@ -281,7 +270,7 @@ void
 rpc_cli_closeClient(rpc_cli_t * __restrict cli)
 {
 	if (!cli) {
-		rpc_SetErr(EINVAL, "Error:: Can`t close connection because parameter is null!\n");
+		rpc_SetErr(EINVAL, "Can`t close connection because parameter is null!");
 		return;
 	}
 
@@ -296,8 +285,10 @@ rpc_cli_closeClient(rpc_cli_t * __restrict cli)
 
 
 /*
- * rpc_cli_execCall() Execute RPC call
+ * rpc_cli_execCall() - Execute RPC call
+ *
  * @cli = RPC Client session
+ * @noreply = We not want RPC reply
  * @csModule = Module name, if NULL self binary
  * @csFunc = Function name for execute
  * @in_vars = IN RPC call array of rpc values
@@ -305,18 +296,19 @@ rpc_cli_closeClient(rpc_cli_t * __restrict cli)
  * return: -1 error or != -1 ok result
  */
 int
-rpc_cli_execCall(rpc_cli_t *cli, const char *csModule, const char *csFunc, 
+rpc_cli_execCall(rpc_cli_t *cli, int noreply, const char *csModule, const char *csFunc, 
 		array_t * __restrict in_vars, array_t ** __restrict out_vars)
 {
-	fd_set fds;
-	u_char *buf, str[MAXPATHLEN + UCHAR_MAX + 1];
+	u_char *buf;
+	rpc_func_t func;
 	struct tagRPCCall *rpc;
-	struct tagRPCRet *rrpc = NULL;
-	int ret = 0, Limit = 0;
-	struct timeval tv = { DEF_RPC_TIMEOUT, 0 };
+	int ret = 0, wlen = sizeof(struct tagRPCCall);
+	uint16_t tag, crc;
+	uint32_t hash;
+	struct pollfd pfd;
 
 	if (!cli || !csFunc) {
-		rpc_SetErr(EINVAL, "Error:: Can`t execute call because parameter is null or invalid!\n");
+		rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!");
 		return -1;
 	}
 	if (out_vars)
@@ -329,52 +321,69 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 	} else
 		memset(buf, 0, cli->cli_netbuf);
 
-	/* build RPC call string for hash */
-	memset(str, 0, sizeof str);
-	if (csModule)
-		strlcpy((char*) str, csModule, sizeof str);
-	strlcat((char*) str, "__", sizeof str);
-	strlcat((char*) str, csFunc, sizeof str);
+	/* calculate hashes */
+	if (rpc_calcHashes(&func, csModule, csFunc) == -1)
+		return -1;
+	else {
+		tag = htons(func.func_tag);
+		hash = htonl(func.func_hash);
+		AIT_FREE_VAL(&func.func_name);
+		AIT_FREE_VAL(&func.func_file);
+	}
 
 	/* prepare RPC call */
 	rpc = (struct tagRPCCall*) buf;
-	memcpy(&rpc->call_session, cli->cli_parent, sizeof rpc->call_session);
-	rpc->call_argc = in_vars ? io_arraySize(in_vars) : 0;
-	rpc->call_tag = crcFletcher16((u_short*) str, sizeof str / 2);
-	rpc->call_hash = hash_fnv((char*) str, sizeof str);
-	Limit = sizeof(struct tagRPCCall);
+	rpc_addPktSession(&rpc->call_session, cli->cli_parent);
+	rpc->call_argc = htons(io_arraySize(in_vars));
+	rpc->call_tag = tag;
+	rpc->call_hash = hash;
 
-	if (in_vars && io_arraySize(in_vars)) {
+	/* set reply */
+	rpc->call_req.flags = noreply ? RPC_NOREPLY : RPC_REPLY;
+
+	if (io_arraySize(in_vars)) {
 		/* marshaling variables */
-		ret = io_vals2buffer(buf + Limit, cli->cli_netbuf - Limit, in_vars);
+		ret = io_vars2buffer(buf + wlen, cli->cli_netbuf - wlen, in_vars);
 		if (ret == -1) {
-			rpc_SetErr(EBADRPC, "Error:: in prepare RPC packet values (-7) ...\n");
+			rpc_SetErr(EBADRPC, "Failed to prepare RPC packet values");
 			free(buf);
-			return -7;
+			return -1;
 		} else
-			Limit += ret;
+			wlen += ret;
 	}
 
-	if ((ret = send(cli->cli_sock, buf, Limit, 0)) == -1) {
+	rpc->call_len = htons(wlen);
+
+	/* calculate CRC */
+	rpc->call_crc ^= rpc->call_crc;
+	rpc->call_crc = htons(crcFletcher16((u_short*) buf, wlen / 2));
+
+	if ((ret = send(cli->cli_sock, buf, wlen, 0)) == -1) {
 		LOGERR;
 		free(buf);
 		return -1;
+	} else if (ret != wlen) {
+		rpc_SetErr(EPROCUNAVAIL, "RPC request, should be send %d bytes, "
+				"really sended %d bytes", wlen, ret);
+		free(buf);
+		return -1;
 	}
-	if (ret != Limit) {
-		rpc_SetErr(EPROCUNAVAIL, "Error:: in send RPC request, should be send %d bytes, really is %d\n", 
-				Limit, ret);
+
+	if (noreply) {
+		/* we not want reply */
 		free(buf);
-		return -9;
+		return 0;
 	}
 
 	/* reply from RPC server */
-	FD_ZERO(&fds);
-	FD_SET(cli->cli_sock, &fds);
-	if ((ret = select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) < 1) {
+	pfd.fd = cli->cli_sock;
+	pfd.events = POLLIN | POLLPRI;
+	if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) == -1 || 
+			pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) {
 		if (ret)
 			LOGERR;
 		else
-			rpc_SetErr(ETIMEDOUT, "Error:: timeout, no return from RPC server?\n");
+			rpc_SetErr(ETIMEDOUT, "Timeout, no return from RPC server?");
 
 		free(buf);
 		return -1;
@@ -383,101 +392,63 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 	if ((ret = recv(cli->cli_sock, buf, cli->cli_netbuf, 0)) == -1) {
 		LOGERR;
 		free(buf);
-		return -3;
+		return -1;
 	}
 	if (!ret) {	/* receive EOF! */
 		free(buf);
 		return 0;
 	}
-	if (ret < sizeof(struct tagRPCRet)) {
-		rpc_SetErr(ERPCMISMATCH, "Error:: too short RPC packet ...\n");
+	if (ret < sizeof(struct tagRPCCall)) {
+		rpc_SetErr(ERPCMISMATCH, "Too short RPC packet ...");
 		free(buf);
-		return -4;
-	} else
-		rrpc = (struct tagRPCRet*) buf;
+		return -1;
+	}
+
+	/* calculate CRC */
+	crc = ntohs(rpc->call_crc);
+	rpc->call_crc ^= rpc->call_crc;
+	if (crc != crcFletcher16((u_short*) buf, ret / 2)) {
+		rpc_SetErr(ERPCMISMATCH, "Bad CRC RPC packet");
+		free(buf);
+		return -1;
+	}
+
 	/* check RPC packet session info */
-	if (memcmp(&rrpc->ret_session, cli->cli_parent, sizeof rrpc->ret_session)) {
-		rpc_SetErr(ERPCMISMATCH, "Error:: get invalid RPC session ...\n");
+	if (rpc_chkPktSession(&rpc->call_session, cli->cli_parent)) {
+		rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session ...");
 		free(buf);
-		return -5;
+		return -1;
 	} else
-		Limit = sizeof(struct tagRPCRet);
-	if (rrpc->ret_retcode < 0 && rrpc->ret_errno) {
-		rpc_SetErr(rrpc->ret_errno, "Error::Server side: retcode=%d #%d %s\n", 
-				rrpc->ret_retcode, rrpc->ret_errno, strerror(rrpc->ret_errno));
+		wlen = sizeof(struct tagRPCCall);
+	if (rpc->call_tag != tag || rpc->call_hash != hash) {
+		rpc_SetErr(ERPCMISMATCH, "Get wrong RPC reply ...");
 		free(buf);
-		return -6;
+		return -1;
 	}
-	if (rrpc->ret_argc * sizeof(ait_val_t) > cli->cli_netbuf - Limit) {
-		rpc_SetErr(EMSGSIZE, "Error:: reply RPC packet is too long ...\n");
+	if (ntohl(rpc->call_rep.ret) < 0 && ntohl(rpc->call_rep.eno)) {
+		rpc_SetErr(ntohl(rpc->call_rep.eno), "Server side: retcode=%d #%d %s", 
+				ntohl(rpc->call_rep.ret), ntohl(rpc->call_rep.eno), 
+				strerror(ntohl(rpc->call_rep.eno)));
 		free(buf);
-		return -7;
+		return -1;
 	}
+	if (ntohs(rpc->call_argc) * sizeof(ait_val_t) > cli->cli_netbuf - wlen) {
+		rpc_SetErr(EMSGSIZE, "Reply RPC packet is too long ...");
+		free(buf);
+		return -1;
+	}
 
 	/* RPC is OK! Go de-marshaling variables ... */
-	if (rrpc->ret_argc) {
-		*out_vars = io_buffer2vals(buf + Limit, cli->cli_netbuf - Limit, rrpc->ret_argc, 0);
+	if (ntohs(rpc->call_argc)) {
+		*out_vars = io_buffer2vars(buf + wlen, cli->cli_netbuf - wlen, 
+				ntohs(rpc->call_argc), 0);
 		if (!*out_vars) {
 			free(buf);
 			return -1;
 		}
 	}
 
-	ret = rrpc->ret_retcode;
+	ret = ntohl(rpc->call_rep.ret);
 	free(buf);
 	return ret;
-}
-
-/*
- * rpc_cli_freeVals() Free ait_val_t array returned from RPC call
- * @vars = Variable array
- * return: none
- */
-inline void
-rpc_cli_freeVals(array_t ** __restrict vars)
-{
-	register int i;
-
-	if (!vars || !*vars)
-		return;
-
-	for (i = 0; i < io_arraySize(*vars); i++)
-		if (io_arrayGet(*vars, i))
-			AIT_FREE_VAL(io_array(*vars, i, ait_val_t*));
-
-	io_arrayFree(*vars);
-	io_arrayDestroy(vars);
-}
-
-/*
- * rpc_cli_allocVals() Allocate ait_val_t array for RPC call
- * @args = Number of arguments
- * return: =NULL error or !=NULL allocated array
- */
-inline array_t *
-rpc_cli_allocVals(u_short args)
-{
-	array_t *arr;
-	register int i;
-	ait_val_t *v;
-
-	if (!args)
-		return NULL;
-
-	if (!(arr = io_arrayInit(args)))
-		return NULL;
-
-	for (i = 0; i < io_arraySize(arr); i++) {
-		v = malloc(sizeof(ait_val_t));
-		if (!v) {
-			LOGERR;
-			rpc_cli_freeVals(&arr);
-			return NULL;
-		} else {
-			memset(v, 0, sizeof(ait_val_t));
-			io_arraySet(arr, i, v);
-		}
-	}
-
-	return arr;
 }