ansh/src/daemon2.c - diff

Return to daemon2.c CVS log

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

Diff for /ansh/src/daemon2.c between versions 1.1.1.1.2.3 and 1.1.1.1.2.6

version 1.1.1.1.2.3, 2011/10/13 11:01:37	version 1.1.1.1.2.6, 2011/10/13 16:08:52
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"
#include "anshd.h"	#include "anshd.h"

Line 31 pktTx(sched_task_t *task)	Line 68 pktTx(sched_task_t *task)
}	}
}	}

if ((wlen = pktSend(TASK_FD(task), proc->proc_flg, Crypted, proc->proc_buf_[FD2NET],	if ((wlen = pktSend(TASK_FD(task), ++proc->proc_seq, proc->proc_flg, Crypted,
proc->proc_rlen_[FD2NET], &proc->proc_ea)) != ANSH_FLG_ERR) {	proc->proc_buf_[FD2NET], proc->proc_rlen_[FD2NET],
	&proc->proc_ea)) != ANSH_FLG_ERR) {
proc->proc_flg = ANSH_FLG_OK;	proc->proc_flg = ANSH_FLG_OK;
proc->proc_rlen_[FD2NET] = 0;	proc->proc_rlen_[FD2NET] = 0;
}	}
Line 50 pktRx(sched_task_t *task)	Line 88 pktRx(sched_task_t *task)
struct tagProc *proc = NULL;	struct tagProc *proc = NULL;
char ret;	char ret;
u_short *b;	u_short *b;
	u_int seq;

FTRACE(3);	FTRACE(3);

rlen = bpfLEN;	rlen = bpfLEN;
if (!(buf = malloc(rlen)))	if (!(buf = malloc(rlen)))
goto end;	goto end;
	else
	memset(buf, 0, rlen);

if ((ret = pktRecv(TASK_FD(task), &Crypted, buf, &rlen, &eth)) == ANSH_FLG_ERR)	if ((ret = pktRecv(TASK_FD(task), &seq, &Crypted, buf, &rlen, &eth)) == ANSH_FLG_ERR)
goto end;	goto end;
VERB(5) LOG("Received %d bytes", rlen);	VERB(5) LOG("Received %d bytes", rlen);
if (!(ret & ANSH_FLG_CPOUT))	if (!(ret & ANSH_FLG_CPOUT))
Line 86 pktRx(sched_task_t *task)	Line 127 pktRx(sched_task_t *task)
switch (ret) {	switch (ret) {
case ANSH_FLG_EOF:	case ANSH_FLG_EOF:
case ANSH_FLG_CPOUT:	case ANSH_FLG_CPOUT:
	if (seq <= proc->proc_seq)
	goto end;
	else if (seq > (proc->proc_seq + 1))
	LOG("LOST PACKET(s) detect: %d; received seq=%d - %d",
	seq - proc->proc_seq + 1, seq, proc->proc_seq);
	proc->proc_seq = seq;
break;	break;
case ANSH_FLG_WINZ:	case ANSH_FLG_WINZ:
b = (u_short*) buf;	b = (u_short*) buf;
Line 132 fdTx(sched_task_t *task)	Line 179 fdTx(sched_task_t *task)
schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);	schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);

proc->proc_pid = 0;	proc->proc_pid = 0;
	proc->proc_seq = 0;
proc->proc_flg = ANSH_FLG_EOF;	proc->proc_flg = ANSH_FLG_EOF;
proc->proc_rlen_[FD2NET] = 0;	proc->proc_rlen_[FD2NET] = 0;

Line 153 fdTx(sched_task_t *task)	Line 201 fdTx(sched_task_t *task)
schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);	schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);

proc->proc_pid = 0;	proc->proc_pid = 0;
	proc->proc_seq = 0;
proc->proc_flg = ANSH_FLG_EOF;	proc->proc_flg = ANSH_FLG_EOF;
proc->proc_rlen_[FD2NET] = 0;	proc->proc_rlen_[FD2NET] = 0;

Line 192 fdRx(sched_task_t *task)	Line 241 fdRx(sched_task_t *task)
schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);	schedCancelby(TASK_ROOT(task), NULL, CRITERIA_FD, (void*) TASK_FD(task), NULL);

proc->proc_pid = 0;	proc->proc_pid = 0;
	proc->proc_seq = 0;
proc->proc_flg = ANSH_FLG_EOF;	proc->proc_flg = ANSH_FLG_EOF;
proc->proc_rlen_[FD2NET] = 0;	proc->proc_rlen_[FD2NET] = 0;

Line 217 fdRx(sched_task_t *task)	Line 267 fdRx(sched_task_t *task)
VERB(3) LOG("EOF process status %d", rlen);	VERB(3) LOG("EOF process status %d", rlen);

proc->proc_pid = 0;	proc->proc_pid = 0;
	proc->proc_seq = 0;
proc->proc_flg = ANSH_FLG_EOF;	proc->proc_flg = ANSH_FLG_EOF;
proc->proc_rlen_[FD2NET] = 0;	proc->proc_rlen_[FD2NET] = 0;

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

Removed from v.1.1.1.1.2.3
changed lines
	Added in v.1.1.1.1.2.6