--- mqtt/inc/mqtt.h	2012/04/25 16:36:25	1.2.2.1
+++ mqtt/inc/mqtt.h	2012/05/09 13:57:39	1.2.2.4
@@ -7,6 +7,7 @@
 
 
 struct tagArgs {
+	mqtt_cli_t	*cli;
 	io_sockaddr_t	addr;
 	u_short		ka;
 	mqtt_msg_t	*msg;
@@ -20,8 +21,6 @@ struct tagArgs {
 		ait_val_t	Msg;
 	} Will;
 
-	u_short		MsgID;
-
 	u_char		Dup;
 	u_char		Retain;
 	u_char		QoS;
@@ -34,7 +33,7 @@ struct tagArgs {
 
 	ait_val_t	Publish;
 
-	array_t		*Subscribes;
+	mqtt_subscr_t	*subscr;
 
 	void		(*free)(struct tagArgs*);
 };