--- ansh/src/daemon2.c 2011/10/14 12:03:10 1.1.1.1.2.8 +++ ansh/src/daemon2.c 2011/10/14 12:07:01 1.1.1.1.2.9 @@ -3,7 +3,7 @@ * by Michael Pounov * * $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.1.1.1.2.9 2011/10/14 12:07:01 misho Exp $ * ************************************************************************* The ELWIX and AITNET software is distributed under the following @@ -174,21 +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); @@ -198,18 +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; @@ -240,21 +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); @@ -267,19 +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;