--- ansh/src/client3.c	2011/10/17 20:14:02	1.2
+++ ansh/src/client3.c	2015/05/19 23:25:30	1.5
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: client3.c,v 1.2 2011/10/17 20:14:02 misho Exp $
+ * $Id: client3.c,v 1.5 2015/05/19 23:25:30 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
+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
@@ -47,7 +47,7 @@ SUCH DAMAGE.
 
 
 static int
-SetRemoteWinz(int h, u_short id, struct sockaddr *sa, u_char *buf, int buflen)
+SetRemoteWinz(int h, u_short id, sockaddr_t *sa, u_char *buf, int buflen)
 {
 	u_short *pos = (u_short*) buf;
 	struct winsize ws;
@@ -64,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, 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;
+	sockaddr_t s;
 	char flg, nl = 0;
 	u_char *buf, *str;
 	socklen_t sl;
@@ -86,13 +86,13 @@ ConnectL3(int h, u_short id, struct sockaddr *sa, int 
 
 	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, id, sa, buf, len) == -1) {
-		free(buf);
+		e_free(buf);
 		return -1;
 	}
 
@@ -136,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);
+					e_free(str);
 				}
 			}
 
@@ -189,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);
+					e_free(str);
 				}
 			}
 
@@ -202,6 +202,6 @@ ConnectL3(int h, u_short id, struct sockaddr *sa, int 
 	}
 
 	ioRestoreMode(STDIN_FILENO, otio);
-	free(buf);
+	e_free(buf);
 	return ret;
 }