--- libaitrpc/src/cli.c	2012/11/13 09:22:10	1.12
+++ libaitrpc/src/cli.c	2012/11/19 12:43:21	1.12.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.12 2012/11/13 09:22:10 misho Exp $
+* $Id: cli.c,v 1.12.2.1 2012/11/19 12:43:21 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -139,10 +139,12 @@ rpc_cli_closeBLOBClient(rpc_cli_t ** __restrict cli)
  * @netBuf = Network buffer length (min:512 bytes), if =0 == BUFSIZ (also meaning max RPC packet)
  * @csHost = Host name or IP address for bind server
  * @Port = Port for bind server, if Port == 0 default port is selected
+ * @proto = Protocol, if == 0 choose SOCK_STREAM
  * return: NULL == error or !=NULL connection to RPC server established
  */
 rpc_cli_t *
-rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, u_short Port)
+rpc_cli_openClient(u_int ProgID, u_char ProcID, int netBuf, const char *csHost, 
+		u_short Port, int proto)
 {
 	rpc_cli_t *cli = NULL;
 	io_sockaddr_t sa = IO_SOCKADDR_INIT;
@@ -151,6 +153,8 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 		return NULL;
 	if (!Port)
 		Port = RPC_DEFPORT;
+	if (!proto)
+		proto = SOCK_STREAM;
 	if (netBuf < RPC_MIN_BUFSIZ)
 		netBuf = BUFSIZ;
 	else
@@ -183,11 +187,12 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 		((rpc_sess_t*) cli->cli_parent)->sess_process = ProcID;
 	}
 
+	cli->cli_id = proto;
 	memcpy(&cli->cli_sa, &sa, sizeof cli->cli_sa);
 	AIT_SET_BUF2(&cli->cli_buf, 0, netBuf);
 
 	/* connect to RPC server */
-	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, SOCK_STREAM, 0);
+	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0);
 	if (cli->cli_sock == -1) {
 		LOGERR;
 		AIT_FREE_VAL(&cli->cli_buf);
@@ -195,16 +200,17 @@ rpc_cli_openClient(u_int ProgID, u_char ProcID, int ne
 		io_free(cli);
 		return NULL;
 	}
-	if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {
-		LOGERR;
-		AIT_FREE_VAL(&cli->cli_buf);
-		close(cli->cli_sock);
-		io_free(cli->cli_parent);
-		io_free(cli);
-		return NULL;
-	} else
-		fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
+	if (cli->cli_id == SOCK_STREAM)
+		if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {
+			LOGERR;
+			AIT_FREE_VAL(&cli->cli_buf);
+			close(cli->cli_sock);
+			io_free(cli->cli_parent);
+			io_free(cli);
+			return NULL;
+		}
 
+	fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
 	return cli;
 }
 
@@ -220,7 +226,8 @@ rpc_cli_closeClient(rpc_cli_t ** __restrict cli)
 	if (!cli || !*cli)
 		return;
 
-	shutdown((*cli)->cli_sock, SHUT_RDWR);
+	if ((*cli)->cli_id == SOCK_STREAM)
+		shutdown((*cli)->cli_sock, SHUT_RDWR);
 	close((*cli)->cli_sock);
 
 	AIT_FREE_VAL(&(*cli)->cli_buf);
@@ -252,6 +259,8 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 	uint16_t crc;
 	u_char *buf;
 	struct pollfd pfd;
+	io_sockaddr_t sa;
+	socklen_t salen;
 
 	if (!cli) {
 		rpc_SetErr(EINVAL, "Can`t execute call because parameter is null or invalid!");
@@ -299,7 +308,12 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 		return -1;
 	}
 	do {
-		if ((ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL)) == -1) {
+		if (cli->cli_id == SOCK_STREAM)
+			ret = send(cli->cli_sock, buf, wlen, MSG_NOSIGNAL);
+		else
+			ret = sendto(cli->cli_sock, buf, wlen, MSG_NOSIGNAL, 
+					&cli->cli_sa.sa, cli->cli_sa.sa.sa_len);
+		if (ret == -1) {
 			if (errno == EAGAIN)
 				continue;
 			LOGERR;
@@ -333,7 +347,12 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 	} while (0);
 	do {
 		memset(buf, 0, AIT_LEN(&cli->cli_buf));
-		if ((ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0)) < 1) {
+		if (cli->cli_id == SOCK_STREAM)
+			ret = recv(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0);
+		else
+			ret = recvfrom(cli->cli_sock, buf, AIT_LEN(&cli->cli_buf), 0, 
+					&sa.sa, &salen);
+		if (ret < 1) {
 			if (ret) {
 				if (errno == EAGAIN)
 					continue;
@@ -341,6 +360,11 @@ rpc_cli_execCall(rpc_cli_t *cli, int noreply, u_short 
 					LOGERR;
 			}
 			return -1;
+		}
+		/* check for response from known address */
+		if (io_addrcmp(&cli->cli_sa, &sa, 42)) {
+			rpc_SetErr(ERPCMISMATCH, "Received RPC response from unknown address");
+			continue;
 		}
 	} while (0);
 	if (ret < sizeof(struct tagRPCCall)) {