--- libaitrpc/src/cli.c	2011/09/07 09:22:15	1.5.2.3
+++ libaitrpc/src/cli.c	2011/11/03 13:35:39	1.5.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.5.2.3 2011/09/07 09:22:15 misho Exp $
+* $Id: cli.c,v 1.5.2.6 2011/11/03 13:35:39 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -56,20 +56,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)) {
+			(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, "Error:: Invalid parameters can`t connect to BLOB server ...\n");
 		return NULL;
 	}
-	if (!Port)
-		Port = RPC_DEFPORT + 1;
 
 	cli = malloc(sizeof(rpc_cli_t));
 	if (!cli) {
@@ -79,23 +74,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 +107,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);
@@ -161,10 +154,7 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
 {
 	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)) {
@@ -183,24 +173,24 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
 		}
 	}
 	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");
@@ -226,17 +216,7 @@ rpc_cli_openClient(u_int ProgID, u_int ProcID, int net
 		((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 +241,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);
@@ -341,12 +321,12 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 	/* prepare RPC call */
 	rpc = (struct tagRPCCall*) buf;
 	rpc_addPktSession(&rpc->call_session, cli->cli_parent);
-	rpc->call_argc = htons(in_vars ? io_arraySize(in_vars) : 0);
+	rpc->call_argc = htons(io_arraySize(in_vars));
 	rpc->call_tag = tag = htons(crcFletcher16((u_short*) str, sizeof str / 2));
 	rpc->call_hash = hash = htonl(hash_fnv((char*) str, sizeof str));
 	Limit = sizeof(struct tagRPCCall);
 
-	if (in_vars && io_arraySize(in_vars)) {
+	if (io_arraySize(in_vars)) {
 		/* marshaling variables */
 		ret = io_vals2buffer(buf + Limit, cli->cli_netbuf - Limit, in_vars);
 		if (ret == -1) {
@@ -405,7 +385,6 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 	} else
 		Limit = sizeof(struct tagRPCRet);
 	if (rrpc->ret_tag != tag || rrpc->ret_hash != hash) {
-		printf("tag=%x/%x hash=%x/%x\n", rrpc->ret_tag, tag, rrpc->ret_hash, hash);
 		rpc_SetErr(ERPCMISMATCH, "Error:: get wrong RPC reply ...\n");
 		free(buf);
 		return -5;
@@ -439,12 +418,12 @@ rpc_cli_execCall(rpc_cli_t *cli, const char *csModule,
 }
 
 /*
- * rpc_cli_freeVals() Free ait_val_t array returned from RPC call
+ * rpc_cli_freeVars() Free ait_val_t array returned from RPC call
  * @vars = Variable array
  * return: none
  */
 inline void
-rpc_cli_freeVals(array_t ** __restrict vars)
+rpc_cli_freeVars(array_t ** __restrict vars)
 {
 	register int i;
 
@@ -460,12 +439,12 @@ rpc_cli_freeVals(array_t ** __restrict vars)
 }
 
 /*
- * rpc_cli_allocVals() Allocate ait_val_t array for RPC call
+ * rpc_cli_allocVars() 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)
+rpc_cli_allocVars(u_short args)
 {
 	array_t *arr;
 	register int i;
@@ -481,7 +460,7 @@ rpc_cli_allocVals(u_short args)
 		v = malloc(sizeof(ait_val_t));
 		if (!v) {
 			LOGERR;
-			rpc_cli_freeVals(&arr);
+			rpc_cli_freeVars(&arr);
 			return NULL;
 		} else {
 			memset(v, 0, sizeof(ait_val_t));