--- ansh/src/anshd.c	2011/10/13 16:08:52	1.1.1.1.2.4
+++ ansh/src/anshd.c	2012/07/22 22:41:33	1.3
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: anshd.c,v 1.1.1.1.2.4 2011/10/13 16:08:52 misho Exp $
+ * $Id: anshd.c,v 1.3 2012/07/22 22:41:33 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ 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
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -52,8 +52,12 @@ intptr_t Kill;
 int Verbose;
 u_int Crypted = 1;
 proc_head_t pH;
-int bpfLEN, Timeout, Daemon = 1;
+int bpfLEN, Timeout = 300, Daemon = 1;
+char Key[STRSIZ];
 
+static sched_root_task_t *root = NULL;
+static struct tagProc *proc;
+
 extern char compiled[], compiledby[], compilehost[];
 
 static void
@@ -65,7 +69,8 @@ Usage()
 		"\t-d <dev>\tBind to host interface, like 'em0' (default is first host interface)\n"
 		"\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-t <timeout>\tTimeout of login if no activity (default is 300 sec)\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"
@@ -77,6 +82,7 @@ static void
 sig(int s)
 {
 	int state;
+	pid_t pid;
 
 	switch (s) {
 		case SIGHUP:
@@ -91,7 +97,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, pktTx);
 			break;
 	}
 }
@@ -117,12 +124,12 @@ main(int argc, char **argv)
 	int fd, h = 0, uid = 0, gid = 0;
 	char ch, szUser[STRSIZ] = "root", szChroot[STRSIZ] = "/", szDev[STRSIZ] = { 0 };
 	struct sigaction sact;
-	sched_root_task_t *root = NULL;
-	struct tagProc *proc;
 
 	Get1stEth(szDev, STRSIZ);
 
-	while ((ch = getopt(argc, argv, "hvubt:d:U:C:")) != -1)
+	strlcpy(Key, DEFAULT_KEY, sizeof Key);
+
+	while ((ch = getopt(argc, argv, "hvubt:d:U:C:k:")) != -1)
 		switch (ch) {
 			case 'U':
 				pass = getpwnam(optarg);
@@ -149,6 +156,9 @@ main(int argc, char **argv)
 			case 'd':
 				strlcpy(szDev, optarg, sizeof szDev);
 				break;
+			case 'k':
+				strlcpy(Key, optarg, sizeof Key);
+				break;
 			case 'u':
 				Crypted ^= Crypted;
 				break;
@@ -244,7 +254,7 @@ main(int argc, char **argv)
 	setgid(gid);
 	setuid(uid);
 
-	if (schedRead(root, pktRx, (void*) ANSH_ID, h)) {
+	if (schedRead(root, pktRx, (void*) ANSH_ID, h, NULL, 0)) {
 		schedRun(root, &Kill);
 	} else
 		ERR("Failed to add reader task #%d - %s\n", sched_GetErrno(), sched_GetError());