--- ansh/src/ansh3d.c	2011/10/14 09:04:04	1.1.1.1.2.3
+++ ansh/src/ansh3d.c	2012/01/23 10:34:12	1.3
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: ansh3d.c,v 1.1.1.1.2.3 2011/10/14 09:04:04 misho Exp $
+ * $Id: ansh3d.c,v 1.3 2012/01/23 10:34:12 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -55,6 +55,9 @@ 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
@@ -80,6 +83,7 @@ static void
 sig(int s)
 {
 	int state;
+	pid_t pid;
 
 	switch (s) {
 		case SIGHUP:
@@ -94,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;
 	}
 }
@@ -116,18 +121,15 @@ hook_error(void *root, void *arg)
 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;
 	struct hostent *host;
 	struct passwd *pass;
 	int fd, h = 0, uid = 0, gid = 0;
 	long id = ANSH_ID;
 	char ch, szUser[STRSIZ] = "root", szChroot[STRSIZ] = "/";
 	struct sigaction sact;
-	sched_root_task_t *root = NULL;
-	struct tagProc *proc;
 
+	memset(&sa, 0, sizeof sa);
 	strlcpy(Key, DEFAULT_KEY, sizeof Key);
 
 	while ((ch = getopt(argc, argv, "hvubt:a:i:U:C:k:")) != -1)
@@ -169,14 +171,14 @@ 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);
@@ -201,9 +203,9 @@ main(int argc, char **argv)
 	argv += optind;
 
 	/* sanity check for openned descriptor */
-	if (!sa.sa_family) {
-		sin4->sin_len = sizeof(struct sockaddr_in);
-		sin4->sin_family = AF_INET;
+	if (!sa.sa.sa_family) {
+		sa.sin.sin_len = sizeof(struct sockaddr_in);
+		sa.sin.sin_family = AF_INET;
 	}
 
 	/* catch signals */