--- mqtt/inc/mqtt.h	2011/12/13 08:43:51	1.1.2.3
+++ mqtt/inc/mqtt.h	2012/07/02 12:52:18	1.2.2.5
@@ -2,18 +2,39 @@
 #define __MQTT_H
 
 
+#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;
 
-	char		Dup;
-	char		Retain;
-	char		QoS;
-	char		isFile;
-	ait_val_t	Value;
+	ait_val_t	ConnID;
+	ait_val_t	User;
+	ait_val_t	Pass;
 
+	struct {
+		ait_val_t	Topic;
+		ait_val_t	Msg;
+	} Will;
+
+	u_char		Dup;
+	u_char		Retain;
+	u_char		QoS;
+	u_char		notClear;
+
+	struct {
+		u_char		isFile;
+		ait_val_t	Value;
+	};
+
 	ait_val_t	Publish;
 
-	array_t		*Subscribes;
+	mqtt_subscr_t	*subscr;
 
 	void		(*free)(struct tagArgs*);
 };