--- mqtt/inc/mqttd.h	2012/04/11 15:08:26	1.2.2.3
+++ mqtt/inc/mqttd.h	2012/04/11 16:37:16	1.2.2.4
@@ -8,7 +8,7 @@ struct tagStore {
 
 	mqtt_subscr_t			st_subscr;
 
-	TAILQ_ENTRY(tagStore)		st_node;
+	SLIST_ENTRY(tagStore)		st_node;
 };
 
 struct tagSession {
@@ -43,17 +43,22 @@ struct tagSession {
 	} sess_will;
 
 	/* Data Storage by QoS class */
-	TAILQ_HEAD(qosStore, tagStore)	sess_sndqueue;
-
+	SLIST_HEAD(tStore, tagStore)	sess_txque[3];
 	TAILQ_ENTRY(tagSession)		sess_node;
 };
 typedef TAILQ_HEAD(, tagSession) sessions_t;
+#define SESS_ELEM_LOCK(x)	pthread_mutex_lock(&(x)->sess_mtx)
+#define SESS_ELEM_UNLOCK(x)	pthread_mutex_unlock(&(x)->sess_mtx)
 
 
 extern sessions_t Sessions;
 extern sched_root_task_t *root;
 extern cfg_root_t cfg;
 extern pthread_mutex_t mtx_sess, mtx_pub;
+#define SESS_LOCK		pthread_mutex_lock(&mtx_sess)
+#define SESS_UNLOCK		pthread_mutex_unlock(&mtx_sess)
+#define PUB_LOCK		pthread_mutex_lock(&mtx_pub)
+#define PUB_UNLOCK		pthread_mutex_unlock(&mtx_pub)
 
 
 #endif