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.1.1.1.2.1 and 1.5

version 1.1.1.1.2.1, 2011/10/05 23:57:24	version 1.5, 2015/05/19 23:25:30
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, 2013
	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, 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 27 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, 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, 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;	u_char buf, str;
socklen_t sl;	socklen_t sl;
	u_int sq, 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, id, sa, buf, len) == -1) {	if (SetRemoteWinz(h, id, sa, buf, len) == -1) {
free(buf);	e_free(buf);
return -1;	return -1;
}	}

Line 68 ConnectL3(int h, u_short id, struct sockaddr *sa, int	Line 106 ConnectL3(int h, u_short id, struct sockaddr *sa, int
ret = -1;	ret = -1;
break;	break;
}	}
if (FD_ISSET(STDIN_FILENO, &rfd)) {	if (FD_ISSET(h, &rfd)) {
	sl = sizeof s;
	rlen = len;
	memset(buf, 0, rlen);
	flg = icmpRecv(h, &sq, &aid, &Crypted, buf, &rlen, &s, &sl);
	if (flg == ANSH_FLG_ERR) {
	ret = -1;
	break;
	}
	if (aid != id) {
	VERB(4) LOG("different service id %d / %d\n", aid, id);
	continue;
	}
	if (flg == ANSH_FLG_EOF) {
	VERB(3) LOG("receive EOF going down.\n");
	Kill++;
	}
	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);
	e_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);	memset(buf, 0, len);
rlen = read(STDIN_FILENO, buf, len);	rlen = read(STDIN_FILENO, buf, len);
if (rlen == -1) {	if (rlen == -1) {
Line 107 ConnectL3(int h, u_short id, struct sockaddr *sa, int	Line 185 ConnectL3(int h, u_short id, struct sockaddr *sa, int
} else	} else
nl ^= nl;	nl ^= nl;

rlen = icmpSend(h, id, ANSH_FLG_CPOUT, buf, rlen, sa, sizeof(struct sockaddr));	if (Crypted) {
	str = cryptBuffer(buf, rlen, Crypted);
	if (str) {
	memcpy(buf, str, rlen);
	e_free(str);
	}
	}

	rlen = icmpSend(h, ++Seq, id, ANSH_FLG_CPOUT, Crypted, buf, rlen, sa, sizeof(struct sockaddr));
if (rlen == ANSH_FLG_ERR) {	if (rlen == ANSH_FLG_ERR) {
ret = -1;	ret = -1;
break;	break;
}	}
} else {
sl = sizeof s;
rlen = len;
memset(buf, 0, rlen);
flg = icmpRecv(h, &aid, buf, &rlen, &s, &sl);
if (flg == ANSH_FLG_ERR) {
ret = -1;
break;
}
if (aid != id) {
VERB(4) LOG("different service id %d / %d\n", aid, id);
continue;
}
if (flg == ANSH_FLG_EOF) {
VERB(3) LOG("receive EOF going down.\n");
Kill++;
}
if (flg != ANSH_FLG_OK)
continue;
rlen = write(STDOUT_FILENO, buf, rlen);
if (rlen == -1) {
printf("Error:: write(stdout) #%d - %s\n", errno, strerror(errno));
ret = -1;
break;
}
}	}
}	}

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