--- mqtt/src/utils.c	2012/04/15 21:44:33	1.2.2.2
+++ mqtt/src/utils.c	2013/01/18 10:17:22	1.4.4.1
@@ -1,72 +1,91 @@
+/*************************************************************************
+* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
+*  by Michael Pounov <misho@openbsd-bg.org>
+*
+* $Author: misho $
+* $Id: utils.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 "mqttd_calls.h"
 
 
-int
+inline int
 srv_Socket(cfg_root_t * __restrict cfg)
 {
-	int s = -1, n = 1;
-	struct hostent *host;
+	int s = -1;
 	ait_val_t v;
 	u_short port;
-	io_sockaddr_t sa;
+	sockaddr_t sa = {{ 0 }};
 
-	ioTRACE(2);
+	ETRACE(2);
 
+	assert(cfg);
+
 	cfg_loadAttribute(cfg, "mqttd", "port", &v, MQTT_PORT);
 	port = strtol(AIT_GET_STR(&v), NULL, 0);
 	AIT_FREE_VAL(&v);
 	cfg_loadAttribute(cfg, "mqttd", "listen", &v, MQTT_HOST);
-
-	host = gethostbyname(AIT_GET_STR(&v));
-	AIT_FREE_VAL(&v);
-	if (!host) {
-		ioERROR(h_errno, "%s", hstrerror(h_errno));
+	if (!e_gethostbyname(AIT_GET_STR(&v), port, &sa)) {
+		ELIBERR(elwix);
+		AIT_FREE_VAL(&v);
 		return -1;
-	}
-	switch (host->h_addrtype) {
-		case AF_INET:
-			sa.sin.sin_len = sizeof(struct sockaddr_in);
-			sa.sin.sin_family = AF_INET;
-			sa.sin.sin_port = htons(port);
-			memcpy(&sa.sin.sin_addr, host->h_addr, sizeof sa.sin.sin_addr);
-			break;
-		case AF_INET6:
-			sa.sin6.sin6_len = sizeof(struct sockaddr_in6);
-			sa.sin6.sin6_family = AF_INET6;
-			sa.sin6.sin6_port = htons(port);
-			memcpy(&sa.sin6.sin6_addr, host->h_addr, sizeof sa.sin6.sin6_addr);
-			break;
-		default:
-			ioERROR(host->h_addrtype, "unsupported socket type");
-			return -1;
-	}
+	} else
+		AIT_FREE_VAL(&v);
 
-	s = socket(sa.ss.ss_family, SOCK_STREAM, 0);
+	s = mqtt_srv_Create(&sa.sa, sa.sa.sa_len);
 	if (s == -1) {
-		ioSYSERR(0);
+		ELIBERR(mqtt);
 		return -1;
 	}
-	if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) {
-		ioSYSERR(0);
-		close(s);
-		return -1;
-	}
-	if (bind(s, (struct sockaddr*) &sa.ss, sa.ss.ss_len) == -1) {
-		ioSYSERR(0);
-		close(s);
-		return -1;
-	}
 
+	EVERBOSE(7, "Created socket=%d\n", s);
 	return s;
 }
 
-int
+inline int
 srv_Close(int s)
 {
-	ioTRACE(2);
+	ETRACE(2);
 
-	if (s > STDERR_FILENO)
-		shutdown(s, SHUT_RDWR);
-
-	return close(s);
+	EVERBOSE(7, "Closing socket=%d\n", s);
+	return mqtt_srv_Destroy(s);
 }