--- mqtt/src/utils.c	2012/04/25 16:55:33	1.2.2.4
+++ mqtt/src/utils.c	2012/07/02 12:52:19	1.2.2.7
@@ -1,10 +1,12 @@
 #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;
+	int s = -1;
 	ait_val_t v;
 	u_short port;
 	io_sockaddr_t sa = {{ 0 }};
@@ -24,32 +26,21 @@ srv_Socket(cfg_root_t * __restrict cfg)
 	} 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);
+		ioLIBERR(mqtt);
 		return -1;
 	}
-	if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &n, sizeof n) == -1) {
-		ioSYSERR(0);
-		close(s);
-		return -1;
-	}
-	if (bind(s, &sa.sa, sa.sa.sa_len) == -1) {
-		ioSYSERR(0);
-		close(s);
-		return -1;
-	}
 
+	ioDEBUG(7, "Created socket=%d\n", s);
 	return s;
 }
 
-int
+inline int
 srv_Close(int s)
 {
 	ioTRACE(2);
 
-	if (s > STDERR_FILENO)
-		shutdown(s, SHUT_RDWR);
-
-	return close(s);
+	ioDEBUG(7, "Closing socket=%d\n", s);
+	return mqtt_srv_Destroy(s);
 }