version 1.2.2.7, 2014/02/20 16:04:03
|
version 1.2.2.8, 2014/02/20 16:30:05
|
Line 6
|
Line 6
|
static void * |
static void * |
timeoutSession(sched_task_t *task) |
timeoutSession(sched_task_t *task) |
{ |
{ |
|
rpack_t *pkt = TASK_DATA(task); |
|
|
ETRACE(); |
ETRACE(); |
|
|
/* drop session */ |
/* drop session */ |
if (cli.fd > 2) |
if (cli.fd > 2) |
close(cli.fd); |
close(cli.fd); |
|
rpack_resize(pkt, TFTP_PKT_MAX); |
memset(&cli, 0, sizeof cli); |
memset(&cli, 0, sizeof cli); |
|
|
taskExit(task, NULL); |
taskExit(task, NULL); |
Line 35 txPkt(sched_task_t *task)
|
Line 38 txPkt(sched_task_t *task)
|
schedEvent(TASK_ROOT(task), execProg, "error", 0, NULL, TFTP_OPC_ERROR); |
schedEvent(TASK_ROOT(task), execProg, "error", 0, NULL, TFTP_OPC_ERROR); |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, |
timeoutSession, NULL); |
timeoutSession, NULL); |
schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0); | schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, TASK_DATA(task), 0); |
} else |
} else |
EVERBOSE(2, "Sended %d bytes", wlen); |
EVERBOSE(2, "Sended %d bytes", wlen); |
/* on error or argument, drop session */ |
/* on error or argument, drop session */ |
Line 43 txPkt(sched_task_t *task)
|
Line 46 txPkt(sched_task_t *task)
|
schedEvent(TASK_ROOT(task), execProg, "error", 0, NULL, TFTP_OPC_ERROR); |
schedEvent(TASK_ROOT(task), execProg, "error", 0, NULL, TFTP_OPC_ERROR); |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, |
timeoutSession, NULL); |
timeoutSession, NULL); |
schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0); | schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, TASK_DATA(task), 0); |
} |
} |
|
|
taskExit(task, NULL); |
taskExit(task, NULL); |
Line 117 txAck(sched_task_t *task)
|
Line 120 txAck(sched_task_t *task)
|
if (cli.close) { |
if (cli.close) { |
schedEvent(TASK_ROOT(task), execProg, "complete", 0, NULL, TFTP_OPC_WRQ); |
schedEvent(TASK_ROOT(task), execProg, "complete", 0, NULL, TFTP_OPC_WRQ); |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL); |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL); |
schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0); | schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, TASK_DATA(task), 0); |
EVERBOSE(2, "Finish WRQ request"); |
EVERBOSE(2, "Finish WRQ request"); |
} |
} |
taskExit(task, NULL); |
taskExit(task, NULL); |
Line 154 getOpts(rpack_t * __restrict pkt, int rlen)
|
Line 157 getOpts(rpack_t * __restrict pkt, int rlen)
|
return -1; |
return -1; |
EVERBOSE(7, "val=%s rlen=%d", val, rlen); |
EVERBOSE(7, "val=%s rlen=%d", val, rlen); |
|
|
if (!strcasecmp(opt, TFTP_OPT_BLKSIZE)) { | if (!strcasecmp(opt, TFTP_OPT_BLKSIZE)) |
cli.tmp = strtol(val, NULL, 10); |
cli.tmp = strtol(val, NULL, 10); |
} else if (!strcasecmp(opt, TFTP_OPT_TSIZE)) | else if (!strcasecmp(opt, TFTP_OPT_TSIZE)) |
cli.tsiz = strtoll(val, NULL, 10); |
cli.tsiz = strtoll(val, NULL, 10); |
else if (!strcasecmp(opt, TFTP_OPT_TIMEOUT)) |
else if (!strcasecmp(opt, TFTP_OPT_TIMEOUT)) |
cli.tout = strtol(val, NULL, 10); | cli.tout.tv_sec = strtol(val, NULL, 10); |
else if (!strcasecmp(opt, TFTP_OPT_ROLLOVER)) |
else if (!strcasecmp(opt, TFTP_OPT_ROLLOVER)) |
cli.roll = strtol(val, NULL, 10); |
cli.roll = strtol(val, NULL, 10); |
} while (rlen > 0); |
} while (rlen > 0); |
|
|
EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", |
EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", |
cli.siz, cli.tsiz, cli.tout, cli.roll); | cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll); |
return 0; |
return 0; |
} |
} |
|
|
Line 198 txOack(sched_task_t *task)
|
Line 201 txOack(sched_task_t *task)
|
rpack_rdata(pkt, TFTP_OPT_TSIZE, strlen(TFTP_OPT_TSIZE) + 1); |
rpack_rdata(pkt, TFTP_OPT_TSIZE, strlen(TFTP_OPT_TSIZE) + 1); |
rpack_rdata(pkt, szStr, strlen(szStr) + 1); |
rpack_rdata(pkt, szStr, strlen(szStr) + 1); |
} |
} |
if (cli.tout) { | if (cli.tout.tv_sec) { |
memset(szStr, 0, sizeof szStr); |
memset(szStr, 0, sizeof szStr); |
snprintf(szStr, sizeof szStr, "%u", cli.tout); | snprintf(szStr, sizeof szStr, "%u", cli.tout.tv_sec); |
rpack_rdata(pkt, TFTP_OPT_TIMEOUT, strlen(TFTP_OPT_TIMEOUT) + 1); |
rpack_rdata(pkt, TFTP_OPT_TIMEOUT, strlen(TFTP_OPT_TIMEOUT) + 1); |
rpack_rdata(pkt, szStr, strlen(szStr) + 1); |
rpack_rdata(pkt, szStr, strlen(szStr) + 1); |
} |
} |
Line 212 txOack(sched_task_t *task)
|
Line 215 txOack(sched_task_t *task)
|
} |
} |
|
|
EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", |
EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u", |
cli.siz, cli.tsiz, cli.tout, cli.roll); | cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll); |
schedEvent(TASK_ROOT(task), txPkt, NULL, TASK_FD(task), |
schedEvent(TASK_ROOT(task), txPkt, NULL, TASK_FD(task), |
TASK_DATA(task), RPACK_OFF(pkt)); |
TASK_DATA(task), RPACK_OFF(pkt)); |
taskExit(task, NULL); |
taskExit(task, NULL); |
Line 297 RQ(sched_task_t *task)
|
Line 300 RQ(sched_task_t *task)
|
else |
else |
cli.siz = cli.tmp; |
cli.siz = cli.tmp; |
} |
} |
|
if (cli.tout.tv_sec) { |
|
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, |
|
timeoutSession, NULL); |
|
schedTimer(TASK_ROOT(task), timeoutSession, NULL, |
|
cli.tout, TASK_DATA(task), 0); |
|
} |
schedEvent(TASK_ROOT(task), txOack, NULL, TASK_FD(task), |
schedEvent(TASK_ROOT(task), txOack, NULL, TASK_FD(task), |
TASK_DATA(task), 0); |
TASK_DATA(task), 0); |
} else if (cli.opc == TFTP_OPC_WRQ) { |
} else if (cli.opc == TFTP_OPC_WRQ) { |
Line 357 ACK(sched_task_t *task)
|
Line 366 ACK(sched_task_t *task)
|
else { |
else { |
schedEvent(TASK_ROOT(task), execProg, "complete", 0, NULL, TFTP_OPC_RRQ); |
schedEvent(TASK_ROOT(task), execProg, "complete", 0, NULL, TFTP_OPC_RRQ); |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL); |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL); |
schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, NULL, 0); | schedEvent(TASK_ROOT(task), timeoutSession, NULL, 0, TASK_DATA(task), 0); |
EVERBOSE(2, "Finish RRQ request"); |
EVERBOSE(2, "Finish RRQ request"); |
} |
} |
taskExit(task, NULL); |
taskExit(task, NULL); |
Line 498 rxPkt(sched_task_t *task)
|
Line 507 rxPkt(sched_task_t *task)
|
} |
} |
|
|
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL); |
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_CALL, timeoutSession, NULL); |
schedTimer(TASK_ROOT(task), timeoutSession, NULL, timeout, NULL, 0); | schedTimer(TASK_ROOT(task), timeoutSession, NULL, |
| cli.tout.tv_sec ? cli.tout : timeout, TASK_DATA(task), 0); |
end: |
end: |
schedReadSelf(task); |
schedReadSelf(task); |
taskExit(task, NULL); |
taskExit(task, NULL); |