--- mqtt/inc/mqtt.h	2011/12/13 09:01:43	1.1.2.4
+++ mqtt/inc/mqtt.h	2011/12/13 14:57:14	1.1.2.6
@@ -4,15 +4,26 @@
 
 struct tagArgs {
 	io_sockaddr_t	addr;
+	mqtt_msg_t	*msg;
 
+	ait_val_t	ConnID;
 	ait_val_t	User;
 	ait_val_t	Pass;
 
-	char		Dup;
-	char		Retain;
-	char		QoS;
-	char		isFile;
-	ait_val_t	Value;
+	struct {
+		ait_val_t	Topic;
+		ait_val_t	Msg;
+	} Will;
+
+	u_char		Dup;
+	u_char		Retain;
+	u_char		QoS;
+	u_char		Clear;
+
+	struct {
+		u_char		isFile;
+		ait_val_t	Value;
+	};
 
 	ait_val_t	Publish;