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.3 and 1.8

version 1.3, 2014/02/18 12:46:39	version 1.8, 2014/02/24 22:28:54
Line 1	Line 1
	/*************************************************************************
	* (C) 2014 AITNET ltd - Sofia/Bulgaria - <misho@aitnet.org>
	* by Michael Pounov <misho@elwix.org>
	*
	* $Author$
	* $Id$
	*
	**************************************************************************
	The ELWIX and AITNET software is distributed under the following
	terms:

	All of the documentation and software included in the ELWIX and AITNET
	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

	Copyright 2004 - 2014
	by Michael Pounov <misho@elwix.org>. All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	1. Redistributions of source code must retain the above copyright
	notice, this list of conditions and the following disclaimer.
	2. Redistributions in binary form must reproduce the above copyright
	notice, this list of conditions and the following disclaimer in the
	documentation and/or other materials provided with the distribution.
	3. All advertising materials mentioning features or use of this software
	must display the following acknowledgement:
	This product includes software developed by Michael Pounov <misho@elwix.org>
	ELWIX - Embedded LightWeight unIX and its contributors.
	4. Neither the name of AITNET nor the names of its contributors
	may be used to endorse or promote products derived from this software
	without specific prior written permission.

	THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	SUCH DAMAGE.
	*/
#include "global.h"	#include "global.h"
#include "exec.h"	#include "exec.h"
	#include "buf.h"
#include "srv.h"	#include "srv.h"


static void *	static void *
timeoutSession(sched_task_t *task)	timeoutSession(sched_task_t *task)
{	{
	rpack_t *pkt = TASK_DATA(task);

ETRACE();	ETRACE();

	if (bf)
	flushBuffer(cli.fd);

/* 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 87 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 95 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 115 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 = htons(3);
goto end;	goto end;
} else {	} else {
rpack_rnext(pkt, len);	rpack_rnext(pkt, len);
Line 84 end:	Line 143 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 110 txAck(sched_task_t *task)	Line 169 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");
	schedResumeby(TASK_ROOT(task), CRITERIA_ID, 0);
}	}
taskExit(task, NULL);	taskExit(task, NULL);
}	}

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

	if (!rlen)
return -1;	return -1;

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

	if (!strcasecmp(opt, TFTP_OPT_BLKSIZE))
	cli.tmp = strtol(val, NULL, 10);
	else if (!strcasecmp(opt, TFTP_OPT_TSIZE))
	cli.tsiz = strtoll(val, NULL, 10);
	else if (!strcasecmp(opt, TFTP_OPT_TIMEOUT))
	cli.tout.tv_sec = strtol(val, NULL, 10);
	else if (!strcasecmp(opt, TFTP_OPT_ROLLOVER)) {
	cli.roll = strtol(val, NULL, 10);
	cli.roll++;
	}
	} while (rlen > 0);

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

static void *	static void *
	txOack(sched_task_t *task)
	{
	rpack_t *pkt = TASK_DATA(task);
	u_short n = htons(TFTP_OPC_OACK);
	struct stat sb;
	char szStr[STRSIZ];

	ETRACE();

	RPACK_REWIND(pkt);
	rpack_uint16(pkt, &n, 0);

	/* if opcode is RRQ and tsize is 0 then we must return file size to client */
	if (cli.opc == TFTP_OPC_RRQ && !cli.tsiz && stat(cli.file, &sb) != -1)
	cli.tsiz = sb.st_size;

	if (cli.siz > TFTP_LOAD_MAX) {
	memset(szStr, 0, sizeof szStr);
	snprintf(szStr, sizeof szStr, "%u", cli.siz);
	rpack_rdata(pkt, TFTP_OPT_BLKSIZE, strlen(TFTP_OPT_BLKSIZE) + 1);
	rpack_rdata(pkt, szStr, strlen(szStr) + 1);
	}
	if (cli.tsiz) {
	memset(szStr, 0, sizeof szStr);
	snprintf(szStr, sizeof szStr, "%llu", cli.tsiz);
	rpack_rdata(pkt, TFTP_OPT_TSIZE, strlen(TFTP_OPT_TSIZE) + 1);
	rpack_rdata(pkt, szStr, strlen(szStr) + 1);
	}
	if (cli.tout.tv_sec) {
	memset(szStr, 0, sizeof szStr);
	snprintf(szStr, sizeof szStr, "%d", (int) cli.tout.tv_sec);
	rpack_rdata(pkt, TFTP_OPT_TIMEOUT, strlen(TFTP_OPT_TIMEOUT) + 1);
	rpack_rdata(pkt, szStr, strlen(szStr) + 1);
	}
	if (cli.roll) {
	memset(szStr, 0, sizeof szStr);
	snprintf(szStr, sizeof szStr, "%u", cli.roll - 1);
	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=%d rollover=%u",
	cli.siz, cli.tsiz, (int) cli.tout.tv_sec, cli.roll - 1);
	schedCallOnce(TASK_ROOT(task), txPkt, NULL, TASK_FD(task),
	TASK_DATA(task), RPACK_OFF(pkt));
	taskExit(task, NULL);
	}

	static void *
RQ(sched_task_t *task)	RQ(sched_task_t *task)
{	{
rpack_t *pkt = TASK_DATA(task);	rpack_t *pkt = TASK_DATA(task);
struct tftp_hdr tftp = (struct tftp_hdr) RPACK_BUF(pkt);	struct tftp_hdr tftp = (struct tftp_hdr) RPACK_BUF(pkt);
int len, rlen = TASK_DATLEN(task) - 2;	int len, rlen = TASK_DATLEN(task) - 2;
char str, opts;	char *str;
u_short code = 0;	u_short code = 0;

ETRACE();	ETRACE();

cli.siz = TFTP_LOAD_MAX;	cli.siz = TFTP_LOAD_MAX;
len = str_getString(tftp->tftp_data, rlen, &str);	cli.opc = ntohs(rpack_uint16(pkt, NULL, 0));
	if (!RW && cli.opc == TFTP_OPC_WRQ) {
	code = htons(2);
	goto end;
	}
	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;
strlcpy(cli.file, (char*) tftp->tftp_data, sizeof cli.file);	rpack_rnext(pkt, len);
}	}
len = str_getString((const u_char*) str, rlen, &opts);	len = str_getString((const u_char*) str, rlen, NULL);
if (len == -1)	if (len == -1)
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))
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;
}	}
}	}

