--- ansh/src/daemon2.c 2011/10/10 09:11:48 1.1.1.1.2.1 +++ ansh/src/daemon2.c 2011/10/14 07:47:21 1.1.1.1.2.7 @@ -3,9 +3,46 @@ * by Michael Pounov * * $Author: misho $ - * $Id: daemon2.c,v 1.1.1.1.2.1 2011/10/10 09:11:48 misho Exp $ + * $Id: daemon2.c,v 1.1.1.1.2.7 2011/10/14 07:47:21 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" @@ -31,8 +68,9 @@ pktTx(sched_task_t *task) } } - if ((wlen = pktSend(TASK_FD(task), proc->proc_id, proc->proc_flg, Crypted, 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; } @@ -50,14 +88,17 @@ 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), &Crypted, 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)) @@ -86,13 +127,19 @@ pktRx(sched_task_t *task) 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(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: @@ -132,10 +179,11 @@ fdTx(sched_task_t *task) 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), pktTx, proc, proc->proc_sock); + schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock); return NULL; } @@ -153,10 +201,11 @@ fdTx(sched_task_t *task) 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), pktTx, proc, proc->proc_sock); + schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock); return NULL; default: proc->proc_flg = ANSH_FLG_OK; @@ -192,10 +241,11 @@ fdRx(sched_task_t *task) 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), pktTx, proc, proc->proc_sock); + schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock); return NULL; } @@ -204,7 +254,8 @@ fdRx(sched_task_t *task) 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)); @@ -216,10 +267,11 @@ fdRx(sched_task_t *task) 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), pktTx, proc, proc->proc_sock); + schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock); return NULL; default: proc->proc_flg = ANSH_FLG_OK; @@ -227,7 +279,7 @@ 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 */ @@ -257,7 +309,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 */