--- mqtt/inc/mqtt.h	2011/12/12 09:45:16	1.1.2.2
+++ mqtt/inc/mqtt.h	2012/05/01 22:19:29	1.2.2.3
@@ -2,20 +2,42 @@
 #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;
 
-	char		Dup;
-	char		Retain;
-	char		QoS;
-	char		*psPublish;
+	ait_val_t	ConnID;
+	ait_val_t	User;
+	ait_val_t	Pass;
+
 	struct {
-		char	*psValue;
-		char	*psFile;
+		ait_val_t	Topic;
+		ait_val_t	Msg;
+	} Will;
+
+	u_short		MsgID;
+
+	u_char		Dup;
+	u_char		Retain;
+	u_char		QoS;
+	u_char		notClear;
+
+	struct {
+		u_char		isFile;
+		ait_val_t	Value;
 	};
 
-	int		subsLen;
-	char		*psSubscribe[1];
+	ait_val_t	Publish;
+
+	mqtt_subscr_t	*subscr;
+
+	void		(*free)(struct tagArgs*);
 };
 
 extern struct tagArgs *args;