--- ansh/src/ansh.c	2011/10/04 22:37:46	1.1
+++ ansh/src/ansh.c	2011/10/17 20:14:02	1.2
@@ -3,14 +3,54 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: ansh.c,v 1.1 2011/10/04 22:37:46 misho Exp $
+ * $Id: ansh.c,v 1.2 2011/10/17 20:14:02 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"
 #include "ansh.h"
 
 
-int Verbose, Kill, Crypted = 1;
+intptr_t Kill;
+int Timeout, Verbose;
+u_int Crypted;
+char Key[STRSIZ];
 
 extern char compiled[], compiledby[], compilehost[];
 
@@ -21,7 +61,8 @@ Usage()
 		"=== %s === %s@%s ===\n\n"
 		" Syntax: ansh [options] <connect2host>\n\n"
 		"\t-d <dev>\tBind to host interface, like 'em0' (default is first host interface)\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"
 		"\t-u\t\tSwitch to unencrypted traffic between hosts\n"
 		"\t-v\t\tVerbose (more -v, more verbosity ...)\n"
 		"\t-h\t\tThis help screen!\n"
@@ -33,18 +74,27 @@ main(int argc, char **argv)
 {
 	char ch, szDev[STRSIZ] = { 0 };
 	int h, len;
-	u_short id = ANSH_ID;
-	struct ether_addr ea;
+	struct io_ether_addr ea;
 
+	srandomdev();
+	do {
+		Crypted = (u_int) random() % UINT_MAX;
+	} while (!Crypted);
+
 	Get1stEth(szDev, STRSIZ);
 
-	while ((ch = getopt(argc, argv, "hvui:d:")) != -1)
+	strlcpy(Key, DEFAULT_KEY, sizeof Key);
+
+	while ((ch = getopt(argc, argv, "hvut:d:k:")) != -1)
 		switch (ch) {
+			case 't':
+				Timeout = abs(strtol(optarg, NULL, 0));
+				break;
 			case 'd':
 				strlcpy(szDev, optarg, sizeof szDev);
 				break;
-			case 'i':
-				id = strtol(optarg, NULL, 0);
+			case 'k':
+				strlcpy(Key, optarg, sizeof Key);
 				break;
 			case 'u':
 				Crypted ^= Crypted;
@@ -63,7 +113,7 @@ main(int argc, char **argv)
 		printf("Error:: not specified mac for connect ...\n");
 		return 1;
 	}
-	if (!ether_aton_r(argv[0], &ea)) {
+	if (!io_ether_aton(argv[0], &ea)) {
 		printf("Error:: invalid mac ...\n");
 		return 1;
 	}
@@ -74,9 +124,9 @@ main(int argc, char **argv)
 		return 1;
 	}
 
-	ConnectL2(h, id, &ea, len);
+	ConnectL2(h, &ea, len);
 
-	VERB(1) printf("Finish client.\n");
+	VERB(1) printf("\r\nFinish client.\r\n");
 	close(h);
 	return 0;
 }