--- libaitrpc/src/cli.c	2013/12/15 16:09:54	1.20.4.1
+++ libaitrpc/src/cli.c	2014/11/12 21:37:51	1.22.6.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cli.c,v 1.20.4.1 2013/12/15 16:09:54 misho Exp $
+* $Id: cli.c,v 1.22.6.1 2014/11/12 21:37:51 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, 2012, 2013
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -228,6 +228,52 @@ err:
 }
 
 /*
+ * rpc_cli_reconnectClient() - Reconnecting client to RPC server
+ *
+ * @cli = RPC Client session
+ * return: -1 error or 0 ok
+ */
+int
+rpc_cli_reconnectClient(rpc_cli_t * __restrict cli)
+{
+	int netBuf;
+
+	if (!cli)
+		return -1;
+	else
+		netBuf = AIT_LEN(&cli->cli_buf);
+
+	close(cli->cli_sock);
+
+	cli->cli_sock = socket(cli->cli_sa.sa.sa_family, cli->cli_id, 0);
+	if (cli->cli_sock == -1) {
+		LOGERR;
+		return -1;
+	}
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_SNDBUF, 
+				&netBuf, sizeof netBuf) == -1) {
+		LOGERR;
+		close(cli->cli_sock);
+		return -1;
+	}
+	if (setsockopt(cli->cli_sock, SOL_SOCKET, SO_RCVBUF, 
+				&netBuf, sizeof netBuf) == -1) {
+		LOGERR;
+		close(cli->cli_sock);
+		return -1;
+	}
+	if (cli->cli_id == SOCK_STREAM)
+		if (connect(cli->cli_sock, &cli->cli_sa.sa, cli->cli_sa.sa.sa_len) == -1) {
+			LOGERR;
+			close(cli->cli_sock);
+			return -1;
+		}
+
+	fcntl(cli->cli_sock, F_SETFL, fcntl(cli->cli_sock, F_GETFL) | O_NONBLOCK);
+	return 0;
+}
+
+/*
  * rpc_cli_closeClient() - Close connection to RPC server and free resources
  *
  * @cli = RPC Client session
@@ -408,7 +454,7 @@ rpc_pkt_Request(ait_val_t * __restrict pkt, rpc_sess_t
  * rpc_pkt_Replay() - Decode RPC Replay packet
  *
  * @pkt = Packet buffer
- * @sess = RPC session info
+ * @sess = RPC session info, if =NULL don't check session
  * @tag = Function tag
  * @vars = Function argument array of values, may be NULL
  * @nocrc = Without CRC calculation
@@ -423,7 +469,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t 
 	u_char *buf;
 	uint16_t crc;
 
-	if (!pkt || !sess) {
+	if (!pkt) {
 		rpc_SetErr(EINVAL, "Invalid argument(s)!");
 		return -1;
 	} else
@@ -441,7 +487,7 @@ rpc_pkt_Replay(ait_val_t * __restrict pkt, rpc_sess_t 
 	}
 
 	/* check RPC packet session info */
-	if (rpc_chkPktSession(&rpc->call_session, sess)) {
+	if (sess && rpc_chkPktSession(&rpc->call_session, sess)) {
 		rpc_SetErr(ERPCMISMATCH, "Get invalid RPC session");
 		return -1;
 	}