--- ansh/src/client2.c	2011/10/14 07:47:21	1.1.1.1.2.5
+++ ansh/src/client2.c	2012/07/22 22:41:33	1.4
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: client2.c,v 1.1.1.1.2.5 2011/10/14 07:47:21 misho Exp $
+ * $Id: client2.c,v 1.4 2012/07/22 22:41:33 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,7 +47,7 @@ SUCH DAMAGE.
 
 
 static int
-SetRemoteWinz(int h, struct io_ether_addr *ea, u_char *buf, int buflen)
+SetRemoteWinz(int h, io_ether_addr_t *ea, u_char *buf, int buflen)
 {
 	u_short *pos = (u_short*) buf;
 	struct winsize ws;
@@ -71,7 +71,7 @@ SetRemoteWinz(int h, struct io_ether_addr *ea, u_char 
 }
 
 int
-ConnectL2(int h, struct io_ether_addr *ea, int len)
+ConnectL2(int h, io_ether_addr_t *ea, int len)
 {
 	fd_set rfd;
 	struct ether_header eth;
@@ -79,18 +79,18 @@ ConnectL2(int h, struct io_ether_addr *ea, int len)
 	struct termios otio;
 	int rlen, ret = 0;
 	char flg, nl = 0;
-	u_char *buf, *str;
+	u_char *buf;
 	u_int s, Seq = 0;
 
 	FTRACE(3);
 
-	if (!(buf = malloc(len))) {
+	if (!(buf = io_malloc(len))) {
 		printf("Error:: no enough memory #%d - %s\n", errno, strerror(errno));
 		return -1;
 	}
 
 	if (SetRemoteWinz(h, ea, buf, len) == -1) {
-		free(buf);
+		io_free(buf);
 		return -1;
 	}
 
@@ -129,14 +129,6 @@ ConnectL2(int h, struct io_ether_addr *ea, int len)
 						s - (Seq + 1), s, Seq);
 			Seq = s;
 
-			if (Crypted) {
-				str = cryptBuffer(buf, rlen, Crypted);
-				if (str) {
-					memcpy(buf, str, rlen);
-					free(str);
-				}
-			}
-
 			rlen = write(STDOUT_FILENO, buf, rlen);
 			if (rlen == -1) {
 				printf("Error:: write(stdout) #%d - %s\n", errno, strerror(errno));
@@ -182,14 +174,6 @@ ConnectL2(int h, struct io_ether_addr *ea, int len)
 			} else
 				nl ^= nl;
 
-			if (Crypted) {
-				str = cryptBuffer(buf, rlen, Crypted);
-				if (str) {
-					memcpy(buf, str, rlen);
-					free(str);
-				}
-			}
-
 			rlen = pktSend(h, ++Seq, ANSH_FLG_CPOUT, Crypted, buf, rlen, ea);
 			if (rlen == ANSH_FLG_ERR) {
 				ret = -1;
@@ -199,6 +183,6 @@ ConnectL2(int h, struct io_ether_addr *ea, int len)
 	}
 
 	ioRestoreMode(STDIN_FILENO, otio);
-	free(buf);
+	io_free(buf);
 	return ret;
 }