--- mqtt/inc/mqttd.h	2012/04/24 08:06:08	1.2.2.5
+++ mqtt/inc/mqttd.h	2012/04/24 13:54:50	1.2.2.6
@@ -42,8 +42,12 @@ struct tagSession {
 		char			*msg;
 	} sess_will;
 
-	/* Data Storage by QoS class */
-	SLIST_HEAD(tStore, tagStore)	sess_txque[MQTT_QOS_RESERVED];
+	/* session scheduler */
+	sched_root_task_t		*sess_root;
+
+	/* session subscriptions */
+	SLIST_HEAD(tStore, tagStore)	sess_subscr;
+
 	TAILQ_ENTRY(tagSession)		sess_node;
 };
 typedef TAILQ_HEAD(, tagSession) sessions_t;
@@ -59,8 +63,8 @@ struct tagPub {
 	TAILQ_ENTRY(tagPub)	pub_node;
 };
 typedef TAILQ_HEAD(, tagPub)	pubs_t;
-#define PUB_LOCK		pthread_mutex_lock(&mtx_pub)
-#define PUB_UNLOCK		pthread_mutex_unlock(&mtx_pub)
+#define PUBS_LOCK		pthread_mutex_lock(&mtx_pub)
+#define PUBS_UNLOCK		pthread_mutex_unlock(&mtx_pub)
 
 
 extern sessions_t Sessions;