--- libaitmqtt/src/cliside.c	2012/05/09 13:48:31	1.1.2.6
+++ libaitmqtt/src/cliside.c	2012/06/20 15:02:24	1.2
@@ -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.2 2012/06/20 15:02:24 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -170,7 +170,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;
 	}
 
@@ -221,7 +221,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 +239,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,7 +258,8 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short 
 	if (siz == -1) {
 		LOGERR;
 		return -1;
-	}
+	} else
+		wlen = siz;
 
 	if (QoS == MQTT_QOS_ONCE)	/* no reply */
 		goto end;
@@ -280,7 +281,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 +290,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;
 		}
 	}
@@ -319,7 +320,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);
 			if (Dup++ > 1)
 				return -1;
 			else
@@ -328,5 +329,5 @@ mqtt_cli_Publish(mqtt_cli_t * __restrict cli, u_short 
 	} while (0);
 
 end:
-	return 0;
+	return wlen;
 }