--- ansh/src/daemon2.c 2011/10/14 12:07:01 1.1.1.1.2.9 +++ ansh/src/daemon2.c 2011/10/31 15:49:37 1.2.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ - * $Id: daemon2.c,v 1.1.1.1.2.9 2011/10/14 12:07:01 misho Exp $ + * $Id: daemon2.c,v 1.2.2.1 2011/10/31 15:49:37 misho Exp $ * ************************************************************************* The ELWIX and AITNET software is distributed under the following @@ -52,7 +52,6 @@ pktTx(sched_task_t *task) { struct tagProc *proc; int wlen; - u_char *str; FTRACE(3); @@ -60,14 +59,6 @@ pktTx(sched_task_t *task) if (!(proc = TASK_ARG(task))) return (void*) -1; - if (Crypted) { - 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); - } - } - if ((wlen = pktSend(TASK_FD(task), ++proc->proc_seq, proc->proc_flg, Crypted, proc->proc_buf_[FD2NET], proc->proc_rlen_[FD2NET], &proc->proc_ea)) != ANSH_FLG_ERR) { @@ -82,7 +73,7 @@ pktTx(sched_task_t *task) void * pktRx(sched_task_t *task) { - u_char *buf, *str; + u_char *buf; struct ether_header eth; int rlen, n = 0; struct tagProc *proc = NULL; @@ -116,14 +107,6 @@ pktRx(sched_task_t *task) goto end; } - if (Crypted) { - str = cryptBuffer(buf, rlen, Crypted); - if (str) { - memcpy(buf, str, rlen); - free(str); - } - } - switch (ret) { case ANSH_FLG_EOF: case ANSH_FLG_CPOUT: @@ -262,7 +245,7 @@ spawnLogin(sched_task_t *task, struct tagProc *proc) case 0: printf("anshd ELWIX remote management system (%s)\n\n", proc->proc_ttyname); strlcpy(str, "-hansh@", sizeof str); - io_ether_ntoa((const struct io_ether_addr*) &proc->proc_ea, str + 7, 18); + io_ether_ntoa((const io_ether_addr_t*) &proc->proc_ea, str + 7, 18); execl("/usr/bin/login", "login", str, NULL); /* never reached */