--- mqtt/inc/mqtt.h	2011/12/13 15:23:43	1.1.2.7
+++ mqtt/inc/mqtt.h	2012/04/27 10:07:50	1.2.2.2
@@ -2,6 +2,10 @@
 #define __MQTT_H
 
 
+#define API_CLIENT_SIDE
+#include <mqttapi.h>
+
+
 struct tagArgs {
 	io_sockaddr_t	addr;
 	u_short		ka;
@@ -16,6 +20,8 @@ struct tagArgs {
 		ait_val_t	Msg;
 	} Will;
 
+	u_short		MsgID;
+
 	u_char		Dup;
 	u_char		Retain;
 	u_char		QoS;
@@ -28,7 +34,7 @@ struct tagArgs {
 
 	ait_val_t	Publish;
 
-	array_t		*Subscribes;
+	mqtt_subscr_t	*subscr;
 
 	void		(*free)(struct tagArgs*);
 };