--- libaitmqtt/src/cliside.c	2016/09/14 15:52:36	1.3.12.1
+++ libaitmqtt/src/cliside.c	2022/09/15 15:04:44	1.3.12.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cliside.c,v 1.3.12.1 2016/09/14 15:52:36 misho Exp $
+* $Id: cliside.c,v 1.3.12.2 2022/09/15 15:04:44 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 - 2016
+Copyright 2004 - 2022
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@ mqtt_cli_Open(struct sockaddr *addr, u_short timeout)
 	if (!addr)
 		return NULL;
 
-	cli = malloc(sizeof(mqtt_cli_t));
+	cli = e_malloc(sizeof(mqtt_cli_t));
 	if (!cli) {
 		LOGERR;
 		return NULL;
@@ -72,7 +72,7 @@ mqtt_cli_Open(struct sockaddr *addr, u_short timeout)
 	cli->sock = socket(addr->sa_family, SOCK_STREAM, IPPROTO_TCP);
 	if (cli->sock == -1) {
 		LOGERR;
-		free(cli);
+		e_free(cli);
 		return NULL;
 	}
 #ifndef __linux__
@@ -84,17 +84,10 @@ mqtt_cli_Open(struct sockaddr *addr, u_short timeout)
 #endif
 		LOGERR;
 		close(cli->sock);
-		free(cli);
+		e_free(cli);
 		return NULL;
 	}
 
-	cli->buf = mqtt_msgAlloc(USHRT_MAX);
-	if (!cli->buf) {
-		close(cli->sock);
-		free(cli);
-		return NULL;
-	}
-
 	return cli;
 }
 
@@ -107,23 +100,23 @@ mqtt_cli_Open(struct sockaddr *addr, u_short timeout)
 int
 mqtt_cli_Close(mqtt_cli_t ** __restrict cli)
 {
-	int siz = 0;
+	int siz;
 
 	if (!cli || !*cli)
 		return -1;
 
 	/* send disconnect */
-	siz = mqtt_msgDISCONNECT((*cli)->buf);
-	if (siz > -1) {
-		siz = send((*cli)->sock, (*cli)->buf->msg_base, siz, MSG_NOSIGNAL);
+	(*cli)->buf = mqtt_msgDISCONNECT();
+	if ((*cli)->buf) {
+		siz = send((*cli)->sock, (*cli)->buf->msg_base, (*cli)->buf->msg_len, MSG_NOSIGNAL);
 		if (siz > -1)
 			shutdown((*cli)->sock, SHUT_RDWR);
 	}
 	close((*cli)->sock);
 
-	mqtt_msgFree(&(*cli)->buf, 42);
+	mqtt_msgFree(&(*cli)->buf, 0);
 
-	free(*cli);
+	e_free(*cli);
 	*cli = NULL;
 	return 0;
 }
@@ -134,14 +127,11 @@ mqtt_cli_Close(mqtt_cli_t ** __restrict cli)
  * @cli = connected client
  * @Topics = Topics for subscribes
  * @msgID = Message ID
- * @Dup = Duplicated request
- * @QoS = Message QoS
  * return: NULL error or !=NULL allocated array with subscribed QoS responses, 
- * 	must be free() result!
+ * 	must be e_free() result!
  */
 u_char *
-mqtt_cli_Subscribe(mqtt_cli_t * __restrict cli, mqtt_subscr_t * __restrict Topics, 
-		u_short msgID, u_char Dup, u_char QoS)
+mqtt_cli_Subscribe(mqtt_cli_t * __restrict cli, mqtt_subscr_t ** __restrict Topics, u_short msgID)
 {
 	int siz = 0;
 	u_short mid = 0;
@@ -151,15 +141,15 @@ mqtt_cli_Subscribe(mqtt_cli_t * __restrict cli, mqtt_s
 		return NULL;
 
 	/* send subscribe */
-	siz = mqtt_msgSUBSCRIBE(cli->buf, Topics, msgID, Dup, QoS);
-	if (siz == -1)
+	cli->buf = mqtt_msgSUBSCRIBE(Topics, msgID);
+	if (!cli->buf)
 		return NULL;
-	siz = send(cli->sock, cli->buf->msg_base, siz, MSG_NOSIGNAL);
+	siz = send(cli->sock, cli->buf->msg_base, cli->buf->msg_len, MSG_NOSIGNAL);
 	if (siz == -1) {
 		LOGERR;
 		return NULL;
 	} else
-		memset(cli->buf->msg_base, 0, cli->buf->msg_len);
+		mqtt_msgFree(&cli->buf, 0);
 
 	if ((siz = mqtt_wait4data(cli->sock, cli->timeout, POLLIN | POLLPRI)) == -1) {
 		return NULL;
@@ -184,6 +174,7 @@ mqtt_cli_Subscribe(mqtt_cli_t * __restrict cli, mqtt_s
 	return qoses;
 }
 
+#if 0
 /*
  * mqtt_cli_Unsubscribe() - Unsubscribe from broker
  *
@@ -348,3 +339,4 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short 
 end:
 	return wlen;
 }
+#endif