--- mqtt/inc/mqttd.h	2012/01/24 10:18:44	1.1.2.6
+++ mqtt/inc/mqttd.h	2012/04/11 15:08:26	1.2.2.3
@@ -8,12 +8,15 @@ struct tagStore {
 
 	mqtt_subscr_t			st_subscr;
 
-	SLIST_ENTRY(tagStore)		st_node;
+	TAILQ_ENTRY(tagStore)		st_node;
 };
 
 struct tagSession {
 	/* client session thread id */
 	pthread_t			sess_tid;
+	pthread_mutex_t			sess_mtx;
+	/* server dispatcher */
+	mqtt_srv_t			*sess_srv;
 
 	/* client network settings */
 	int				sess_sock;
@@ -40,7 +43,7 @@ struct tagSession {
 	} sess_will;
 
 	/* Data Storage by QoS class */
-	SLIST_HEAD(qosStore, tagStore)	sess_sndqueue;
+	TAILQ_HEAD(qosStore, tagStore)	sess_sndqueue;
 
 	TAILQ_ENTRY(tagSession)		sess_node;
 };
@@ -49,7 +52,7 @@ typedef TAILQ_HEAD(, tagSession) sessions_t;
 
 extern sessions_t Sessions;
 extern sched_root_task_t *root;
-extern sl_config cfg;
+extern cfg_root_t cfg;
 extern pthread_mutex_t mtx_sess, mtx_pub;