--- mqtt/inc/mqtt.h	2012/04/25 16:36:25	1.2.2.1
+++ mqtt/inc/mqtt.h	2012/07/03 09:02:50	1.3
@@ -3,10 +3,12 @@
 
 
 #define API_CLIENT_SIDE
+#include <aitmqtt.h>
 #include <mqttapi.h>
 
 
 struct tagArgs {
+	mqtt_cli_t	*cli;
 	io_sockaddr_t	addr;
 	u_short		ka;
 	mqtt_msg_t	*msg;
@@ -20,8 +22,6 @@ struct tagArgs {
 		ait_val_t	Msg;
 	} Will;
 
-	u_short		MsgID;
-
 	u_char		Dup;
 	u_char		Retain;
 	u_char		QoS;
@@ -34,7 +34,7 @@ struct tagArgs {
 
 	ait_val_t	Publish;
 
-	array_t		*Subscribes;
+	mqtt_subscr_t	*subscr;
 
 	void		(*free)(struct tagArgs*);
 };