ansh/src/client2.c - diff

Return to client2.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / ansh / src

Diff for /ansh/src/client2.c between versions 1.1.1.1.2.4 and 1.4.4.1

version 1.1.1.1.2.4, 2011/10/13 16:08:52	version 1.4.4.1, 2013/01/18 09:31:47
Line 12 terms:	Line 12 terms:
All of the documentation and software included in the ELWIX and AITNET	All of the documentation and software included in the ELWIX and AITNET
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013
by Michael Pounov <misho@elwix.org>. All rights reserved.	by Michael Pounov <misho@elwix.org>. All rights reserved.

Redistribution and use in source and binary forms, with or without	Redistribution and use in source and binary forms, with or without
Line 47 SUCH DAMAGE.	Line 47 SUCH DAMAGE.


static int	static int
SetRemoteWinz(int h, struct ether_addr ea, u_char buf, int buflen)	SetRemoteWinz(int h, 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 71 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, ether_addr_t *ea, int len)
{	{
fd_set rfd;	fd_set rfd;
struct ether_header eth;	struct ether_header eth;
Line 79 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);

if (!(buf = malloc(len))) {	if (!(buf = e_malloc(len))) {
printf("Error:: no enough memory #%d - %s\n", errno, strerror(errno));	printf("Error:: no enough memory #%d - %s\n", errno, strerror(errno));
return -1;	return -1;
}	}

if (SetRemoteWinz(h, ea, buf, len) == -1) {	if (SetRemoteWinz(h, ea, buf, len) == -1) {
free(buf);	e_free(buf);
return -1;	return -1;
}	}

Line 129 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 182 ConnectL2(int h, struct ether_addr *ea, int len)	Line 174 ConnectL2(int h, struct ether_addr *ea, int len)
} 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) {
ret = -1;	ret = -1;
Line 199 ConnectL2(int h, struct ether_addr *ea, int len)	Line 183 ConnectL2(int h, struct ether_addr *ea, int len)
}	}

ioRestoreMode(STDIN_FILENO, otio);	ioRestoreMode(STDIN_FILENO, otio);
free(buf);	e_free(buf);
return ret;	return ret;
}	}

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

Removed from v.1.1.1.1.2.4
changed lines
	Added in v.1.4.4.1