--- ansh/src/client3.c 2011/10/04 22:37:46 1.1 +++ ansh/src/client3.c 2011/10/17 20:14:02 1.2 @@ -3,9 +3,46 @@ * by Michael Pounov * * $Author: misho $ - * $Id: client3.c,v 1.1 2011/10/04 22:37:46 misho Exp $ + * $Id: client3.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" @@ -27,7 +64,7 @@ SetRemoteWinz(int h, u_short id, struct sockaddr *sa, pos[1] = htons(ws.ws_col); pos[2] = htons(ws.ws_xpixel); pos[3] = htons(ws.ws_ypixel); - if (icmpSend(h, id, ANSH_FLG_WINZ, buf, sizeof ws, sa, sizeof(struct sockaddr)) == -1) + if (icmpSend(h, 0, id, ANSH_FLG_WINZ, Crypted, buf, sizeof ws, sa, sizeof(struct sockaddr)) == -1) return -1; return 0; @@ -42,9 +79,10 @@ ConnectL3(int h, u_short id, struct sockaddr *sa, int int rlen, ret = 0; u_short aid; struct sockaddr s; - char flg; - u_char *buf; + char flg, nl = 0; + u_char *buf, *str; socklen_t sl; + u_int sq, Seq = 0; FTRACE(3); @@ -68,24 +106,11 @@ ConnectL3(int h, u_short id, struct sockaddr *sa, int ret = -1; break; } - if (FD_ISSET(STDIN_FILENO, &rfd)) { - memset(buf, 0, len); - rlen = read(STDIN_FILENO, buf, len); - if (rlen == -1) { - printf("Error:: read(stdin) #%d - %s\n", errno, strerror(errno)); - ret = -1; - break; - } - rlen = icmpSend(h, id, ANSH_FLG_CPOUT, buf, rlen, sa, sizeof(struct sockaddr)); - if (rlen == ANSH_FLG_ERR) { - ret = -1; - break; - } - } else { + if (FD_ISSET(h, &rfd)) { sl = sizeof s; rlen = len; memset(buf, 0, rlen); - flg = icmpRecv(h, &aid, buf, &rlen, &s, &sl); + flg = icmpRecv(h, &sq, &aid, &Crypted, buf, &rlen, &s, &sl); if (flg == ANSH_FLG_ERR) { ret = -1; break; @@ -100,9 +125,76 @@ ConnectL3(int h, u_short id, struct sockaddr *sa, int } if (flg != ANSH_FLG_OK) continue; + if (sq <= Seq) + continue; + else if (sq > (Seq + 1)) + VERB(1) LOG("LOST PACKET(s) detect: %d; received seq=%d - %d", + sq - Seq + 1, sq, Seq); + Seq = sq; + + if (Crypted) { + str = cryptBuffer(buf, rlen, Crypted); + if (str) { + memcpy(buf, str, rlen); + free(str); + } + } + rlen = write(STDOUT_FILENO, buf, rlen); if (rlen == -1) { printf("Error:: write(stdout) #%d - %s\n", errno, strerror(errno)); + ret = -1; + break; + } + } else { + memset(buf, 0, len); + rlen = read(STDIN_FILENO, buf, len); + if (rlen == -1) { + printf("Error:: read(stdin) #%d - %s\n", errno, strerror(errno)); + ret = -1; + break; + } + + /* local command handling */ + if (rlen) { + /* execute local command */ + if (nl == 2) { + switch (*buf) { + case '.': + Kill++; + printf("\n"); + VERB(1) LOG("Exit from client\n"); + continue; + case '~': + default: + nl ^= nl; + /* send buffer, unknown command */ + break; + } + } + /* skip buffer and wait for local command */ + if (nl == 1 && *buf == '~') { + nl++; + continue; + } + /* send buffer if detect NL */ + if (*buf == 0xa || *buf == 0xd) + nl = 1; + else + nl ^= nl; + } else + nl ^= nl; + + if (Crypted) { + str = cryptBuffer(buf, rlen, Crypted); + if (str) { + memcpy(buf, str, rlen); + free(str); + } + } + + rlen = icmpSend(h, ++Seq, id, ANSH_FLG_CPOUT, Crypted, buf, rlen, sa, sizeof(struct sockaddr)); + if (rlen == ANSH_FLG_ERR) { ret = -1; break; }