--- mqtt/src/mqtt_pub.c	2012/07/03 09:02:50	1.3
+++ mqtt/src/mqtt_pub.c	2017/10/08 22:49:25	1.5
@@ -1,11 +1,54 @@
+/*************************************************************************
+* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
+*  by Michael Pounov <misho@openbsd-bg.org>
+*
+* $Author: misho $
+* $Id: mqtt_pub.c,v 1.5 2017/10/08 22:49:25 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 "rtlm.h"
 #include "mqtt.h"
 #include "client.h"
 
 
-io_enableDEBUG;
-
 extern char compiled[], compiledby[], compilehost[];
 
 struct tagArgs *args;
@@ -80,7 +123,7 @@ main(int argc, char **argv)
 	u_short port = atoi(MQTT_PORT);
 	int ret = 0;
 
-	if (!(args = io_malloc(sizeof(struct tagArgs)))) {
+	if (!(args = e_malloc(sizeof(struct tagArgs)))) {
 		printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno));
 		return 1;
 	} else
@@ -90,7 +133,7 @@ main(int argc, char **argv)
 	if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) {
 		printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
 		args->free(args);
-		io_free(args);
+		e_free(args);
 		return 1;
 	}
 
@@ -128,7 +171,7 @@ main(int argc, char **argv)
 				if (args->QoS > MQTT_QOS_EXACTLY) {
 					printf("Error:: invalid QoS level %d\n", args->QoS);
 					args->free(args);
-					io_free(args);
+					e_free(args);
 					return 1;
 				}
 				break;
@@ -145,12 +188,12 @@ main(int argc, char **argv)
 				args->isFile++;
 				break;
 			case 'v':
-				io_incDebug;
+				e_incVerbose;
 				break;
 			case 'h':
 			default:
 				args->free(args);
-				io_free(args);
+				e_free(args);
 				Usage();
 				return 1;
 		}
@@ -159,7 +202,7 @@ main(int argc, char **argv)
 	if (argc < 4) {
 		printf("Error:: host for connect not found, connection id, topic or value not supplied!\n\n");
 		args->free(args);
-		io_free(args);
+		e_free(args);
 		Usage();
 		return 1;
 	} else {
@@ -170,26 +213,26 @@ main(int argc, char **argv)
 		AIT_FREE_VAL(&args->Value);
 		AIT_SET_STR(&args->Value, argv[3]);
 	}
-	if (!io_gethostbyname(*argv, port, &args->addr)) {
-		printf("Error:: host not valid #%d - %s\n", io_GetErrno(), io_GetError());
+	if (!e_gethostbyname(*argv, port, &args->addr)) {
+		printf("Error:: host not valid #%d - %s\n", elwix_GetErrno(), elwix_GetError());
 		args->free(args);
-		io_free(args);
+		e_free(args);
 		Usage();
 		return 1;
 	}
-	printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_n2port(&args->addr));
+	printf("Connecting to %s:%d ... ", e_n2addr(&args->addr, &val), e_n2port(&args->addr));
 	AIT_FREE_VAL(&val);
 
 	if (!(args->cli = mqtt_cli_Open(&args->addr.sa, args->ka))) {
 		args->free(args);
-		io_free(args);
+		e_free(args);
 		return 2;
 	}
 
 	if (args->isFile && !OpenFile()) {
 		mqtt_cli_Close(&args->cli);
 		args->free(args);
-		io_free(args);
+		e_free(args);
 		return 3;
 	}
 
@@ -226,6 +269,6 @@ main(int argc, char **argv)
 
 	CloseFile();
 	args->free(args);
-	io_free(args);
+	e_free(args);
 	return ret;
 }