tftpd/src/tftpd.c - diff

Return to tftpd.c CVS log

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

Diff for /tftpd/src/tftpd.c between versions 1.1 and 1.3

version 1.1, 2014/02/14 15:38:37	version 1.3, 2014/02/24 15:23:39
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 "srv.h"	#include "srv.h"
	#include "buf.h"


intptr_t Kill;	intptr_t Kill;
struct tagCli cli;	struct tagCli cli;
cfg_root_t cfg;	cfg_root_t cfg;
sched_root_task_t *root;	sched_root_task_t *root;
	rpack_t *bf;
char szCfgName[PATH_MAX] = DEFAULT_CFGNAME;	char szCfgName[PATH_MAX] = DEFAULT_CFGNAME;
struct timespec timeout = { DEFAULT_TIMEOUT, 0 };	struct timespec timeout = { DEFAULT_TIMEOUT, 0 };
extern char compiled[], compiledby[], compilehost[];	extern char compiled[], compiledby[], compilehost[];
Line 31 Usage()	Line 78 Usage()
"\t-c <config>\tConfig file [default=/etc/tftpd.conf]\n"	"\t-c <config>\tConfig file [default=/etc/tftpd.conf]\n"
"\t-w\t\tSwitch to read-write mode [default=read-only]\n"	"\t-w\t\tSwitch to read-write mode [default=read-only]\n"
"\t-b\t\tRun into batch mode (default is daemon mode)\n"	"\t-b\t\tRun into batch mode (default is daemon mode)\n"
	"\t-d\t\tDebug program\n"
"\t-v\t\tVerbose (more -v, more verbosity ...)\n"	"\t-v\t\tVerbose (more -v, more verbosity ...)\n"
"\t-h\t\tThis help screen!\n"	"\t-h\t\tThis help screen!\n"
"\n", compiled, compiledby, compilehost);	"\n", compiled, compiledby, compilehost);
Line 54 sigHandler(sched_task_t *task)	Line 102 sigHandler(sched_task_t *task)
str = cfg_getAttribute(&cfg, "tftpd", "timeout");	str = cfg_getAttribute(&cfg, "tftpd", "timeout");
if (str)	if (str)
timeout.tv_sec = strtol(str, NULL, 10);	timeout.tv_sec = strtol(str, NULL, 10);

	endBuffer();
	str = cfg_getAttribute(&cfg, "tftpd", "buf_io");
	if (str)
	initBuffer(strtol(str, NULL, 0));
break;	break;
case SIGINT:	case SIGINT:
case SIGTERM:	case SIGTERM:
Line 83 main(int argc, char **argv)	Line 136 main(int argc, char **argv)
sockaddr_t sa;	sockaddr_t sa;
rpack_t *pkt = NULL;	rpack_t *pkt = NULL;

while ((ch = getopt(argc, argv, "hvbwc:")) != -1)	while ((ch = getopt(argc, argv, "hvdbwc:")) != -1)
switch (ch) {	switch (ch) {
case 'c':	case 'c':
strlcpy(szCfgName, optarg, sizeof szCfgName);	strlcpy(szCfgName, optarg, sizeof szCfgName);
Line 94 main(int argc, char **argv)	Line 147 main(int argc, char **argv)
case 'v':	case 'v':
e_incVerbose;	e_incVerbose;
break;	break;
	case 'd':
	elwix_Debug \|= ELWIX_DEBUG_TRACE;
	break;
case 'b':	case 'b':
b = 42;	b = 42;
break;	break;
Line 190 main(int argc, char **argv)	Line 246 main(int argc, char **argv)
chdir(str);	chdir(str);
}	}

	str = cfg_getAttribute(&cfg, "tftpd", "buf_io");
	if (str)
	initBuffer(strtol(str, NULL, 0));

if (!(pkt = rpack_create(NULL, 0))) {	if (!(pkt = rpack_create(NULL, 0))) {
ELIBERR(elwix);	ELIBERR(elwix);
close(fd);	close(fd);
Line 216 end:	Line 276 end:
schedEnd(&root);	schedEnd(&root);
rpack_detach(pkt);	rpack_detach(pkt);
rpack_destroy(&pkt);	rpack_destroy(&pkt);
	endBuffer();
cfgUnloadConfig(&cfg);	cfgUnloadConfig(&cfg);
closelog();	closelog();
return ret;	return ret;

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

Removed from v.1.1
changed lines
	Added in v.1.3