--- ansh/src/daemon2.c	2011/10/14 12:03:10	1.1.1.1.2.8
+++ ansh/src/daemon2.c	2012/02/15 16:54:44	1.3.2.2
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: daemon2.c,v 1.1.1.1.2.8 2011/10/14 12:03:10 misho Exp $
+ * $Id: daemon2.c,v 1.3.2.2 2012/02/15 16:54:44 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -52,7 +52,6 @@ pktTx(sched_task_t *task)
 {
 	struct tagProc *proc;
 	int wlen;
-	u_char *str;
 
 	FTRACE(3);
 
@@ -60,14 +59,6 @@ pktTx(sched_task_t *task)
 	if (!(proc = TASK_ARG(task)))
 		return (void*) -1;
 
-	if (Crypted) {
-		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);
-		}
-	}
-
 	if ((wlen = pktSend(TASK_FD(task), ++proc->proc_seq, proc->proc_flg, Crypted, 
 					proc->proc_buf_[FD2NET], proc->proc_rlen_[FD2NET], 
 					&proc->proc_ea)) != ANSH_FLG_ERR) {
@@ -82,7 +73,7 @@ pktTx(sched_task_t *task)
 void *
 pktRx(sched_task_t *task)
 {
-	u_char *buf, *str;
+	u_char *buf;
 	struct ether_header eth;
 	int rlen, n = 0;
 	struct tagProc *proc = NULL;
@@ -116,14 +107,6 @@ pktRx(sched_task_t *task)
 		goto end;
 	}
 
-	if (Crypted) {
-		str = cryptBuffer(buf, rlen, Crypted);
-		if (str) {
-			memcpy(buf, str, rlen);
-			free(str);
-		}
-	}
-
 	switch (ret) {
 		case ANSH_FLG_EOF:
 		case ANSH_FLG_CPOUT:
@@ -150,10 +133,10 @@ pktRx(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), pktRx, NULL, proc ? proc->proc_sock : TASK_FD(task));
+	schedRead(TASK_ROOT(task), pktRx, NULL, proc ? proc->proc_sock : TASK_FD(task), NULL, 0);
 	return NULL;
 }
 
@@ -161,7 +144,7 @@ void *
 fdTx(sched_task_t *task)
 {
 	struct tagProc *proc;
-	struct timeval tv = { 0 };
+	struct timespec ts = { 0 };
 	int wlen;
 
 	FTRACE(3);
@@ -174,42 +157,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;
-
-		schedCallOnce(TASK_ROOT(task), pktTx, 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;
-
-			schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
-			*/
 			return NULL;
 		default:
 			proc->proc_flg = ANSH_FLG_OK;
@@ -219,8 +175,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;
 }
@@ -229,7 +185,7 @@ void *
 fdRx(sched_task_t *task)
 {
 	struct tagProc *proc;
-	struct timeval tv = { 0 };
+	struct timespec ts = { 0 };
 	int rlen;
 
 	FTRACE(3);
@@ -240,24 +196,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;
-
-		schedCallOnce(TASK_ROOT(task), pktTx, 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], 
@@ -267,19 +208,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;
-
-			schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
-			*/
 			return NULL;
 		default:
 			proc->proc_flg = ANSH_FLG_OK;
@@ -287,13 +215,13 @@ fdRx(sched_task_t *task)
 	}
 	VERB(3) LOG("Readed %d bytes - %s", rlen, proc->proc_buf_[FD2NET]);
 
-	schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock);
-	schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty);
+	schedCallOnce(TASK_ROOT(task), pktTx, 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;
 }
@@ -302,7 +230,7 @@ int
 spawnLogin(sched_task_t *task, struct tagProc *proc)
 {
 	int flg;
-	struct timeval tv = { 0 };
+	struct timespec ts = { 0 };
 	char str[STRSIZ] = { 0 };
 
 	FTRACE(3);
@@ -317,7 +245,7 @@ spawnLogin(sched_task_t *task, struct tagProc *proc)
 		case 0:
 			printf("anshd ELWIX remote management system (%s)\n\n", proc->proc_ttyname);
 			strlcpy(str, "-hansh@", sizeof str);
-			io_ether_ntoa((const struct io_ether_addr*) &proc->proc_ea, str + 7, 18);
+			io_ether_ntoa((const io_ether_addr_t*) &proc->proc_ea, str + 7, 18);
 
 			execl("/usr/bin/login", "login", str, NULL);
 			/* never reached */
@@ -327,12 +255,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;
 	}