--- tftpd/src/tftpd.c	2014/02/21 15:58:30	1.2.2.2
+++ tftpd/src/tftpd.c	2014/02/24 14:38:47	1.2.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: tftpd.c,v 1.2.2.2 2014/02/21 15:58:30 misho Exp $
+* $Id: tftpd.c,v 1.2.2.3 2014/02/24 14:38:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -45,13 +45,14 @@ 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;
-ait_val_t *bufIO;
+rpack_t *bf;
 char szCfgName[PATH_MAX] = DEFAULT_CFGNAME;
 struct timespec timeout = { DEFAULT_TIMEOUT, 0 };
 extern char compiled[], compiledby[], compilehost[];
@@ -102,13 +103,10 @@ sigHandler(sched_task_t *task)
 			if (str)
 				timeout.tv_sec = strtol(str, NULL, 10);
 
-			ait_freeVar(&bufIO);
+			endBuffer();
 			str = cfg_getAttribute(&cfg, "tftpd", "buf_io");
-			if (str) {
-				bufIO = ait_allocVar();
-				if (bufIO)
-					AIT_SET_BUFSIZ(bufIO, 0, strtol(str, NULL, 0));
-			}
+			if (str)
+				initBuffer(strtol(str, NULL, 0));
 			break;
 		case SIGINT:
 		case SIGTERM:
@@ -249,11 +247,8 @@ main(int argc, char **argv)
 	}
 
 	str = cfg_getAttribute(&cfg, "tftpd", "buf_io");
-	if (str) {
-		bufIO = ait_allocVar();
-		if (bufIO)
-			AIT_SET_BUFSIZ(bufIO, 0, strtol(str, NULL, 0));
-	}
+	if (str)
+		initBuffer(strtol(str, NULL, 0));
 
 	if (!(pkt = rpack_create(NULL, 0))) {
 		ELIBERR(elwix);
@@ -281,7 +276,7 @@ end:
 	schedEnd(&root);
 	rpack_detach(pkt);
 	rpack_destroy(&pkt);
-	ait_freeVar(&bufIO);
+	endBuffer();
 	cfgUnloadConfig(&cfg);
 	closelog();
 	return ret;