--- mqtt/src/utils.c	2012/07/03 12:46:01	1.4
+++ mqtt/src/utils.c	2017/10/08 22:49:25	1.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: utils.c,v 1.4 2012/07/03 12:46:01 misho Exp $
+* $Id: utils.c,v 1.5 2017/10/08 22:49:25 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ 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
+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
@@ -48,15 +48,15 @@ SUCH DAMAGE.
 #include "mqttd_calls.h"
 
 
-inline int
+int
 srv_Socket(cfg_root_t * __restrict cfg)
 {
 	int s = -1;
 	ait_val_t v;
 	u_short port;
-	io_sockaddr_t sa = {{ 0 }};
+	sockaddr_t sa = {{ 0 }};
 
-	ioTRACE(2);
+	ETRACE();
 
 	assert(cfg);
 
@@ -64,8 +64,8 @@ srv_Socket(cfg_root_t * __restrict cfg)
 	port = strtol(AIT_GET_STR(&v), NULL, 0);
 	AIT_FREE_VAL(&v);
 	cfg_loadAttribute(cfg, "mqttd", "listen", &v, MQTT_HOST);
-	if (!io_gethostbyname(AIT_GET_STR(&v), port, &sa)) {
-		ioLIBERR(io);
+	if (!e_gethostbyname(AIT_GET_STR(&v), port, &sa)) {
+		ELIBERR(elwix);
 		AIT_FREE_VAL(&v);
 		return -1;
 	} else
@@ -73,19 +73,19 @@ srv_Socket(cfg_root_t * __restrict cfg)
 
 	s = mqtt_srv_Create(&sa.sa, sa.sa.sa_len);
 	if (s == -1) {
-		ioLIBERR(mqtt);
+		ELIBERR(mqtt);
 		return -1;
 	}
 
-	ioDEBUG(7, "Created socket=%d\n", s);
+	EVERBOSE(7, "Created socket=%d\n", s);
 	return s;
 }
 
-inline int
+int
 srv_Close(int s)
 {
-	ioTRACE(2);
+	ETRACE();
 
-	ioDEBUG(7, "Closing socket=%d\n", s);
+	EVERBOSE(7, "Closing socket=%d\n", s);
 	return mqtt_srv_Destroy(s);
 }