--- ansh/src/client3.c	2011/10/13 14:29:30	1.1.1.1.2.3
+++ ansh/src/client3.c	2012/07/22 22:41:33	1.4
@@ -3,14 +3,51 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: client3.c,v 1.1.1.1.2.3 2011/10/13 14:29:30 misho Exp $
+ * $Id: client3.c,v 1.4 2012/07/22 22:41:33 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
+	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, u_short id, struct sockaddr *sa, u_char *buf, int buflen)
+SetRemoteWinz(int h, u_short id, io_sockaddr_t *sa, u_char *buf, int buflen)
 {
 	u_short *pos = (u_short*) buf;
 	struct winsize ws;
@@ -27,21 +64,21 @@ SetRemoteWinz(int h, u_short id, struct sockaddr *sa, 
 	pos[1] = htons(ws.ws_col);
 	pos[2] = htons(ws.ws_xpixel);
 	pos[3] = htons(ws.ws_ypixel);
-	if (icmpSend(h, 0, id, ANSH_FLG_WINZ, Crypted, buf, sizeof ws, sa, sizeof(struct sockaddr)) == -1)
+	if (icmpSend(h, 0, id, ANSH_FLG_WINZ, Crypted, buf, sizeof ws, sa, sa->sa.sa_len) == -1)
 		return -1;
 
 	return 0;
 }
 
 int
-ConnectL3(int h, u_short id, struct sockaddr *sa, int len)
+ConnectL3(int h, u_short id, io_sockaddr_t *sa, int len)
 {
 	fd_set rfd;
 	struct timeval tv = { Timeout, 0 };
 	struct termios otio;
 	int rlen, ret = 0;
 	u_short aid;
-	struct sockaddr s;
+	io_sockaddr_t s;
 	char flg, nl = 0;
 	u_char *buf, *str;
 	socklen_t sl;
@@ -49,13 +86,13 @@ ConnectL3(int h, u_short id, struct sockaddr *sa, int 
 
 	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, id, sa, buf, len) == -1) {
-		free(buf);
+		io_free(buf);
 		return -1;
 	}
 
@@ -99,7 +136,7 @@ ConnectL3(int h, u_short id, struct sockaddr *sa, int 
 				str = cryptBuffer(buf, rlen, Crypted);
 				if (str) {
 					memcpy(buf, str, rlen);
-					free(str);
+					io_free(str);
 				}
 			}
 
@@ -152,7 +189,7 @@ ConnectL3(int h, u_short id, struct sockaddr *sa, int 
 				str = cryptBuffer(buf, rlen, Crypted);
 				if (str) {
 					memcpy(buf, str, rlen);
-					free(str);
+					io_free(str);
 				}
 			}
 
@@ -165,6 +202,6 @@ ConnectL3(int h, u_short id, struct sockaddr *sa, int 
 	}
 
 	ioRestoreMode(STDIN_FILENO, otio);
-	free(buf);
+	io_free(buf);
 	return ret;
 }