--- tftpd/src/srv.c 2014/02/14 15:38:37 1.1 +++ tftpd/src/srv.c 2014/02/17 14:28:29 1.2 @@ -1,4 +1,6 @@ #include "global.h" +#include "exec.h" +#include "srv.h" static void * @@ -30,16 +32,18 @@ txPkt(sched_task_t *task) else if (wlen != TASK_DATLEN(task)) { EERROR(EIO, "Sended %d bytes != packet %d bytes", wlen, TASK_DATLEN(task)); + schedEvent(TASK_ROOT(task), execProg, "error", 0, NULL, TFTP_OPC_ERROR); schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL); - memset(&cli, 0, sizeof(sockaddr_t)); + schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0); } else EVERBOSE(2, "Sended %d bytes", wlen); /* on error or argument, drop session */ if (TASK_ARG(task) == (void*) -1 || ntohs(tftp->tftp_opc) == TFTP_OPC_ERROR) { + schedEvent(TASK_ROOT(task), execProg, "error", 0, NULL, TFTP_OPC_ERROR); schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL); - memset(&cli, 0, sizeof cli); + schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0); } taskExit(task, NULL); @@ -104,6 +108,7 @@ txAck(sched_task_t *task) TASK_DATA(task), RPACK_OFF(pkt)); if (cli.close) { + schedEvent(TASK_ROOT(task), execProg, "complete", 0, NULL, TFTP_OPC_WRQ); schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL); schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0); EVERBOSE(2, "Finish WRQ request"); @@ -178,6 +183,8 @@ RQ(sched_task_t *task) } else cli.seq = 0; + schedEvent(TASK_ROOT(task), execProg, "request", 0, NULL, cli.opc); + if (cli.opc == TFTP_OPC_WRQ) { /* ack */ tftp->tftp_opc = htons(TFTP_OPC_ACK); @@ -234,6 +241,7 @@ ACK(sched_task_t *task) schedEvent(TASK_ROOT(task), txData, NULL, TASK_FD(task), TASK_DATA(task), 0); else { + schedEvent(TASK_ROOT(task), execProg, "complete", 0, NULL, TFTP_OPC_RRQ); schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL); schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0); EVERBOSE(2, "Finish RRQ request");