--- mqtt/inc/mqtt.h	2011/12/13 14:57:14	1.1.2.6
+++ mqtt/inc/mqtt.h	2012/05/01 22:19:29	1.2.2.3
@@ -2,8 +2,14 @@
 #define __MQTT_H
 
 
+#define API_CLIENT_SIDE
+#include <mqttapi.h>
+
+
 struct tagArgs {
+	mqtt_cli_t	*cli;
 	io_sockaddr_t	addr;
+	u_short		ka;
 	mqtt_msg_t	*msg;
 
 	ait_val_t	ConnID;
@@ -15,10 +21,12 @@ struct tagArgs {
 		ait_val_t	Msg;
 	} Will;
 
+	u_short		MsgID;
+
 	u_char		Dup;
 	u_char		Retain;
 	u_char		QoS;
-	u_char		Clear;
+	u_char		notClear;
 
 	struct {
 		u_char		isFile;
@@ -27,7 +35,7 @@ struct tagArgs {
 
 	ait_val_t	Publish;
 
-	array_t		*Subscribes;
+	mqtt_subscr_t	*subscr;
 
 	void		(*free)(struct tagArgs*);
 };