version 1.2.2.1, 2014/02/20 00:44:49
|
version 1.2.2.4, 2014/02/20 14:15:57
|
Line 63 txData(sched_task_t *task)
|
Line 63 txData(sched_task_t *task)
|
n = htons(cli.seq); |
n = htons(cli.seq); |
rpack_uint16(pkt, &n, 0); |
rpack_uint16(pkt, &n, 0); |
|
|
len = pread(cli.fd, RPACK_NEXT(pkt), cli.siz, (cli.seq - 1) * cli.siz); | /* max file size check */ |
| if (cli.tsiz && cli.tsiz <= cli.seq * cli.siz) { |
| len = MAX(0, cli.tsiz - (cli.seq - 1) * cli.siz); |
| cli.close = 42; /* last sended packet, should be close! */ |
| } else |
| len = 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 = htole16(3); |
Line 119 txAck(sched_task_t *task)
|
Line 126 txAck(sched_task_t *task)
|
static int |
static int |
getOpts(rpack_t * __restrict pkt) |
getOpts(rpack_t * __restrict pkt) |
{ |
{ |
|
char *opt, *val; |
|
int len; |
|
|
|
do { |
|
/* option */ |
|
len = str_getString(RPACK_NEXT(pkt), RPACK_REMAIN(pkt), NULL); |
|
if (len == -1) |
|
return -1; |
|
opt = (char*) rpack_rnext(pkt, len); |
|
if (!opt) |
|
return -1; |
|
/* value */ |
|
len = str_getString(RPACK_NEXT(pkt), RPACK_REMAIN(pkt), NULL); |
|
if (len == -1) |
|
return -1; |
|
val = (char*) rpack_rnext(pkt, len); |
|
if (!val) |
|
return -1; |
|
|
|
if (!strcasecmp(opt, TFTP_OPT_BLKSIZE)) { |
|
len = strtol(val, NULL, 10); |
|
if (len > TFTP_LOAD_MAX) |
|
cli.siz = len; |
|
} else if (!strcasecmp(opt, TFTP_OPT_TSIZE)) |
|
cli.tsiz = strtoll(val, NULL, 10); |
|
else if (!strcasecmp(opt, TFTP_OPT_TIMEOUT)) |
|
cli.tout = strtol(val, NULL, 10); |
|
else |
|
return -1; |
|
} while (!RPACK_ISEND(pkt)); |
|
|
|
EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u", cli.siz, cli.tsiz, cli.tout); |
return 0; |
return 0; |
} |
} |
|
|
Line 335 DATA(sched_task_t *task)
|
Line 374 DATA(sched_task_t *task)
|
} else |
} else |
cli.seq = ntohs(code); |
cli.seq = ntohs(code); |
|
|
|
/* max file size check */ |
len = TASK_DATLEN(task) - RPACK_OFF(pkt); |
len = TASK_DATLEN(task) - RPACK_OFF(pkt); |
|
if (cli.tsiz && cli.tsiz <= cli.seq * cli.siz) |
|
len = MIN(len, cli.tsiz - (cli.seq - 1) * cli.siz); |
if (len < cli.siz) |
if (len < cli.siz) |
cli.close = 42; /* last received packet, should be close! */ |
cli.close = 42; /* last received packet, should be close! */ |
|
|