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.6 and 1.2.2.10

version 1.2.2.6, 2014/02/20 15:39:15	version 1.2.2.10, 2014/02/20 23:11:18
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 129 getOpts(rpack_t * __restrict pkt, int rlen)	Line 132 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);
Line 139 getOpts(rpack_t * __restrict pkt, int rlen)	Line 145 getOpts(rpack_t * __restrict pkt, int rlen)
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)
Line 148 getOpts(rpack_t * __restrict pkt, int rlen)	Line 155 getOpts(rpack_t * __restrict pkt, int rlen)
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;
if (rpack_resize(pkt, cli.siz + 4))
cli.siz = TFTP_PKT_MAX;
}
} 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);
else
return -1;
} 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 200 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 214 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 233 RQ(sched_task_t *task)	Line 234 RQ(sched_task_t *task)

cli.siz = TFTP_LOAD_MAX;	cli.siz = TFTP_LOAD_MAX;
cli.opc = ntohs(rpack_uint16(pkt, NULL, 0));	cli.opc = ntohs(rpack_uint16(pkt, NULL, 0));
len = str_getString(tftp->tftp_data, rlen, &str);	len = str_getString(RPACK_NEXT(pkt), rlen, &str);
if (len == -1)	if (len == -1)
goto end;	goto end;
else {	else {
	strlcpy(cli.file, (char*) RPACK_NEXT(pkt), sizeof cli.file);
rlen -= len;	rlen -= len;
rpack_rnext(pkt, len);	rpack_rnext(pkt, len);
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);
if (len == -1)	if (len == -1)
Line 292 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 (!RPACK_ISEND(pkt) && !getOpts(pkt, rlen))	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),	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) {
/* ack */	/* ack */
tftp->tftp_opc = htons(TFTP_OPC_ACK);	tftp->tftp_opc = htons(TFTP_OPC_ACK);
RPACK_REWIND(pkt);	RPACK_REWIND(pkt);
Line 342 ACK(sched_task_t *task)	Line 355 ACK(sched_task_t *task)
if (ntohs(code) > cli.seq \|\| (ntohs(code) < (cli.seq - 1))) {	if (ntohs(code) > cli.seq \|\| (ntohs(code) < (cli.seq - 1))) {
code = htole16(5);	code = htole16(5);
goto end;	goto end;
} else if (ntohs(code) == cli.seq)	} else if (ntohs(code) == cli.seq) {
cli.seq++;	/* check for rollover seq id */
	if (cli.roll && cli.seq == USHRT_MAX)
	cli.seq = cli.roll;
	else
	cli.seq++;
	}

EVERBOSE(3, "ACK:: seq=%hu; my new seq=%hu;", ntohs(code), cli.seq);	EVERBOSE(3, "ACK:: seq=%hu; my new seq=%hu;", ntohs(code), cli.seq);

Line 353 ACK(sched_task_t *task)	Line 371 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 445 rxPkt(sched_task_t *task)	Line 463 rxPkt(sched_task_t *task)
goto end;	goto end;
} else if (!cli.addr.sa.sa_len) {	} else if (!cli.addr.sa.sa_len) {
cli.addr = sa;	cli.addr = sa;
	RPACK_REWIND(pkt);
switch (ntohs(tftp->tftp_opc)) {	switch (ntohs(tftp->tftp_opc)) {
case TFTP_OPC_RRQ:	case TFTP_OPC_RRQ:
case TFTP_OPC_WRQ:	case TFTP_OPC_WRQ:
Line 494 rxPkt(sched_task_t *task)	Line 513 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.6
changed lines
	Added in v.1.2.2.10