--- ansh/src/ansh3.c	2011/10/17 20:14:02	1.2
+++ ansh/src/ansh3.c	2011/10/31 09:46:18	1.2.2.1
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: ansh3.c,v 1.2 2011/10/17 20:14:02 misho Exp $
+ * $Id: ansh3.c,v 1.2.2.1 2011/10/31 09:46:18 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -57,9 +57,10 @@ extern char compiled[], compiledby[], compilehost[];
 static void
 Usage()
 {
-	printf(	" -= ansh =- ELWIX Layer3 remote management client over ICMP\n"
+	printf(	" -= ansh3 =- ELWIX Layer3 remote management client over ICMP\n"
 		"=== %s === %s@%s ===\n\n"
 		" Syntax: ansh [options] <connect2host>\n\n"
+		"\t-a <address>\tBind to address\n"
 		"\t-i <id>\tService ID (default is 42)\n"
 		"\t-t <timeout>\tClient session timeout (default is 0 sec)\n"
 		"\t-k <key>\tService cipher key\n"
@@ -72,9 +73,9 @@ Usage()
 int
 main(int argc, char **argv)
 {
-	struct sockaddr sa = { 0 };
-	struct sockaddr_in *sin4 = (struct sockaddr_in*) &sa;
-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6*) &sa;
+	struct sockaddr sa = { 0 }, *ba = NULL;
+	struct sockaddr_in *sin4;
+	struct sockaddr_in6 *sin6;
 	struct hostent *host;
 	char ch;
 	int h, len;
@@ -87,8 +88,49 @@ main(int argc, char **argv)
 
 	strlcpy(Key, DEFAULT_KEY, sizeof Key);
 
-	while ((ch = getopt(argc, argv, "hvui:t:k:")) != -1)
+	while ((ch = getopt(argc, argv, "hvui:t:k:a:")) != -1)
 		switch (ch) {
+			case 'a':
+				host = gethostbyname(optarg);
+				if (!host) {
+					printf("Error:: in bind address '%s' #%d - %s\n",
+						optarg, h_errno, hstrerror(h_errno));
+					return 1;
+				}
+				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);
+						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);
+						break;
+					default:
+						printf("Error:: Unknown address type %d !!!\n", host->h_addrtype);
+						return 1;
+				}
+				break;
 			case 't':
 				Timeout = abs(strtol(optarg, NULL, 0));
 				break;
@@ -113,6 +155,8 @@ main(int argc, char **argv)
 	argv += optind;
 	if (!argc) {
 		printf("Error:: not specified address for connect ...\n");
+		if (ba)
+			free(ba);
 		return 1;
 	}
 
@@ -120,27 +164,35 @@ 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);
 			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);
 			break;
 		default:
 			printf("Error:: Unknown address type %d !!!\n", host->h_addrtype);
+			if (ba)
+				free(ba);
 			return 1;
 	}
 
-	h = PrepareL3(&sa, &len);
+	h = PrepareL3(ba, &len);
 	if (h == -1) {
 		printf("Error:: Descriptor not opened ... \n");
+		if (ba)
+			free(ba);
 		return 1;
 	}
 
@@ -148,5 +200,7 @@ main(int argc, char **argv)
 
 	VERB(1) printf("\r\nFinish client.\r\n");
 	close(h);
+	if (ba)
+		free(ba);
 	return 0;
 }