--- ansh/src/daemon2.c 2011/10/04 22:37:46 1.1 +++ ansh/src/daemon2.c 2012/01/23 10:34:12 1.3 @@ -3,9 +3,46 @@ * by Michael Pounov * * $Author: misho $ - * $Id: daemon2.c,v 1.1 2011/10/04 22:37:46 misho Exp $ + * $Id: daemon2.c,v 1.3 2012/01/23 10:34:12 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" @@ -22,8 +59,9 @@ pktTx(sched_task_t *task) if (!(proc = TASK_ARG(task))) return (void*) -1; - if ((wlen = pktSend(TASK_FD(task), proc->proc_id, proc->proc_flg, proc->proc_buf_[FD2NET], - proc->proc_rlen_[FD2NET], &proc->proc_ea)) != ANSH_FLG_ERR) { + 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) { proc->proc_flg = ANSH_FLG_OK; proc->proc_rlen_[FD2NET] = 0; } @@ -41,16 +79,21 @@ pktRx(sched_task_t *task) struct tagProc *proc = NULL; char ret; u_short *b; + u_int seq; FTRACE(3); rlen = bpfLEN; if (!(buf = malloc(rlen))) goto end; + else + memset(buf, 0, rlen); - if ((ret = pktRecv(TASK_FD(task), buf, &rlen, ð)) == ANSH_FLG_ERR) + if ((ret = pktRecv(TASK_FD(task), &seq, &Crypted, buf, &rlen, ð)) == ANSH_FLG_ERR) goto end; VERB(5) LOG("Received %d bytes", rlen); + if (!(ret & ANSH_FLG_CPOUT)) + goto end; /* packet is ok find active session */ SLIST_FOREACH(proc, &pH, proc_next) @@ -59,19 +102,27 @@ pktRx(sched_task_t *task) break; } /* not found in sessions, drop packet */ - if (n != ANSH_CODE) + if (n != ANSH_CODE) { + proc = NULL; goto end; + } switch (ret) { case ANSH_FLG_EOF: case ANSH_FLG_CPOUT: + if (seq <= proc->proc_seq) + goto end; + else if (seq > (proc->proc_seq + 1)) + LOG("LOST PACKET(s) detect: %d; received seq=%d - %d", + seq - proc->proc_seq + 1, seq, proc->proc_seq); + proc->proc_seq = seq; break; case ANSH_FLG_WINZ: b = (u_short*) buf; - ioChgWinPTY(proc->proc_pty, ntohs(buf[0]), ntohs(buf[1]), ntohs(buf[2]), ntohs(buf[3])); + 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, ð.ether_shost, ETHER_ADDR_LEN); + memcpy(&proc->proc_ea, ð.ether_shost, ETHER_ADDR_LEN); spawnLogin(task, proc); } default: @@ -93,6 +144,7 @@ void * fdTx(sched_task_t *task) { struct tagProc *proc; + struct timeval tv = { 0 }; int wlen; FTRACE(3); @@ -102,35 +154,18 @@ fdTx(sched_task_t *task) return (void*) -1; /* if != ANSH_FLG_CPOUT isnt received from client */ - if (proc->proc_flg != ANSH_FLG_CPOUT) + if (proc->proc_flg != ANSH_FLG_CPOUT || !proc->proc_pid) return NULL; - if (waitpid(proc->proc_pid, &wlen, WNOHANG)) { - schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL); - ioFreePTY(TASK_FD(task), proc->proc_ttyname); + /* if Timeout defined, disarm timer */ + if (Timeout) + schedCancelby(TASK_ROOT(task), &TASK_ROOT(task)->root_timer, CRITERIA_CALL, TOfunc, NULL); - proc->proc_pid = 0; - proc->proc_flg = ANSH_FLG_EOF; - proc->proc_rlen_[FD2NET] = 0; - - schedWrite(TASK_ROOT(task), pktTx, proc, proc->proc_sock); - return 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 */ - schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL); - waitpid(proc->proc_pid, &wlen, 0); - ioFreePTY(TASK_FD(task), proc->proc_ttyname); - - proc->proc_pid = 0; - proc->proc_flg = ANSH_FLG_EOF; - proc->proc_rlen_[FD2NET] = 0; - - schedWrite(TASK_ROOT(task), pktTx, proc, proc->proc_sock); return NULL; default: proc->proc_flg = ANSH_FLG_OK; @@ -138,6 +173,11 @@ fdTx(sched_task_t *task) } VERB(3) LOG("Writed %d bytes - %s", wlen, proc->proc_buf_[NET2FD]); + /* if Timeout defined, go arm timer */ + if (Timeout) { + tv.tv_sec = Timeout; + schedTimer(TASK_ROOT(task), TOfunc, proc, tv); + } return NULL; } @@ -145,6 +185,7 @@ void * fdRx(sched_task_t *task) { struct tagProc *proc; + struct timeval tv = { 0 }; int rlen; FTRACE(3); @@ -152,36 +193,21 @@ fdRx(sched_task_t *task) /* not found argument, drop data */ if (!(proc = TASK_ARG(task))) return (void*) -1; - - if (waitpid(proc->proc_pid, &rlen, WNOHANG)) { - schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL); - ioFreePTY(TASK_FD(task), proc->proc_ttyname); - - proc->proc_pid = 0; - proc->proc_flg = ANSH_FLG_EOF; - proc->proc_rlen_[FD2NET] = 0; - - schedWrite(TASK_ROOT(task), pktTx, proc, proc->proc_sock); + if (!proc->proc_pid) return NULL; - } + /* if Timeout defined, disarm timer */ + if (Timeout) + schedCancelby(TASK_ROOT(task), &TASK_ROOT(task)->root_timer, CRITERIA_CALL, TOfunc, NULL); + memset(proc->proc_buf_[FD2NET], 0, proc->proc_blen); - rlen = read(TASK_FD(task), proc->proc_buf_[FD2NET], proc->proc_blen); + rlen = read(TASK_FD(task), proc->proc_buf_[FD2NET], + proc->proc_blen - ETHER_HDR_LEN + sizeof(struct ansh_hdr)); switch (rlen) { case -1: ERR("readtty #%d - %s", errno, strerror(errno)); case 0: /* exit from shell and release tty */ - schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL); - waitpid(proc->proc_pid, &rlen, 0); - VERB(3) LOG("EOF process status %d", rlen); - ioFreePTY(TASK_FD(task), proc->proc_ttyname); - - proc->proc_pid = 0; - proc->proc_flg = ANSH_FLG_EOF; - proc->proc_rlen_[FD2NET] = 0; - - schedWrite(TASK_ROOT(task), pktTx, proc, proc->proc_sock); return NULL; default: proc->proc_flg = ANSH_FLG_OK; @@ -189,14 +215,24 @@ fdRx(sched_task_t *task) } VERB(3) LOG("Readed %d bytes - %s", rlen, proc->proc_buf_[FD2NET]); - schedWrite(TASK_ROOT(task), pktTx, proc, proc->proc_sock); + schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock); schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty); + + /* if Timeout defined, go arm timer */ + if (Timeout) { + tv.tv_sec = Timeout; + schedTimer(TASK_ROOT(task), TOfunc, proc, tv); + } return NULL; } int spawnLogin(sched_task_t *task, struct tagProc *proc) { + int flg; + struct timeval tv = { 0 }; + char str[STRSIZ] = { 0 }; + FTRACE(3); assert(proc); @@ -207,13 +243,25 @@ spawnLogin(sched_task_t *task, struct tagProc *proc) ERR("ioForkPTY() #%d - %s", io_GetErrno(), io_GetError()); return -1; case 0: - execl("/usr/bin/login", "login", NULL); -// execl("/bin/echo", "echo", "MUUUUUUUUUUUUUUUUU", NULL); + printf("anshd ELWIX remote management system (%s)\n\n", proc->proc_ttyname); + strlcpy(str, "-hansh@", sizeof str); + io_ether_ntoa((const io_ether_addr_t*) &proc->proc_ea, str + 7, 18); + + execl("/usr/bin/login", "login", str, NULL); /* never reached */ return -1; default: - VERB(3) LOG("Parent know child pid %d - ptyfd=%d", proc->proc_pid, proc->proc_pty); + flg = fcntl(proc->proc_pty, F_GETFL); + 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); + + /* if Timeout defined, go arm timer */ + if (Timeout) { + tv.tv_sec = Timeout; + schedTimer(TASK_ROOT(task), TOfunc, proc, tv); + } break; }