--- ansh/src/daemon2.c	2011/10/13 16:08:52	1.1.1.1.2.6
+++ ansh/src/daemon2.c	2011/10/14 12:07:01	1.1.1.1.2.9
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: daemon2.c,v 1.1.1.1.2.6 2011/10/13 16:08:52 misho Exp $
+ * $Id: daemon2.c,v 1.1.1.1.2.9 2011/10/14 12:07:01 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -139,7 +139,7 @@ pktRx(sched_task_t *task)
 			ioChgWinPTY(proc->proc_pty, ntohs(b[0]), ntohs(b[1]), ntohs(b[2]), ntohs(b[3]));
 			/* if not started login, lets start & go! */
 			if (!proc->proc_pid) {
-				memcpy(&proc->proc_ea.octet, &eth.ether_shost, ETHER_ADDR_LEN);
+				memcpy(&proc->proc_ea, &eth.ether_shost, ETHER_ADDR_LEN);
 				spawnLogin(task, proc);
 			}
 		default:
@@ -174,19 +174,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 +183,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 +213,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 +225,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;
@@ -309,7 +262,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);
-			ether_ntoa_r(&proc->proc_ea, str + 7);
+			io_ether_ntoa((const struct io_ether_addr*) &proc->proc_ea, str + 7, 18);
 
 			execl("/usr/bin/login", "login", str, NULL);
 			/* never reached */