--- ansh/src/daemon3.c 2012/01/23 10:34:13 1.3 +++ ansh/src/daemon3.c 2012/05/23 15:41:38 1.3.2.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: daemon3.c,v 1.3 2012/01/23 10:34:13 misho Exp $ + * $Id: daemon3.c,v 1.3.2.3 2012/05/23 15:41:38 misho Exp $ * ************************************************************************* The ELWIX and AITNET software is distributed under the following @@ -64,7 +64,7 @@ icmpTx(sched_task_t *task) str = cryptBuffer(proc->proc_buf_[FD2NET], proc->proc_rlen_[FD2NET], Crypted); if (str) { memcpy(proc->proc_buf_[FD2NET], str, proc->proc_rlen_[FD2NET]); - free(str); + io_free(str); } } @@ -93,7 +93,7 @@ icmpRx(sched_task_t *task) FTRACE(3); rlen = bpfLEN; - if (!(buf = malloc(rlen))) + if (!(buf = io_malloc(rlen))) goto end; else memset(buf, 0, rlen); @@ -121,7 +121,7 @@ icmpRx(sched_task_t *task) str = cryptBuffer(buf, rlen, Crypted); if (str) { memcpy(buf, str, rlen); - free(str); + io_free(str); } } @@ -151,10 +151,10 @@ icmpRx(sched_task_t *task) proc->proc_rlen_[NET2FD] = rlen; memset(proc->proc_buf_[NET2FD], 0, proc->proc_blen); 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: - free(buf); - schedRead(TASK_ROOT(task), icmpRx, NULL, proc ? proc->proc_sock : TASK_FD(task)); + io_free(buf); + schedRead(TASK_ROOT(task), icmpRx, NULL, proc ? proc->proc_sock : TASK_FD(task), NULL, 0); return NULL; } @@ -162,7 +162,7 @@ void * fdTx(sched_task_t *task) { struct tagProc *proc; - struct timeval tv = { 0 }; + struct timespec ts = { 0 }; int wlen; FTRACE(3); @@ -177,7 +177,7 @@ fdTx(sched_task_t *task) /* if Timeout defined, disarm timer */ 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]); switch (wlen) { @@ -193,8 +193,8 @@ fdTx(sched_task_t *task) /* if Timeout defined, go arm timer */ if (Timeout) { - tv.tv_sec = Timeout; - schedTimer(TASK_ROOT(task), TOfunc, proc, tv); + ts.tv_sec = Timeout; + schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0); } return NULL; } @@ -203,7 +203,7 @@ void * fdRx(sched_task_t *task) { struct tagProc *proc; - struct timeval tv = { 0 }; + struct timespec ts = { 0 }; int rlen; FTRACE(3); @@ -216,7 +216,7 @@ fdRx(sched_task_t *task) /* if Timeout defined, disarm timer */ 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); rlen = read(TASK_FD(task), proc->proc_buf_[FD2NET], @@ -233,13 +233,13 @@ fdRx(sched_task_t *task) } VERB(3) LOG("Readed %d bytes - %s", rlen, proc->proc_buf_[FD2NET]); - schedWrite(TASK_ROOT(task), icmpTx, proc, proc->proc_sock); - schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty); + schedWrite(TASK_ROOT(task), icmpTx, proc, proc->proc_sock, NULL, 0); + schedRead(TASK_ROOT(task), fdRx, proc, proc->proc_pty, NULL, 0); /* if Timeout defined, go arm timer */ if (Timeout) { - tv.tv_sec = Timeout; - schedTimer(TASK_ROOT(task), TOfunc, proc, tv); + ts.tv_sec = Timeout; + schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0); } return NULL; } @@ -248,7 +248,7 @@ int spawnLogin(sched_task_t *task, struct tagProc *proc) { int flg; - struct timeval tv = { 0 }; + struct timespec ts = { 0 }; char str[STRSIZ] = { 0 }; FTRACE(3); @@ -276,12 +276,12 @@ spawnLogin(sched_task_t *task, struct tagProc *proc) fcntl(proc->proc_pty, F_SETFL, flg | O_NONBLOCK); 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) { - tv.tv_sec = Timeout; - schedTimer(TASK_ROOT(task), TOfunc, proc, tv); + ts.tv_sec = Timeout; + schedTimer(TASK_ROOT(task), TOfunc, proc, ts, NULL, 0); } break; }