tftpd/src/srv.c - diff

Return to srv.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / tftpd / src

version 1.2.2.3, 2014/02/20 01:31:50	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 367 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! */