--- mqtt/inc/mqtt.h	2011/12/12 09:45:16	1.1.2.2
+++ mqtt/inc/mqtt.h	2011/12/13 09:51:35	1.1.2.5
@@ -4,18 +4,27 @@
 
 struct tagArgs {
 	io_sockaddr_t	addr;
+	mqtt_msg_t	*msg;
 
+	ait_val_t	User;
+	ait_val_t	Pass;
+
+	struct {
+		ait_val_t	Topic;
+		ait_val_t	Msg;
+	} Will;
+
 	char		Dup;
 	char		Retain;
 	char		QoS;
-	char		*psPublish;
-	struct {
-		char	*psValue;
-		char	*psFile;
-	};
+	char		isFile;
+	ait_val_t	Value;
 
-	int		subsLen;
-	char		*psSubscribe[1];
+	ait_val_t	Publish;
+
+	array_t		*Subscribes;
+
+	void		(*free)(struct tagArgs*);
 };
 
 extern struct tagArgs *args;