--- ansh/src/ansh3d.c	2011/10/13 16:08:52	1.1.1.1.2.2
+++ ansh/src/ansh3d.c	2011/10/17 20:14:02	1.2
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: ansh3d.c,v 1.1.1.1.2.2 2011/10/13 16:08:52 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
@@ -53,7 +53,11 @@ 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
@@ -67,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"
@@ -78,6 +83,7 @@ static void
 sig(int s)
 {
 	int state;
+	pid_t pid;
 
 	switch (s) {
 		case SIGHUP:
@@ -92,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;
 	}
 }
@@ -123,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);
@@ -152,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);