--- ansh/src/client2.c	2011/10/13 14:29:30	1.1.1.1.2.3
+++ ansh/src/client2.c	2013/01/18 09:31:47	1.4.4.1
@@ -3,14 +3,51 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: client2.c,v 1.1.1.1.2.3 2011/10/13 14:29:30 misho Exp $
+ * $Id: client2.c,v 1.4.4.1 2013/01/18 09:31:47 misho Exp $
  *
- *************************************************************************/
+ *************************************************************************
+The ELWIX and AITNET software is distributed under the following
+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, 2013
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #include "global.h"
 
 
 static int
-SetRemoteWinz(int h, struct ether_addr *ea, u_char *buf, int buflen)
+SetRemoteWinz(int h, ether_addr_t *ea, u_char *buf, int buflen)
 {
 	u_short *pos = (u_short*) buf;
 	struct winsize ws;
@@ -34,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, ether_addr_t *ea, int len)
 {
 	fd_set rfd;
 	struct ether_header eth;
@@ -42,18 +79,18 @@ 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);
 
-	if (!(buf = malloc(len))) {
+	if (!(buf = e_malloc(len))) {
 		printf("Error:: no enough memory #%d - %s\n", errno, strerror(errno));
 		return -1;
 	}
 
 	if (SetRemoteWinz(h, ea, buf, len) == -1) {
-		free(buf);
+		e_free(buf);
 		return -1;
 	}
 
@@ -92,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));
@@ -145,14 +174,6 @@ ConnectL2(int h, struct 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;
@@ -162,6 +183,6 @@ ConnectL2(int h, struct ether_addr *ea, int len)
 	}
 
 	ioRestoreMode(STDIN_FILENO, otio);
-	free(buf);
+	e_free(buf);
 	return ret;
 }