--- ansh/src/daemon3.c	2011/10/14 12:03:10	1.1.1.1.2.7
+++ ansh/src/daemon3.c	2012/07/22 22:41:33	1.4
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: daemon3.c,v 1.1.1.1.2.7 2011/10/14 12:03:10 misho Exp $
+ * $Id: daemon3.c,v 1.4 2012/07/22 22:41:33 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -64,7 +64,7 @@ icmpTx(sched_task_t *task)
 		str = cryptBuffer(proc->proc_buf_[FD2NET], proc->proc_rlen_[FD2NET], Crypted);
 		if (str) {
 			memcpy(proc->proc_buf_[FD2NET], str, proc->proc_rlen_[FD2NET]);
-			free(str);
+			io_free(str);
 		}
 	}
 
@@ -83,7 +83,7 @@ void *
 icmpRx(sched_task_t *task)
 {
 	u_char *buf, *str;
-	struct sockaddr sa;
+	io_sockaddr_t sa;
 	int rlen, n = 0, salen = sizeof sa;
 	struct tagProc *proc = NULL;
 	char ret;
@@ -93,7 +93,7 @@ icmpRx(sched_task_t *task)
 	FTRACE(3);
 
 	rlen = bpfLEN;
-	if (!(buf = malloc(rlen)))
+	if (!(buf = io_malloc(rlen)))
 		goto end;
 	else
 		memset(buf, 0, rlen);
@@ -121,7 +121,7 @@ icmpRx(sched_task_t *task)
 		str = cryptBuffer(buf, rlen, Crypted);
 		if (str) {
 			memcpy(buf, str, rlen);
-			free(str);
+			io_free(str);
 		}
 	}
 
@@ -151,10 +151,10 @@ icmpRx(sched_task_t *task)
 	proc->proc_rlen_[NET2FD] = rlen;
 	memset(proc->proc_buf_[NET2FD], 0, proc->proc_blen);
 	memcpy(proc->proc_buf_[NET2FD], buf, proc->proc_rlen_[NET2FD]);
-	schedWrite(TASK_ROOT(task), fdTx, proc, proc->proc_pty);
+	schedWrite(TASK_ROOT(task), fdTx, proc, proc->proc_pty, NULL, 0);
 end:
-	free(buf);
-	schedRead(TASK_ROOT(task), icmpRx, NULL, proc ? proc->proc_sock : TASK_FD(task));
+	io_free(buf);
+	schedRead(TASK_ROOT(task), icmpRx, NULL, proc ? proc->proc_sock : TASK_FD(task), NULL, 0);
 	return NULL;
 }
 
@@ -162,7 +162,7 @@ void *
 fdTx(sched_task_t *task)
 {
 	struct tagProc *proc;
-	struct timeval tv = { 0 };
+	struct timespec ts = { 0 };
 	int wlen;
 
 	FTRACE(3);
@@ -175,42 +175,15 @@ fdTx(sched_task_t *task)
 	if (proc->proc_flg != ANSH_FLG_CPOUT || !proc->proc_pid)
 		return NULL;
 
-	/*
-	if (waitpid(proc->proc_pid, &wlen, WNOHANG)) {
-		ioFreePTY(TASK_FD(task), proc->proc_ttyname);
-		schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);
-
-		proc->proc_pid = 0;
-		proc->proc_seq = 0;
-		proc->proc_flg = ANSH_FLG_EOF;
-		proc->proc_rlen_[FD2NET] = 0;
-
-		schedWrite(TASK_ROOT(task), icmpTx, proc, proc->proc_sock);
-		return NULL;
-	}
-	*/
-
 	/* if Timeout defined, disarm timer */
 	if (Timeout)
-		schedCancelby(TASK_ROOT(task), &TASK_ROOT(task)->root_timer, CRITERIA_CALL, TOfunc, NULL);
+		schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, TOfunc, NULL);
 
 	wlen = write(TASK_FD(task), proc->proc_buf_[NET2FD], proc->proc_rlen_[NET2FD]);
 	switch (wlen) {
 		case -1:
 			ERR("write2tty #%d - %s", errno, strerror(errno));
 			/* exit from shell and release tty */
-			/*
-			waitpid(proc->proc_pid, &wlen, 0);
-			ioFreePTY(TASK_FD(task), proc->proc_ttyname);
-			schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);
-
-			proc->proc_pid = 0;
-			proc->proc_seq = 0;
-			proc->proc_flg = ANSH_FLG_EOF;
-			proc->proc_rlen_[FD2NET] = 0;
-
-			schedWrite(TASK_ROOT(task), icmpTx, proc, proc->proc_sock);
-			*/
 			return NULL;
 		default:
 			proc->proc_flg = ANSH_FLG_OK;
@@ -220,8 +193,8 @@ fdTx(sched_task_t *task)
 
 	/* if Timeout defined, go arm timer */
 	if (Timeout) {
-		tv.tv_sec = Timeout;
-		schedTimer(TASK_ROOT(task), TOfunc, proc, tv);
+		ts.tv_sec = Timeout;
+		schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0);
 	}
 	return NULL;
 }
