--- ansh/src/daemon2.c	2011/10/14 07:47:21	1.1.1.1.2.7
+++ ansh/src/daemon2.c	2011/10/17 20:14:02	1.2
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: daemon2.c,v 1.1.1.1.2.7 2011/10/14 07:47:21 misho Exp $
+ * $Id: daemon2.c,v 1.2 2011/10/17 20:14:02 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:
@@ -174,19 +157,6 @@ 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);
@@ -196,16 +166,6 @@ fdTx(sched_task_t *task)
 		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;
@@ -236,19 +196,6 @@ 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);
@@ -261,17 +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;