--- ansh/src/ansh3.c	2011/10/17 20:14:02	1.2
+++ ansh/src/ansh3.c	2012/01/23 10:34:12	1.3
@@ -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.3 2012/01/23 10:34:12 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,14 +73,15 @@ 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;
+	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;
@@ -87,8 +89,31 @@ 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.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.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);
+						return 1;
+				}
+				break;
 			case 't':
 				Timeout = abs(strtol(optarg, NULL, 0));
 				break;
@@ -124,21 +149,21 @@ main(int argc, char **argv)
 	}
 	switch (host->h_addrtype) {
 		case AF_INET:
-			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->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);
 			return 1;
 	}
 
-	h = PrepareL3(&sa, &len);
+	h = PrepareL3(&ba, &len);
 	if (h == -1) {
 		printf("Error:: Descriptor not opened ... \n");
 		return 1;