--- mqtt/src/mqttd.c	2012/07/03 09:02:50	1.3
+++ mqtt/src/mqttd.c	2013/01/18 10:17:22	1.4.4.1
@@ -1,3 +1,48 @@
+/*************************************************************************
+* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
+*  by Michael Pounov <misho@openbsd-bg.org>
+*
+* $Author: misho $
+* $Id: mqttd.c,v 1.4.4.1 2013/01/18 10:17:22 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+	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 "mqttd.h"
 #include "rtlm.h"
@@ -5,8 +50,6 @@
 #include "daemon.h"
 
 
-io_enableDEBUG;
-
 cfg_root_t cfg;
 sessions_t Sessions;
 sched_root_task_t *root;
@@ -38,14 +81,14 @@ sigHand(int sig)
 		case SIGHUP:
 			cfgUnloadConfig(&cfg);
 			if (!cfgLoadConfig(szCfgName, &cfg)) {
-				ioDEBUG(1, "Config reload OK!");
+				EVERBOSE(1, "Config reload OK!");
 				break;
 			}
 
-			ioLIBERR(cfg);
+			ELIBERR(cfg);
 		case SIGINT:
 		case SIGTERM:
-			ioDEBUG(1, "Terminate MQTT service in progress");
+			EVERBOSE(1, "Terminate MQTT service in progress");
 			Kill++;
 			break;
 		case SIGCHLD:
@@ -79,7 +122,7 @@ main(int argc, char **argv)
 				batch++;
 				break;
 			case 'v':
-				io_incDebug;
+				e_incVerbose;
 				break;
 			case 'h':
 			default:
@@ -144,16 +187,16 @@ main(int argc, char **argv)
 					dup2(ret, STDERR_FILENO);
 					close(ret);
 				}
-				ioDEBUG(2, "Welcome MQTT service into shadow land!");
+				EVERBOSE(2, "Welcome MQTT service into shadow land!");
 				break;
 			default:
-				ioDEBUG(2, "MQTT service go to shadow land ...");
+				EVERBOSE(2, "MQTT service go to shadow land ...");
 				sleep(1);
 				ret = 0;
 				goto end;
 		}
 	else
-		ioDEBUG(1, "Start service in batch mode ...");
+		EVERBOSE(1, "Start service in batch mode ...");
 
 	memset(&sa, 0, sizeof sa);
 	sigemptyset(&sa.sa_mask);
@@ -163,7 +206,7 @@ main(int argc, char **argv)
 	sigaction(SIGTERM, &sa, NULL);
 	sigaction(SIGCHLD, &sa, NULL);
 	sigaction(SIGPIPE, &sa, NULL);
-	ioDEBUG(2, "Service is ready for starting engine ...");
+	EVERBOSE(2, "Service is ready for starting engine ...");
 
 	if ((sock = srv_Socket(&cfg)) == -1) {
 		ret = 4;
@@ -176,11 +219,11 @@ main(int argc, char **argv)
 	if (pass) {
 		setgid(pass->pw_gid);
 		setuid(pass->pw_uid);
-		ioDEBUG(2, "Try to change group #%d and user #%d", pass->pw_gid, pass->pw_uid);
+		EVERBOSE(2, "Try to change group #%d and user #%d", pass->pw_gid, pass->pw_uid);
 	}
 
 	if (!(root = schedBegin())) {
-		ioLIBERR(sched);
+		ELIBERR(sched);
 		ret = 6;
 		goto end;
 	}