--- libaitmqtt/inc/aitmqtt.h	2012/02/04 10:40:01	1.1.1.1.2.6
+++ libaitmqtt/inc/aitmqtt.h	2012/04/27 16:02:16	1.1.1.1.2.14
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitmqtt.h,v 1.1.1.1.2.6 2012/02/04 10:40:01 misho Exp $
+* $Id: aitmqtt.h,v 1.1.1.1.2.14 2012/04/27 16:02:16 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -104,6 +104,9 @@ struct mqtthdr {
 #define MQTT_QOS_EXACTLY	2	/* Exactly once, Assured delivery, =1 */
 #define MQTT_QOS_RESERVED	3	/* reserved */
 
+#define MQTT_QOS_DENY		0	/* Not granted QoS for SUBACK */
+#define MQTT_QOS_PASS		2	/* Granted QoS for SUBACK */
+
 #define MQTT_FLAG_RETAIN	1	/* This flag is only used on PUBLISH messages.
 
 					   When a client sends a PUBLISH to a server, 
@@ -267,15 +270,16 @@ inline unsigned int mqtt_decodeLen(void * __restrict l
  */
 inline char mqtt_sizeLen(unsigned int len);
 /*
- * mqtt_str2sub Create MQTT subscribe variable from string(s)
+ * mqtt_str2subs Create MQTT subscribe variable from string(s)
  *
- * @csStr = strings
- * @strnum = number of strings elements
+ * @csStr = null terminated string array
+ * @strnum = copy at most number of strings elements
  * @qoses = QoS elements applied to subscribe variable, 
  * 		count of elements must be equal with csStr elements
  * return: NULL error or != subscribe variables array, must be free after use with mqtt_freeSub()
  */
-inline mqtt_subscr_t *mqtt_str2sub(const char **csStr, unsigned short strnum, unsigned char *qoses);
+inline mqtt_subscr_t *mqtt_str2subs(const char **csStr, unsigned short strnum, 
+		unsigned char *qoses);
 /*
  * mqtt_subFree() Free array from subscribe variables
  *
@@ -297,7 +301,15 @@ inline mqtt_subscr_t *mqtt_subAlloc(unsigned short num
  * @num = Number of elements
  * return: NULL error or subscribe array, after use must call mqtt_subFree()
  */
-inline mqtt_subscr_t *mqtt_subRealloc(mqtt_subscr_t * __restrict subs, unsigned short num);
+inline mqtt_subscr_t *mqtt_subRealloc(mqtt_subscr_t ** __restrict subs, unsigned short num);
+/*
+ * mqtt_subCopy() - Copy subscription structure to another one
+ *
+ * @dst = destination subscription
+ * @src = source subscription
+ * return: =NULL error or !=NULL successful copied a structure
+ */
+inline mqtt_subscr_t *mqtt_subCopy(mqtt_subscr_t * __restrict dst, mqtt_subscr_t * __restrict src);
 
 
 /*** SENDER FUNCTIONS ***/
@@ -504,11 +516,10 @@ int mqtt_readPINGRESP(mqtt_msg_t * __restrict buf);
  * @topicLen = Topic length
  * @msgID = MessageID
  * @pData = Data buffer
- * @datLen = Data buffer length, if *datLen == 0 allocate memory for pData
- * return: NULL error or !=NULL MQTT fixed header
+ * return: -1 error or !=-1 allocated data buffer length
  */
-struct mqtthdr *mqtt_readPUBLISH(mqtt_msg_t * __restrict buf, char * __restrict psTopic, 
-		int topicLen, unsigned short *msgID, void * __restrict pData, int *datLen);
+int mqtt_readPUBLISH(mqtt_msg_t * __restrict buf, char * __restrict psTopic, 
+		int topicLen, unsigned short *msgID, void ** __restrict pData);
 /*
  * mqtt_readPUBACK() Read PUBACK message
  *
@@ -544,9 +555,9 @@ unsigned short mqtt_readPUBCOMP(mqtt_msg_t * __restric
  * @buf = Message buffer
  * @msgID = MessageID
  * @subscr = Subscriptions, must be free after use with mqtt_subFree()
- * return: NULL error or !=NULL MQTT fixed header
+ * return: -1 error or >-1 elements into subscr
  */
-struct mqtthdr *mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, unsigned short *msgID, 
+int mqtt_readSUBSCRIBE(mqtt_msg_t * __restrict buf, unsigned short *msgID, 
 		mqtt_subscr_t **subscr);
 /*
  * mqtt_readSUBACK() Read SUBACK message
@@ -563,9 +574,9 @@ int mqtt_readSUBACK(mqtt_msg_t * __restrict buf, unsig
  * @buf = Message buffer
  * @msgID = MessageID
  * @subscr = Subscriptions, must be free after use with mqtt_subFree()
- * return: NULL error or !=NULL MQTT fixed header
+ * return: -1 error or >-1 elements into subscr
  */
-struct mqtthdr *mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, unsigned short *msgID, 
+int mqtt_readUNSUBSCRIBE(mqtt_msg_t * __restrict buf, unsigned short *msgID, 
 		mqtt_subscr_t **subscr);
 /*
  * mqtt_readUNSUBACK() Read UNSUBACK message