--- ansh/src/daemon3.c 2011/10/13 14:29:30 1.1.1.1.2.4 +++ ansh/src/daemon3.c 2011/10/17 20:14:02 1.2 @@ -3,9 +3,46 @@ * by Michael Pounov * * $Author: misho $ - * $Id: daemon3.c,v 1.1.1.1.2.4 2011/10/13 14:29:30 misho Exp $ + * $Id: daemon3.c,v 1.2 2011/10/17 20:14:02 misho Exp $ * - *************************************************************************/ + ************************************************************************* +The ELWIX and AITNET software is distributed under the following +terms: + +All of the documentation and software included in the ELWIX and AITNET +Releases is copyrighted by ELWIX - Sofia/Bulgaria + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #include "global.h" #include "anshd.h" @@ -58,6 +95,8 @@ icmpRx(sched_task_t *task) rlen = bpfLEN; if (!(buf = malloc(rlen))) goto end; + else + memset(buf, 0, rlen); if ((ret = icmpRecv(TASK_FD(task), &seq, &id, &Crypted, buf, &rlen, &sa, (socklen_t *) &salen)) == ANSH_FLG_ERR) @@ -136,19 +175,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; - - 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); @@ -158,16 +184,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; - - schedWrite(TASK_ROOT(task), icmpTx, proc, proc->proc_sock); return NULL; default: proc->proc_flg = ANSH_FLG_OK; @@ -198,19 +214,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; - - 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); @@ -223,17 +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;