[BACK]Return to client2.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / ansh / src

Diff for /ansh/src/client2.c between versions 1.1.1.1.2.3 and 1.2.2.1

version 1.1.1.1.2.3, 2011/10/13 14:29:30 version 1.2.2.1, 2011/10/31 15:49:37
Line 5 Line 5
  * $Author$   * $Author$
  * $Id$   * $Id$
  *   *
 *************************************************************************/ *************************************************************************
 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 <info@elwix.org>
 
 Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
         by Michael Pounov <misho@elwix.org>.  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 <misho@elwix.org>
 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 "global.h"
   
   
 static int  static int
SetRemoteWinz(int h, struct ether_addr *ea, u_char *buf, int buflen)SetRemoteWinz(int h, io_ether_addr_t *ea, u_char *buf, int buflen)
 {  {
         u_short *pos = (u_short*) buf;          u_short *pos = (u_short*) buf;
         struct winsize ws;          struct winsize ws;
Line 34  SetRemoteWinz(int h, struct ether_addr *ea, u_char *bu Line 71  SetRemoteWinz(int h, struct ether_addr *ea, u_char *bu
 }  }
   
 int  int
ConnectL2(int h, struct ether_addr *ea, int len)ConnectL2(int h, io_ether_addr_t *ea, int len)
 {  {
         fd_set rfd;          fd_set rfd;
         struct ether_header eth;          struct ether_header eth;
Line 42  ConnectL2(int h, struct ether_addr *ea, int len) Line 79  ConnectL2(int h, struct ether_addr *ea, int len)
         struct termios otio;          struct termios otio;
         int rlen, ret = 0;          int rlen, ret = 0;
         char flg, nl = 0;          char flg, nl = 0;
        u_char *buf, *str;        u_char *buf;
         u_int s, Seq = 0;          u_int s, Seq = 0;
   
         FTRACE(3);          FTRACE(3);
Line 92  ConnectL2(int h, struct ether_addr *ea, int len) Line 129  ConnectL2(int h, struct ether_addr *ea, int len)
                                                 s - (Seq + 1), s, Seq);                                                  s - (Seq + 1), s, Seq);
                         Seq = s;                          Seq = s;
   
                         if (Crypted) {  
                                 str = cryptBuffer(buf, rlen, Crypted);  
                                 if (str) {  
                                         memcpy(buf, str, rlen);  
                                         free(str);  
                                 }  
                         }  
   
                         rlen = write(STDOUT_FILENO, buf, rlen);                          rlen = write(STDOUT_FILENO, buf, rlen);
                         if (rlen == -1) {                          if (rlen == -1) {
                                 printf("Error:: write(stdout) #%d - %s\n", errno, strerror(errno));                                  printf("Error:: write(stdout) #%d - %s\n", errno, strerror(errno));
Line 144  ConnectL2(int h, struct ether_addr *ea, int len) Line 173  ConnectL2(int h, struct ether_addr *ea, int len)
                                         nl ^= nl;                                          nl ^= nl;
                         } else                          } else
                                 nl ^= nl;                                  nl ^= nl;
   
                         if (Crypted) {  
                                 str = cryptBuffer(buf, rlen, Crypted);  
                                 if (str) {  
                                         memcpy(buf, str, rlen);  
                                         free(str);  
                                 }  
                         }  
   
                         rlen = pktSend(h, ++Seq, ANSH_FLG_CPOUT, Crypted, buf, rlen, ea);                          rlen = pktSend(h, ++Seq, ANSH_FLG_CPOUT, Crypted, buf, rlen, ea);
                         if (rlen == ANSH_FLG_ERR) {                          if (rlen == ANSH_FLG_ERR) {
Removed from v.1.1.1.1.2.3  
changed lines
  Added in v.1.2.2.1

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>