--- mqtt/inc/mqttd.h	2011/12/09 09:53:54	1.1.2.3
+++ mqtt/inc/mqttd.h	2012/04/11 15:08:26	1.2.2.3
@@ -2,34 +2,58 @@
 #define __MQTTD_H
 
 
+struct tagStore {
+	char				st_qos;
+	u_short				st_msgid;
+
+	mqtt_subscr_t			st_subscr;
+
+	TAILQ_ENTRY(tagStore)		st_node;
+};
+
 struct tagSession {
-	pthread_t		sess_tid;
-	mqtt_msg_t		*sess_buf;
+	/* client session thread id */
+	pthread_t			sess_tid;
+	pthread_mutex_t			sess_mtx;
+	/* server dispatcher */
+	mqtt_srv_t			*sess_srv;
 
-	int			sess_sock;
-	io_sockaddr_t		sess_addr;
-	struct timeval		sess_ka;
+	/* client network settings */
+	int				sess_sock;
+	u_short				sess_ka;
+	/* client send retry in miliseconds, if client not receive message */
+	u_int				sess_retry;
+	/* message work buffer */
+	mqtt_msg_t			*sess_buf;
 
-	char			sess_cid[MAX_CONNID];
-	char			sess_user[MAX_CRED];
-	char			sess_pass[MAX_CRED];
+	/* authentication user info */
+	char				sess_cid[MAX_CONNID];
+	char				sess_user[MAX_CRED];
+	char				sess_pass[MAX_CRED];
+	char				sess_addr[64];
 
-	char			clear;
+	/* connect flags */
+	char				sess_clean;
 	struct {
-		char		flag;
-		char		qos;
-		char		retain;
-		char		*topic;
-		char		*msg;
+		char			flag;
+		char			qos;
+		char			retain;
+		char			*topic;
+		char			*msg;
 	} sess_will;
 
-	TAILQ_ENTRY(tagSession)	sess_node;
-};
+	/* Data Storage by QoS class */
+	TAILQ_HEAD(qosStore, tagStore)	sess_sndqueue;
 
+	TAILQ_ENTRY(tagSession)		sess_node;
+};
 typedef TAILQ_HEAD(, tagSession) sessions_t;
 
 
 extern sessions_t Sessions;
+extern sched_root_task_t *root;
+extern cfg_root_t cfg;
+extern pthread_mutex_t mtx_sess, mtx_pub;
 
 
 #endif