ansh/src/client3.c - diff

Return to client3.c CVS log

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

Diff for /ansh/src/client3.c between versions 1.2 and 1.5

version 1.2, 2011/10/17 20:14:02	version 1.5, 2015/05/19 23:25:30
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, u_short id, struct sockaddr sa, u_char buf, int buflen)	SetRemoteWinz(int h, u_short id, sockaddr_t sa, u_char buf, int buflen)
{	{
u_short pos = (u_short) buf;	u_short pos = (u_short) buf;
struct winsize ws;	struct winsize ws;
Line 64 SetRemoteWinz(int h, u_short id, struct sockaddr *sa,	Line 64 SetRemoteWinz(int h, u_short id, struct sockaddr *sa,
pos[1] = htons(ws.ws_col);	pos[1] = htons(ws.ws_col);
pos[2] = htons(ws.ws_xpixel);	pos[2] = htons(ws.ws_xpixel);
pos[3] = htons(ws.ws_ypixel);	pos[3] = htons(ws.ws_ypixel);
if (icmpSend(h, 0, id, ANSH_FLG_WINZ, Crypted, buf, sizeof ws, sa, sizeof(struct sockaddr)) == -1)	if (icmpSend(h, 0, id, ANSH_FLG_WINZ, Crypted, buf, sizeof ws, sa, sa->sa.sa_len) == -1)
return -1;	return -1;

return 0;	return 0;
}	}

int	int
ConnectL3(int h, u_short id, struct sockaddr *sa, int len)	ConnectL3(int h, u_short id, sockaddr_t *sa, int len)
{	{
fd_set rfd;	fd_set rfd;
struct timeval tv = { Timeout, 0 };	struct timeval tv = { Timeout, 0 };
struct termios otio;	struct termios otio;
int rlen, ret = 0;	int rlen, ret = 0;
u_short aid;	u_short aid;
struct sockaddr s;	sockaddr_t s;
char flg, nl = 0;	char flg, nl = 0;
u_char buf, str;	u_char buf, str;
socklen_t sl;	socklen_t sl;
Line 86 ConnectL3(int h, u_short id, struct sockaddr *sa, int	Line 86 ConnectL3(int h, u_short id, struct sockaddr *sa, int

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, id, sa, buf, len) == -1) {	if (SetRemoteWinz(h, id, sa, buf, len) == -1) {
free(buf);	e_free(buf);
return -1;	return -1;
}	}

Line 136 ConnectL3(int h, u_short id, struct sockaddr *sa, int	Line 136 ConnectL3(int h, u_short id, struct sockaddr *sa, int
str = cryptBuffer(buf, rlen, Crypted);	str = cryptBuffer(buf, rlen, Crypted);
if (str) {	if (str) {
memcpy(buf, str, rlen);	memcpy(buf, str, rlen);
free(str);	e_free(str);
}	}
}	}

Line 189 ConnectL3(int h, u_short id, struct sockaddr *sa, int	Line 189 ConnectL3(int h, u_short id, struct sockaddr *sa, int
str = cryptBuffer(buf, rlen, Crypted);	str = cryptBuffer(buf, rlen, Crypted);
if (str) {	if (str) {
memcpy(buf, str, rlen);	memcpy(buf, str, rlen);
free(str);	e_free(str);
}	}
}	}

Line 202 ConnectL3(int h, u_short id, struct sockaddr *sa, int	Line 202 ConnectL3(int h, u_short id, struct sockaddr *sa, int
}	}

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.2
changed lines
	Added in v.1.5