@@ -230,7 +203,7 @@ void *
 fdRx(sched_task_t *task)
 {
 	struct tagProc *proc;
-	struct timeval tv = { 0 };
+	struct timespec ts = { 0 };
 	int rlen;
 
 	FTRACE(3);
@@ -241,24 +214,9 @@ fdRx(sched_task_t *task)
 	if (!proc->proc_pid)
 		return NULL;
 
-	/*
-	if (waitpid(proc->proc_pid, &rlen, WNOHANG)) {
-		ioFreePTY(TASK_FD(task), proc->proc_ttyname);
-		schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);
-
-		proc->proc_pid = 0;
-		proc->proc_seq = 0;
-		proc->proc_flg = ANSH_FLG_EOF;
-		proc->proc_rlen_[FD2NET] = 0;
-
-		schedWrite(TASK_ROOT(task), icmpTx, proc, proc->proc_sock);
-		return NULL;
-	}
-	*/
-
 	/* if Timeout defined, disarm timer */
 	if (Timeout)
-		schedCancelby(TASK_ROOT(task), &TASK_ROOT(task)->root_timer, CRITERIA_CALL, TOfunc, NULL);
+		schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, TOfunc, NULL);
 
 	memset(proc->proc_buf_[FD2NET], 0, proc->proc_blen);
 	rlen = read(TASK_FD(task), proc->proc_buf_[FD2NET], 
@@ -268,19 +226,6 @@ fdRx(sched_task_t *task)
 			ERR("readtty #%d - %s", errno, strerror(errno));
 		case 0:
 			/* exit from shell and release tty */
-			/*
-			waitpid(proc->proc_pid, &rlen, 0);
-			ioFreePTY(TASK_FD(task), proc->proc_ttyname);
-			schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);
-			VERB(3) LOG("EOF process status %d", rlen);
-
-			proc->proc_pid = 0;
-			proc->proc_seq = 0;
-			proc->proc_flg = ANSH_FLG_EOF;
-			proc->proc_rlen_[FD2NET] = 0;
-
-			schedWrite(TASK_ROOT(task), icmpTx, proc, proc->proc_sock);
-			*/
 			return NULL;
 		default:
 			proc->proc_flg = ANSH_FLG_OK;
@@ -288,13 +233,13 @@ fdRx(sched_task_t *task)
 	}
 	VERB(3) LOG("Readed %d bytes - %s", rlen, proc->proc_buf_[FD2NET]);
 
-	schedWrite(TASK_ROOT(task), icmpTx, proc, proc->proc_sock);
-	schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty);
+	schedWrite(TASK_ROOT(task), icmpTx, proc, proc->proc_sock, NULL, 0);
+	schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty, NULL, 0);
 
 	/* if Timeout defined, go arm timer */
 	if (Timeout) {
-		tv.tv_sec = Timeout;
-		schedTimer(TASK_ROOT(task), TOfunc, proc, tv);
+		ts.tv_sec = Timeout;
+		schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0);
 	}
 	return NULL;
 }
@@ -303,10 +248,8 @@ int
 spawnLogin(sched_task_t *task, struct tagProc *proc)
 {
 	int flg;
-	struct timeval tv = { 0 };
+	struct timespec ts = { 0 };
 	char str[STRSIZ] = { 0 };
-	struct sockaddr_in *sin;
-	struct sockaddr_in6 *sin6;
 
 	FTRACE(3);
 
@@ -321,13 +264,10 @@ spawnLogin(sched_task_t *task, struct tagProc *proc)
 			printf("ansh3d ELWIX remote management system over ICMP (%s)\n\n", 
 					proc->proc_ttyname);
 			strlcpy(str, "-hansh3@", sizeof str);
-			if (proc->proc_cli.sa_family == AF_INET) {
-				sin = (struct sockaddr_in*) &proc->proc_cli;
-				inet_ntop(AF_INET, &sin->sin_addr, str + 8, INET_ADDRSTRLEN);
-			} else if (proc->proc_cli.sa_family == AF_INET6) {
-				sin6 = (struct sockaddr_in6*) &proc->proc_cli;
-				inet_ntop(AF_INET6, &sin6->sin6_addr, str + 8, INET6_ADDRSTRLEN);
-			}
+			if (proc->proc_cli.sa.sa_family == AF_INET)
+				inet_ntop(AF_INET, &proc->proc_cli.sin.sin_addr, str + 8, INET_ADDRSTRLEN);
+			else if (proc->proc_cli.sa.sa_family == AF_INET6)
+				inet_ntop(AF_INET6, &proc->proc_cli.sin6.sin6_addr, str + 8, INET6_ADDRSTRLEN);
 			execl("/usr/bin/login", "login", str, NULL);
 			/* never reached */
 			return -1;
@@ -336,12 +276,12 @@ spawnLogin(sched_task_t *task, struct tagProc *proc)
 			fcntl(proc->proc_pty, F_SETFL, flg | O_NONBLOCK);
 
 			VERB(3) LOG("Parent know child pid %d", proc->proc_pid);
-			schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty);
+			schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty, NULL, 0);
 
 			/* if Timeout defined, go arm timer */
 			if (Timeout) {
-				tv.tv_sec = Timeout;
-				schedTimer(TASK_ROOT(task), TOfunc, proc, tv);
+				ts.tv_sec = Timeout;
+				schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0);
 			}
 			break;
 	}