tftpd/src/srv.c - diff

Return to srv.c CVS log

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

Diff for /tftpd/src/srv.c between versions 1.2.2.3 and 1.2.2.8

version 1.2.2.3, 2014/02/20 01:31:50	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 63 txData(sched_task_t *task)	Line 66 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 = 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 110 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);
}	}

static int	static int
getOpts(rpack_t * __restrict pkt)	getOpts(rpack_t * __restrict pkt, int rlen)
{	{
char opt, val;	char opt, val;
int len;	int len;

	if (!rlen)
	return -1;

do {	do {
/* option */	/* option */
len = str_getString(RPACK_NEXT(pkt), RPACK_REMAIN(pkt), NULL);	len = str_getString(RPACK_NEXT(pkt), RPACK_REMAIN(pkt), NULL);
if (len == -1)	if (len == -1)
return -1;	return -1;
	else
	rlen -= len;
opt = (char*) rpack_rnext(pkt, len);	opt = (char*) rpack_rnext(pkt, len);
if (!opt)	if (!opt)
return -1;	return -1;
	EVERBOSE(7, "opt=%s rlen=%d", opt, rlen);
/* value */	/* value */
len = str_getString(RPACK_NEXT(pkt), RPACK_REMAIN(pkt), NULL);	len = str_getString(RPACK_NEXT(pkt), RPACK_REMAIN(pkt), NULL);
if (len == -1)	if (len == -1)
return -1;	return -1;
	else
	rlen -= len;
val = (char*) rpack_rnext(pkt, len);	val = (char*) rpack_rnext(pkt, len);
if (!val)	if (!val)
return -1;	return -1;
	EVERBOSE(7, "val=%s rlen=%d", val, rlen);

if (!strcasecmp(opt, TFTP_OPT_BLKSIZE)) {	if (!strcasecmp(opt, TFTP_OPT_BLKSIZE))
len = strtol(val, NULL, 10);	cli.tmp = strtol(val, NULL, 10);
if (len > TFTP_LOAD_MAX)	else if (!strcasecmp(opt, TFTP_OPT_TSIZE))
cli.siz = len;
} 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	else if (!strcasecmp(opt, TFTP_OPT_ROLLOVER))
return -1;	cli.roll = strtol(val, NULL, 10);
} while (!RPACK_ISEND(pkt));	} while (rlen > 0);

EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u", cli.siz, cli.tsiz, cli.tout);	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u",
	cli.siz, cli.tsiz, cli.tout.tv_sec, cli.roll);
return 0;	return 0;
}	}

Line 183 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);
}	}
	if (cli.roll) {
	memset(szStr, 0, sizeof szStr);
	snprintf(szStr, sizeof szStr, "%u", cli.roll);
	rpack_rdata(pkt, TFTP_OPT_ROLLOVER, strlen(TFTP_OPT_ROLLOVER) + 1);
	rpack_rdata(pkt, szStr, strlen(szStr) + 1);
	}

	EVERBOSE(4, "blksize=%u tsize=%llu timeout=%u rollover=%u",
	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 207 RQ(sched_task_t *task)	Line 233 RQ(sched_task_t *task)
ETRACE();	ETRACE();

cli.siz = TFTP_LOAD_MAX;	cli.siz = TFTP_LOAD_MAX;
	cli.opc = ntohs(rpack_uint16(pkt, NULL, 0));
len = str_getString(tftp->tftp_data, rlen, &str);	len = str_getString(tftp->tftp_data, rlen, &str);
if (len == -1)	if (len == -1)
goto end;	goto end;
else {	else {
rlen -= len;	rlen -= len;
	rpack_rnext(pkt, len);
strlcpy(cli.file, (char*) tftp->tftp_data, sizeof cli.file);	strlcpy(cli.file, (char*) tftp->tftp_data, sizeof cli.file);
}	}
len = str_getString((const u_char*) str, rlen, NULL);	len = str_getString((const u_char*) str, rlen, NULL);
Line 219 RQ(sched_task_t *task)	Line 247 RQ(sched_task_t *task)
goto end;	goto end;
else {	else {
rlen -= len;	rlen -= len;
	rpack_rnext(pkt, len);
if (!strcasecmp(str, TFTP_MODE_ASCII))	if (!strcasecmp(str, TFTP_MODE_ASCII))
strlcpy(cli.mode, TFTP_MODE_ASCII, sizeof cli.mode);	strlcpy(cli.mode, TFTP_MODE_ASCII, sizeof cli.mode);
else if (!strcasecmp(str, TFTP_MODE_OCTET))	else if (!strcasecmp(str, TFTP_MODE_OCTET))
Line 233 RQ(sched_task_t *task)	Line 262 RQ(sched_task_t *task)
}	}
}	}

cli.opc = ntohs(tftp->tftp_opc);
switch (cli.opc) {	switch (cli.opc) {
case TFTP_OPC_RRQ:	case TFTP_OPC_RRQ:
code = O_RDONLY;	code = O_RDONLY;
Line 248 RQ(sched_task_t *task)	Line 276 RQ(sched_task_t *task)
break;	break;
}	}

if (!RPACK_ISEND(pkt) && !getOpts(pkt))
schedEvent(TASK_ROOT(task), txOack, NULL, TASK_FD(task),
TASK_DATA(task), 0);

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)
Line 269 RQ(sched_task_t *task)	Line 293 RQ(sched_task_t *task)

schedEvent(TASK_ROOT(task), execProg, "request", 0, NULL, cli.opc);	schedEvent(TASK_ROOT(task), execProg, "request", 0, NULL, cli.opc);

if (cli.opc == TFTP_OPC_WRQ) {	if (!getOpts(pkt, rlen)) {
	if (cli.tmp > TFTP_LOAD_MAX) {
	if (rpack_resize(pkt, cli.tmp + 4))
	ELIBERR(elwix);
	else
	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),
	TASK_DATA(task), 0);
	} else if (cli.opc == TFTP_OPC_WRQ) {
/* ack */	/* ack */
tftp->tftp_opc = htons(TFTP_OPC_ACK);	tftp->tftp_opc = htons(TFTP_OPC_ACK);
RPACK_REWIND(pkt);	RPACK_REWIND(pkt);
Line 327 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 367 DATA(sched_task_t *task)	Line 406 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! */

Line 450 rxPkt(sched_task_t *task)	Line 492 rxPkt(sched_task_t *task)
TASK_DATA(task), rlen);	TASK_DATA(task), rlen);
break;	break;
case TFTP_OPC_OACK:	case TFTP_OPC_OACK:
ELOGGER(LOG_WARNING, "oack");
/*
schedEvent(TASK_ROOT(task), OACK, NULL, TASK_FD(task),
TASK_DATA(task), rlen);
*/
break;
case TFTP_OPC_ERROR:	case TFTP_OPC_ERROR:
default:	default:
RPACK_REWIND(pkt);	RPACK_REWIND(pkt);
Line 471 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);

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.2.2.3
changed lines
	Added in v.1.2.2.8