--- libaitmqtt/src/cliside.c	2012/05/09 13:48:31	1.1.2.6
+++ libaitmqtt/src/cliside.c	2012/06/28 11:06:17	1.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: cliside.c,v 1.1.2.6 2012/05/09 13:48:31 misho Exp $
+* $Id: cliside.c,v 1.3 2012/06/28 11:06:17 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -152,7 +152,8 @@ mqtt_cli_Subscribe(mqtt_cli_t * __restrict cli, mqtt_s
 	if (siz == -1) {
 		LOGERR;
 		return NULL;
-	}
+	} else
+		memset(cli->buf->msg_base, 0, cli->buf->msg_len);
 
 	if ((siz = mqtt_wait4data(cli->sock, cli->timeout, POLLIN | POLLPRI)) == -1) {
 		return NULL;
@@ -170,7 +171,7 @@ mqtt_cli_Subscribe(mqtt_cli_t * __restrict cli, mqtt_s
 		return NULL;
 	if (msgID != mid) {
 		free(qoses);
-		mqtt_SetErr(EBADMSG, "Receive different message ID %hu != %hu", msgID, mid);
+		mqtt_SetErr(ECANCELED, "Receive different message ID %hu != %hu", msgID, mid);
 		return NULL;
 	}
 
@@ -204,7 +205,8 @@ mqtt_cli_Unsubscribe(mqtt_cli_t * __restrict cli, mqtt
 	if (siz == -1) {
 		LOGERR;
 		return -1;
-	}
+	} else
+		memset(cli->buf->msg_base, 0, cli->buf->msg_len);
 
 	if ((siz = mqtt_wait4data(cli->sock, cli->timeout, POLLIN | POLLPRI)) == -1) {
 		return -1;
@@ -221,7 +223,7 @@ mqtt_cli_Unsubscribe(mqtt_cli_t * __restrict cli, mqtt
 	if (siz == -1)
 		return -1;
 	if (msgID != siz) {
-		mqtt_SetErr(EBADMSG, "Receive different message ID %hu != %hu", msgID, siz);
+		mqtt_SetErr(ECANCELED, "Receive different message ID %hu != %hu", msgID, siz);
 		return -1;
 	}
 
@@ -239,13 +241,13 @@ mqtt_cli_Unsubscribe(mqtt_cli_t * __restrict cli, mqtt
  * @csTopic = Topic
  * @pData = Data
  * @datLen = Data length
- * return: -1 error or 0 ok
+ * return: -1 error or > -1 sended bytes
  */
 int
 mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short msgID, u_char Dup, u_char QoS, u_char Retain, 
 		const char *csTopic, const void *pData, int datLen)
 {
-	int siz = 0;
+	int wlen = 0, siz = 0;
 
 	if (!cli || !csTopic)
 		return -1;
@@ -258,6 +260,9 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short 
 	if (siz == -1) {
 		LOGERR;
 		return -1;
+	} else {
+		wlen = siz;
+		memset(cli->buf->msg_base, 0, cli->buf->msg_len);
 	}
 
 	if (QoS == MQTT_QOS_ONCE)	/* no reply */
@@ -280,7 +285,7 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short 
 		if (siz == -1)
 			return -1;
 		if (msgID != siz) {
-			mqtt_SetErr(EBADMSG, "Receive different message ID %hu != %hu", msgID, siz);
+			mqtt_SetErr(ECANCELED, "Receive different message ID %hu != %hu", msgID, siz);
 			return -1;
 		}
 		goto end;
@@ -289,7 +294,7 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short 
 		if (siz == -1)
 			return -1;
 		if (msgID != siz) {
-			mqtt_SetErr(EBADMSG, "Receive different message ID %hu != %hu", msgID, siz);
+			mqtt_SetErr(ECANCELED, "Receive different message ID %hu != %hu", msgID, siz);
 			return -1;
 		}
 	}
@@ -303,7 +308,8 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short 
 		if (siz == -1) {
 			LOGERR;
 			return -1;
-		}
+		} else
+			memset(cli->buf->msg_base, 0, cli->buf->msg_len);
 
 		if ((siz = mqtt_wait4data(cli->sock, cli->timeout, POLLIN | POLLPRI)) == -1) {
 			return -1;
@@ -315,11 +321,17 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short 
 		}
 
 		/* receive PUBCOMP */
+		siz = recv(cli->sock, cli->buf->msg_base, cli->buf->msg_len, 0);
+		if (siz == -1) {
+			LOGERR;
+			return -1;
+		}
+
 		siz = mqtt_readPUBCOMP(cli->buf);
 		if (siz == -1)
 			return -1;
 		if (msgID != siz) {
-			mqtt_SetErr(EBADMSG, "Receive different message ID %hu != %hu", msgID, siz);
+			mqtt_SetErr(ECANCELED, "Receive different message ID %hu != %hu", msgID, siz);
 			if (Dup++ > 1)
 				return -1;
 			else
@@ -328,5 +340,5 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short 
 	} while (0);
 
 end:
-	return 0;
+	return wlen;
 }