--- ansh/src/ansh3.c	2011/10/31 09:46:18	1.2.2.1
+++ ansh/src/ansh3.c	2011/10/31 15:49:37	1.2.2.2
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: ansh3.c,v 1.2.2.1 2011/10/31 09:46:18 misho Exp $
+ * $Id: ansh3.c,v 1.2.2.2 2011/10/31 15:49:37 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -73,14 +73,15 @@ Usage()
 int
 main(int argc, char **argv)
 {
-	struct sockaddr sa = { 0 }, *ba = NULL;
-	struct sockaddr_in *sin4;
-	struct sockaddr_in6 *sin6;
+	io_sockaddr_t sa, ba;
 	struct hostent *host;
 	char ch;
 	int h, len;
 	u_short id = ANSH_ID;
 
+	memset(&sa, 0, sizeof sa);
+	memset(&ba, 0, sizeof ba);
+
 	srandomdev();
 	do {
 		Crypted = (u_int) random() % UINT_MAX;
@@ -99,32 +100,14 @@ main(int argc, char **argv)
 				}
 				switch (host->h_addrtype) {
 					case AF_INET:
-						ba = malloc(sizeof(struct sockaddr_in));
-						if (!ba) {
-							printf("Error:: malloc() #%d - %s ...\n", 
-									errno, strerror(errno));
-							return 1;
-						} else {
-							memset(ba, 0, sizeof(struct sockaddr_in));
-							sin4 = (struct sockaddr_in*) ba;
-						}
-						sin4->sin_len = sizeof(struct sockaddr_in);
-						sin4->sin_family = AF_INET;
-						memcpy(&sin4->sin_addr.s_addr, host->h_addr, host->h_length);
+						ba.sin.sin_len = sizeof(struct sockaddr_in);
+						ba.sin.sin_family = AF_INET;
+						memcpy(&ba.sin.sin_addr.s_addr, host->h_addr, host->h_length);
 						break;
 					case AF_INET6:
-						ba = malloc(sizeof(struct sockaddr_in6));
-						if (!ba) {
-							printf("Error:: malloc() #%d - %s ...\n", 
-									errno, strerror(errno));
-							return 1;
-						} else {
-							memset(ba, 0, sizeof(struct sockaddr_in6));
-							sin6 = (struct sockaddr_in6*) ba;
-						}
-						sin6->sin6_len = sizeof(struct sockaddr_in6);
-						sin6->sin6_family = AF_INET6;
-						memcpy(&sin6->sin6_addr.s6_addr, host->h_addr, host->h_length);
+						ba.sin6.sin6_len = sizeof(struct sockaddr_in6);
+						ba.sin6.sin6_family = AF_INET6;
+						memcpy(&ba.sin6.sin6_addr.s6_addr, host->h_addr, host->h_length);
 						break;
 					default:
 						printf("Error:: Unknown address type %d !!!\n", host->h_addrtype);
@@ -155,8 +138,6 @@ main(int argc, char **argv)
 	argv += optind;
 	if (!argc) {
 		printf("Error:: not specified address for connect ...\n");
-		if (ba)
-			free(ba);
 		return 1;
 	}
 
@@ -164,35 +145,27 @@ main(int argc, char **argv)
 	if (!host) {
 		printf("Error:: in bind address '%s' #%d - %s\n",
 				argv[0], h_errno, hstrerror(h_errno));
-		if (ba)
-			free(ba);
 		return 1;
 	}
 	switch (host->h_addrtype) {
 		case AF_INET:
-			sin4 = (struct sockaddr_in*) &sa;
-			sin4->sin_len = sizeof(struct sockaddr_in);
-			sin4->sin_family = AF_INET;
-			memcpy(&sin4->sin_addr.s_addr, host->h_addr, host->h_length);
+			sa.sin.sin_len = sizeof(struct sockaddr_in);
+			sa.sin.sin_family = AF_INET;
+			memcpy(&sa.sin.sin_addr.s_addr, host->h_addr, host->h_length);
 			break;
 		case AF_INET6:
-			sin6 = (struct sockaddr_in6*) &sa;
-			sin6->sin6_len = sizeof(struct sockaddr_in6);
-			sin6->sin6_family = AF_INET6;
-			memcpy(&sin6->sin6_addr.s6_addr, host->h_addr, host->h_length);
+			sa.sin6.sin6_len = sizeof(struct sockaddr_in6);
+			sa.sin6.sin6_family = AF_INET6;
+			memcpy(&sa.sin6.sin6_addr.s6_addr, host->h_addr, host->h_length);
 			break;
 		default:
 			printf("Error:: Unknown address type %d !!!\n", host->h_addrtype);
-			if (ba)
-				free(ba);
 			return 1;
 	}
 
-	h = PrepareL3(ba, &len);
+	h = PrepareL3(&ba, &len);
 	if (h == -1) {
 		printf("Error:: Descriptor not opened ... \n");
-		if (ba)
-			free(ba);
 		return 1;
 	}
 
@@ -200,7 +173,5 @@ main(int argc, char **argv)
 
 	VERB(1) printf("\r\nFinish client.\r\n");
 	close(h);
-	if (ba)
-		free(ba);
 	return 0;
 }