--- ansh/src/client2.c	2011/10/13 16:08:52	1.1.1.1.2.4
+++ ansh/src/client2.c	2011/10/31 15:49:37	1.2.2.1
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: client2.c,v 1.1.1.1.2.4 2011/10/13 16:08:52 misho Exp $
+ * $Id: client2.c,v 1.2.2.1 2011/10/31 15:49:37 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,7 +47,7 @@ SUCH DAMAGE.
 
 
 static int
-SetRemoteWinz(int h, struct 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 ether_addr *ea, u_char *bu
 }
 
 int
-ConnectL2(int h, struct ether_addr *ea, int len)
+ConnectL2(int h, io_ether_addr_t *ea, int len)
 {
 	fd_set rfd;
 	struct ether_header eth;
@@ -79,7 +79,7 @@ ConnectL2(int h, struct 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);
@@ -129,14 +129,6 @@ ConnectL2(int h, struct 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));
@@ -181,14 +173,6 @@ ConnectL2(int h, struct ether_addr *ea, int len)
 					nl ^= nl;
 			} 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) {