version 1.2.2.10, 2014/02/20 23:11:18
|
version 1.5, 2014/02/21 09:02:28
|
Line 76 txData(sched_task_t *task)
|
Line 76 txData(sched_task_t *task)
|
len = pread(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz); |
len = pread(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz); |
if (len == -1) { |
if (len == -1) { |
ESYSERR(0); |
ESYSERR(0); |
code = htole16(3); | code = htons(3); |
goto end; |
goto end; |
} else { |
} else { |
rpack_rnext(pkt, len); |
rpack_rnext(pkt, len); |
Line 94 end:
|
Line 94 end:
|
n = htons(TFTP_OPC_ERROR); |
n = htons(TFTP_OPC_ERROR); |
rpack_uint16(pkt, &n, 0); |
rpack_uint16(pkt, &n, 0); |
rpack_uint16(pkt, &code, 0); |
rpack_uint16(pkt, &code, 0); |
rpack_rdata(pkt, errs[le16toh(code)].err_msg, strlen(errs[le16toh(code)].err_msg) + 1); | rpack_rdata(pkt, errs[ntohs(code)].err_msg, strlen(errs[ntohs(code)].err_msg) + 1); |
|
|
schedEvent(TASK_ROOT(task), txPkt, (void*) -1, TASK_FD(task), |
schedEvent(TASK_ROOT(task), txPkt, (void*) -1, TASK_FD(task), |
TASK_DATA(task), RPACK_OFF(pkt)); |
TASK_DATA(task), RPACK_OFF(pkt)); |
Line 163 getOpts(rpack_t * __restrict pkt, int rlen)
|
Line 163 getOpts(rpack_t * __restrict pkt, int rlen)
|
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.tv_sec = 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); |
|
cli.roll++; |
|
} |
} 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.tv_sec, cli.roll); | cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll - 1); |
return 0; |
return 0; |
} |
} |
|
|
Line 209 txOack(sched_task_t *task)
|
Line 211 txOack(sched_task_t *task)
|
} |
} |
if (cli.roll) { |
if (cli.roll) { |
memset(szStr, 0, sizeof szStr); |
memset(szStr, 0, sizeof szStr); |
snprintf(szStr, sizeof szStr, "%u", cli.roll); | snprintf(szStr, sizeof szStr, "%u", cli.roll - 1); |
rpack_rdata(pkt, TFTP_OPT_ROLLOVER, strlen(TFTP_OPT_ROLLOVER) + 1); |
rpack_rdata(pkt, TFTP_OPT_ROLLOVER, strlen(TFTP_OPT_ROLLOVER) + 1); |
rpack_rdata(pkt, szStr, strlen(szStr) + 1); |
rpack_rdata(pkt, szStr, strlen(szStr) + 1); |
} |
} |
|
|
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.tv_sec, cli.roll); | cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll - 1); |
schedEvent(TASK_ROOT(task), txPkt, NULL, TASK_FD(task), | schedCallOnce(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 254 RQ(sched_task_t *task)
|
Line 256 RQ(sched_task_t *task)
|
strlcpy(cli.mode, TFTP_MODE_OCTET, sizeof cli.mode); |
strlcpy(cli.mode, TFTP_MODE_OCTET, sizeof cli.mode); |
else if (!strcasecmp(str, TFTP_MODE_MAIL)) { |
else if (!strcasecmp(str, TFTP_MODE_MAIL)) { |
strlcpy(cli.mode, TFTP_MODE_MAIL, sizeof cli.mode); |
strlcpy(cli.mode, TFTP_MODE_MAIL, sizeof cli.mode); |
code = htole16(4); | code = htons(4); |
goto end; |
goto end; |
} else { |
} else { |
code = htole16(1); | code = htons(1); |
goto end; |
goto end; |
} |
} |
} |
} |
Line 279 RQ(sched_task_t *task)
|
Line 281 RQ(sched_task_t *task)
|
cli.fd = open(cli.file, code, 0644); |
cli.fd = open(cli.file, code, 0644); |
if (cli.fd == -1) { |
if (cli.fd == -1) { |
if (errno == EACCES) |
if (errno == EACCES) |
code = htole16(2); | code = htons(2); |
else if (errno == ENFILE) |
else if (errno == ENFILE) |
code = htole16(3); | code = htons(3); |
else if (errno == EEXIST) |
else if (errno == EEXIST) |
code = htole16(6); | code = htons(6); |
else |
else |
code = htole16(0); | code = htons(0); |
ESYSERR(0); |
ESYSERR(0); |
goto end; |
goto end; |
} else |
} else |
Line 328 end:
|
Line 330 end:
|
RPACK_REWIND(pkt); |
RPACK_REWIND(pkt); |
rpack_uint16(pkt, NULL, 0); |
rpack_uint16(pkt, NULL, 0); |
rpack_uint16(pkt, &code, 0); |
rpack_uint16(pkt, &code, 0); |
rpack_rdata(pkt, errs[le16toh(code)].err_msg, strlen(errs[le16toh(code)].err_msg) + 1); | rpack_rdata(pkt, errs[ntohs(code)].err_msg, strlen(errs[ntohs(code)].err_msg) + 1); |
|
|
schedEvent(TASK_ROOT(task), txPkt, (void*) -1, TASK_FD(task), |
schedEvent(TASK_ROOT(task), txPkt, (void*) -1, TASK_FD(task), |
TASK_DATA(task), RPACK_OFF(pkt)); |
TASK_DATA(task), RPACK_OFF(pkt)); |
Line 347 ACK(sched_task_t *task)
|
Line 349 ACK(sched_task_t *task)
|
RPACK_REWIND(pkt); |
RPACK_REWIND(pkt); |
code = rpack_uint16(pkt, NULL, 0); |
code = rpack_uint16(pkt, NULL, 0); |
if (ntohs(code) != TFTP_OPC_ACK) { |
if (ntohs(code) != TFTP_OPC_ACK) { |
code = htole16(5); | code = htons(5); |
goto end; |
goto end; |
} |
} |
|
|
code = rpack_uint16(pkt, NULL, 0); |
code = rpack_uint16(pkt, NULL, 0); |
if (ntohs(code) > cli.seq || (ntohs(code) < (cli.seq - 1))) { |
if (ntohs(code) > cli.seq || (ntohs(code) < (cli.seq - 1))) { |
code = htole16(5); | code = htons(5); |
goto end; |
goto end; |
} else if (ntohs(code) == cli.seq) { |
} else if (ntohs(code) == cli.seq) { |
/* check for rollover seq id */ |
/* check for rollover seq id */ |
if (cli.roll && cli.seq == USHRT_MAX) |
if (cli.roll && cli.seq == USHRT_MAX) |
cli.seq = cli.roll; | cli.seq = cli.roll - 1; |
else |
else |
cli.seq++; |
cli.seq++; |
} |
} |
Line 380 end:
|
Line 382 end:
|
RPACK_REWIND(pkt); |
RPACK_REWIND(pkt); |
rpack_uint16(pkt, NULL, 0); |
rpack_uint16(pkt, NULL, 0); |
rpack_uint16(pkt, &code, 0); |
rpack_uint16(pkt, &code, 0); |
rpack_rdata(pkt, errs[le16toh(code)].err_msg, strlen(errs[le16toh(code)].err_msg) + 1); | rpack_rdata(pkt, errs[ntohs(code)].err_msg, strlen(errs[ntohs(code)].err_msg) + 1); |
|
|
schedEvent(TASK_ROOT(task), txPkt, (void*) -1, TASK_FD(task), |
schedEvent(TASK_ROOT(task), txPkt, (void*) -1, TASK_FD(task), |
TASK_DATA(task), RPACK_OFF(pkt)); |
TASK_DATA(task), RPACK_OFF(pkt)); |
Line 400 DATA(sched_task_t *task)
|
Line 402 DATA(sched_task_t *task)
|
RPACK_REWIND(pkt); |
RPACK_REWIND(pkt); |
code = rpack_uint16(pkt, NULL, 0); |
code = rpack_uint16(pkt, NULL, 0); |
if (ntohs(code) != TFTP_OPC_DATA) { |
if (ntohs(code) != TFTP_OPC_DATA) { |
code = htole16(5); | code = htons(5); |
goto end; |
goto end; |
} |
} |
|
|
code = rpack_uint16(pkt, NULL, 0); |
code = rpack_uint16(pkt, NULL, 0); |
if (ntohs(code) < cli.seq || ntohs(code) > cli.seq + 1) { |
if (ntohs(code) < cli.seq || ntohs(code) > cli.seq + 1) { |
code = htole16(5); | code = htons(5); |
goto end; |
goto end; |
} else |
} else |
cli.seq = ntohs(code); |
cli.seq = ntohs(code); |
Line 423 DATA(sched_task_t *task)
|
Line 425 DATA(sched_task_t *task)
|
len = pwrite(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz); |
len = pwrite(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz); |
if (len == -1) { |
if (len == -1) { |
ESYSERR(0); |
ESYSERR(0); |
code = htole16(3); | code = htons(3); |
goto end; |
goto end; |
} else { |
} else { |
rpack_rnext(pkt, len); |
rpack_rnext(pkt, len); |
Line 437 end:
|
Line 439 end:
|
RPACK_REWIND(pkt); |
RPACK_REWIND(pkt); |
rpack_uint16(pkt, NULL, 0); |
rpack_uint16(pkt, NULL, 0); |
rpack_uint16(pkt, &code, 0); |
rpack_uint16(pkt, &code, 0); |
rpack_rdata(pkt, errs[le16toh(code)].err_msg, strlen(errs[le16toh(code)].err_msg) + 1); | rpack_rdata(pkt, errs[ntohs(code)].err_msg, strlen(errs[ntohs(code)].err_msg) + 1); |
|
|
schedEvent(TASK_ROOT(task), txPkt, (void*) -1, TASK_FD(task), |
schedEvent(TASK_ROOT(task), txPkt, (void*) -1, TASK_FD(task), |
TASK_DATA(task), RPACK_OFF(pkt)); |
TASK_DATA(task), RPACK_OFF(pkt)); |
Line 475 rxPkt(sched_task_t *task)
|
Line 477 rxPkt(sched_task_t *task)
|
RPACK_REWIND(pkt); |
RPACK_REWIND(pkt); |
code = htons(TFTP_OPC_ERROR); |
code = htons(TFTP_OPC_ERROR); |
rpack_uint16(pkt, &code, 0); |
rpack_uint16(pkt, &code, 0); |
code = htole16(4); | code = htons(4); |
rpack_uint16(pkt, &code, 0); |
rpack_uint16(pkt, &code, 0); |
rpack_rdata(pkt, errs[4].err_msg, strlen(errs[4].err_msg) + 1); |
rpack_rdata(pkt, errs[4].err_msg, strlen(errs[4].err_msg) + 1); |
|
|
Line 503 rxPkt(sched_task_t *task)
|
Line 505 rxPkt(sched_task_t *task)
|
RPACK_REWIND(pkt); |
RPACK_REWIND(pkt); |
code = htons(TFTP_OPC_ERROR); |
code = htons(TFTP_OPC_ERROR); |
rpack_uint16(pkt, &code, 0); |
rpack_uint16(pkt, &code, 0); |
code = htole16(4); | code = htons(4); |
rpack_uint16(pkt, &code, 0); |
rpack_uint16(pkt, &code, 0); |
rpack_rdata(pkt, errs[4].err_msg, strlen(errs[4].err_msg) + 1); |
rpack_rdata(pkt, errs[4].err_msg, strlen(errs[4].err_msg) + 1); |
|
|