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.3 and 1.4

version 1.3, 2012/01/23 10:34:12	version 1.4, 2012/07/22 22:41:33
Line 84 pktRx(sched_task_t *task)	Line 84 pktRx(sched_task_t *task)
FTRACE(3);	FTRACE(3);

rlen = bpfLEN;	rlen = bpfLEN;
if (!(buf = malloc(rlen)))	if (!(buf = io_malloc(rlen)))
goto end;	goto end;
else	else
memset(buf, 0, rlen);	memset(buf, 0, rlen);
Line 133 pktRx(sched_task_t *task)	Line 133 pktRx(sched_task_t *task)
proc->proc_rlen_[NET2FD] = rlen;	proc->proc_rlen_[NET2FD] = rlen;
memset(proc->proc_buf_[NET2FD], 0, proc->proc_blen);	memset(proc->proc_buf_[NET2FD], 0, proc->proc_blen);
memcpy(proc->proc_buf_[NET2FD], buf, proc->proc_rlen_[NET2FD]);	memcpy(proc->proc_buf_[NET2FD], buf, proc->proc_rlen_[NET2FD]);
schedWrite(TASK_ROOT(task), fdTx, proc, proc->proc_pty);	schedWrite(TASK_ROOT(task), fdTx, proc, proc->proc_pty, NULL, 0);
end:	end:
free(buf);	io_free(buf);
schedRead(TASK_ROOT(task), pktRx, NULL, proc ? proc->proc_sock : TASK_FD(task));	schedRead(TASK_ROOT(task), pktRx, NULL, proc ? proc->proc_sock : TASK_FD(task), NULL, 0);
return NULL;	return NULL;
}	}

Line 144 void *	Line 144 void *
fdTx(sched_task_t *task)	fdTx(sched_task_t *task)
{	{
struct tagProc *proc;	struct tagProc *proc;
struct timeval tv = { 0 };	struct timespec ts = { 0 };
int wlen;	int wlen;

FTRACE(3);	FTRACE(3);
Line 159 fdTx(sched_task_t *task)	Line 159 fdTx(sched_task_t *task)

/* if Timeout defined, disarm timer */	/* if Timeout defined, disarm timer */
if (Timeout)	if (Timeout)
schedCancelby(TASK_ROOT(task), &TASK_ROOT(task)->root_timer, CRITERIA_CALL, TOfunc, NULL);	schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, TOfunc, NULL);

wlen = write(TASK_FD(task), proc->proc_buf_[NET2FD], proc->proc_rlen_[NET2FD]);	wlen = write(TASK_FD(task), proc->proc_buf_[NET2FD], proc->proc_rlen_[NET2FD]);
switch (wlen) {	switch (wlen) {
Line 175 fdTx(sched_task_t *task)	Line 175 fdTx(sched_task_t *task)

/* if Timeout defined, go arm timer */	/* if Timeout defined, go arm timer */
if (Timeout) {	if (Timeout) {
tv.tv_sec = Timeout;	ts.tv_sec = Timeout;
schedTimer(TASK_ROOT(task), TOfunc, proc, tv);	schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0);
}	}
return NULL;	return NULL;
}	}
Line 185 void *	Line 185 void *
fdRx(sched_task_t *task)	fdRx(sched_task_t *task)
{	{
struct tagProc *proc;	struct tagProc *proc;
struct timeval tv = { 0 };	struct timespec ts = { 0 };
int rlen;	int rlen;

FTRACE(3);	FTRACE(3);
Line 198 fdRx(sched_task_t *task)	Line 198 fdRx(sched_task_t *task)

/* if Timeout defined, disarm timer */	/* if Timeout defined, disarm timer */
if (Timeout)	if (Timeout)
schedCancelby(TASK_ROOT(task), &TASK_ROOT(task)->root_timer, CRITERIA_CALL, TOfunc, NULL);	schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, TOfunc, NULL);

memset(proc->proc_buf_[FD2NET], 0, proc->proc_blen);	memset(proc->proc_buf_[FD2NET], 0, proc->proc_blen);
rlen = read(TASK_FD(task), proc->proc_buf_[FD2NET],	rlen = read(TASK_FD(task), proc->proc_buf_[FD2NET],
Line 215 fdRx(sched_task_t *task)	Line 215 fdRx(sched_task_t *task)
}	}
VERB(3) LOG("Readed %d bytes - %s", rlen, proc->proc_buf_[FD2NET]);	VERB(3) LOG("Readed %d bytes - %s", rlen, proc->proc_buf_[FD2NET]);

schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock);	schedCallOnce(TASK_ROOT(task), pktTx, proc, proc->proc_sock, NULL, 0);
schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty);	schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty, NULL, 0);

/* if Timeout defined, go arm timer */	/* if Timeout defined, go arm timer */
if (Timeout) {	if (Timeout) {
tv.tv_sec = Timeout;	ts.tv_sec = Timeout;
schedTimer(TASK_ROOT(task), TOfunc, proc, tv);	schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0);
}	}
return NULL;	return NULL;
}	}
Line 230 int	Line 230 int
spawnLogin(sched_task_t task, struct tagProc proc)	spawnLogin(sched_task_t task, struct tagProc proc)
{	{
int flg;	int flg;
struct timeval tv = { 0 };	struct timespec ts = { 0 };
char str[STRSIZ] = { 0 };	char str[STRSIZ] = { 0 };

FTRACE(3);	FTRACE(3);
Line 255 spawnLogin(sched_task_t task, struct tagProc proc)	Line 255 spawnLogin(sched_task_t task, struct tagProc proc)
fcntl(proc->proc_pty, F_SETFL, flg \| O_NONBLOCK);	fcntl(proc->proc_pty, F_SETFL, flg \| O_NONBLOCK);

VERB(3) LOG("Parent know child pid %d", proc->proc_pid);	VERB(3) LOG("Parent know child pid %d", proc->proc_pid);
schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty);	schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty, NULL, 0);

/* if Timeout defined, go arm timer */	/* if Timeout defined, go arm timer */
if (Timeout) {	if (Timeout) {
tv.tv_sec = Timeout;	ts.tv_sec = Timeout;
schedTimer(TASK_ROOT(task), TOfunc, proc, tv);	schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0);
}	}
break;	break;
}	}

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

Removed from v.1.3
changed lines
	Added in v.1.4