--- tftpd/src/tftpd.c	2014/02/14 15:38:37	1.1
+++ tftpd/src/tftpd.c	2014/02/24 15:23:39	1.3
@@ -1,11 +1,58 @@
+/*************************************************************************
+* (C) 2014 AITNET ltd - Sofia/Bulgaria - <misho@aitnet.org>
+*  by Michael Pounov <misho@elwix.org>
+*
+* $Author: misho $
+* $Id: tftpd.c,v 1.3 2014/02/24 15:23:39 misho Exp $
+*
+**************************************************************************
+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 "srv.h"
+#include "buf.h"
 
 
 intptr_t Kill;
 struct tagCli cli;
 cfg_root_t cfg;
 sched_root_task_t *root;
+rpack_t *bf;
 char szCfgName[PATH_MAX] = DEFAULT_CFGNAME;
 struct timespec timeout = { DEFAULT_TIMEOUT, 0 };
 extern char compiled[], compiledby[], compilehost[];
@@ -31,6 +78,7 @@ Usage()
 		"\t-c <config>\tConfig file [default=/etc/tftpd.conf]\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-d\t\tDebug program\n"
 		"\t-v\t\tVerbose (more -v, more verbosity ...)\n"
 		"\t-h\t\tThis help screen!\n"
 		"\n", compiled, compiledby, compilehost);
@@ -54,6 +102,11 @@ sigHandler(sched_task_t *task)
 			str = cfg_getAttribute(&cfg, "tftpd", "timeout");
 			if (str)
 				timeout.tv_sec = strtol(str, NULL, 10);
+
+			endBuffer();
+			str = cfg_getAttribute(&cfg, "tftpd", "buf_io");
+			if (str)
+				initBuffer(strtol(str, NULL, 0));
 			break;
 		case SIGINT:
 		case SIGTERM:
@@ -83,7 +136,7 @@ main(int argc, char **argv)
 	sockaddr_t sa;
 	rpack_t *pkt = NULL;
 
-	while ((ch = getopt(argc, argv, "hvbwc:")) != -1)
+	while ((ch = getopt(argc, argv, "hvdbwc:")) != -1)
 		switch (ch) {
 			case 'c':
 				strlcpy(szCfgName, optarg, sizeof szCfgName);
@@ -94,6 +147,9 @@ main(int argc, char **argv)
 			case 'v':
 				e_incVerbose;
 				break;
+			case 'd':
+				elwix_Debug |= ELWIX_DEBUG_TRACE;
+				break;
 			case 'b':
 				b = 42;
 				break;
@@ -190,6 +246,10 @@ main(int argc, char **argv)
 			chdir(str);
 	}
 
+	str = cfg_getAttribute(&cfg, "tftpd", "buf_io");
+	if (str)
+		initBuffer(strtol(str, NULL, 0));
+
 	if (!(pkt = rpack_create(NULL, 0))) {
 		ELIBERR(elwix);
 		close(fd);
@@ -216,6 +276,7 @@ end:
 	schedEnd(&root);
 	rpack_detach(pkt);
 	rpack_destroy(&pkt);
+	endBuffer();
 	cfgUnloadConfig(&cfg);
 	closelog();
 	return ret;