/* tftp extended options */
if (!RPACK_ISEND(pkt) && !getOpts(opts, rlen))
cli.opts = 42; /* we have options */

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 181 RQ(sched_task_t *task)	Line 331 RQ(sched_task_t *task)
EVERBOSE(2, "WRQ:: file=%s mode=%s\n", cli.file, cli.mode);	EVERBOSE(2, "WRQ:: file=%s mode=%s\n", cli.file, cli.mode);
break;	break;
}	}

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 if (errno == ENOENT)
	code = htons(1);
else	else
code = htole16(0);	code = htons(0);
ESYSERR(0);	ESYSERR(0);
goto end;	goto end;
} else	} else
Line 198 RQ(sched_task_t *task)	Line 351 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 218 end:	Line 386 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 237 ACK(sched_task_t *task)	Line 405 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) {
cli.seq++;	/* check for rollover seq id */
	if (cli.roll && cli.seq == USHRT_MAX)
	cli.seq = cli.roll - 1;
	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 256 ACK(sched_task_t *task)	Line 429 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 265 end:	Line 438 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 285 DATA(sched_task_t *task)	Line 458 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);

	/* 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! */

EVERBOSE(3, "DATA:: seq=%hu; len=%d", cli.seq, len);	EVERBOSE(3, "DATA:: seq=%hu; len=%d", cli.seq, len);

len = pwrite(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz);	if (len > 0) {
if (len == -1) {	if (!bf)
ESYSERR(0);	len = pwrite(cli.fd, RPACK_NEXT(pkt), len, (cli.seq - 1) * cli.siz);
code = htole16(3);	else
goto end;	len = bfwrite(cli.fd, RPACK_NEXT(pkt), len);
} else {	if (len == -1) {
rpack_rnext(pkt, len);	ESYSERR(0);
EVERBOSE(3, "Written to file %s %d bytes", cli.file, len);	code = htons(3);
	goto end;
	} else
	rpack_rnext(pkt, len);
}	}
	EVERBOSE(3, "Written to file %s %d bytes", cli.file, len);

schedEvent(TASK_ROOT(task), txAck, NULL, TASK_FD(task), TASK_DATA(task), 0);	schedEvent(TASK_ROOT(task), txAck, NULL, TASK_FD(task), TASK_DATA(task), 0);
taskExit(task, NULL);	taskExit(task, NULL);
Line 319 end:	Line 499 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 345 rxPkt(sched_task_t *task)	Line 525 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 356 rxPkt(sched_task_t *task)	Line 537 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 379 rxPkt(sched_task_t *task)	Line 560 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);
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 400 rxPkt(sched_task_t *task)	Line 575 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.3
changed lines
	Added in v.1.8