--- ansh/src/ansh3d.c	2011/10/04 22:37:46	1.1
+++ ansh/src/ansh3d.c	2011/10/17 20:14:02	1.2
@@ -3,19 +3,61 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: ansh3d.c,v 1.1 2011/10/04 22:37:46 misho Exp $
+ * $Id: ansh3d.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 "anshd.h"
 #include "proc.h"
 
 
 intptr_t Kill;
-int Verbose, Crypted = 1;
+int Verbose;
+u_int Crypted = 1;
 proc_head_t pH;
 int bpfLEN, Timeout, Daemon = 1;
+char Key[STRSIZ];
 
+static struct tagProc *proc;
+static sched_root_task_t *root;
+
 extern char compiled[], compiledby[], compilehost[];
 
 static void
@@ -29,6 +71,7 @@ Usage()
 		"\t-U <user>\tRun service with other user\n"
 		"\t-C <dir>\tRun service into chroot directory\n"
 		"\t-t <timeout>\tTimeout of login if no activity (default is 0 sec)\n"
+		"\t-k <key>\tService cipher key\n"
 		"\t-u\t\tSwitch to unencrypted traffic between hosts\n"
 		"\t-b\t\tRun into batch mode (default is daemon mode)\n"
 		"\t-v\t\tVerbose (more -v, more verbosity ...)\n"
@@ -40,6 +83,7 @@ static void
 sig(int s)
 {
 	int state;
+	pid_t pid;
 
 	switch (s) {
 		case SIGHUP:
@@ -54,7 +98,8 @@ sig(int s)
 			break;
 		case SIGCHLD:
 			VERB(1) LOG("Got SIGCHLD!\n");
-			while (waitpid(-1, &state, WNOHANG) > 0);
+			while ((pid = waitpid(-1, &state, WNOHANG)) > 0)
+				stopProcess(root, &pH, pid, icmpTx);
 			break;
 	}
 }
@@ -85,10 +130,10 @@ main(int argc, char **argv)
 	long id = ANSH_ID;
 	char ch, szUser[STRSIZ] = "root", szChroot[STRSIZ] = "/";
 	struct sigaction sact;
-	sched_root_task_t *root = NULL;
-	struct tagProc *proc;
 
-	while ((ch = getopt(argc, argv, "hvubt:a:i:U:C:")) != -1)
+	strlcpy(Key, DEFAULT_KEY, sizeof Key);
+
+	while ((ch = getopt(argc, argv, "hvubt:a:i:U:C:k:")) != -1)
 		switch (ch) {
 			case 'U':
 				pass = getpwnam(optarg);
@@ -114,6 +159,9 @@ main(int argc, char **argv)
 				break;
 			case 't':
 				Timeout = abs(strtol(optarg, NULL, 0));
+				break;
+			case 'k':
+				strlcpy(Key, optarg, sizeof Key);
 				break;
 			case 'a':
 				host = gethostbyname(optarg);