--- mqtt/inc/mqttd.h	2012/04/11 15:08:26	1.2.2.3
+++ mqtt/inc/mqttd.h	2012/04/27 10:07:50	1.2.2.8
@@ -2,13 +2,16 @@
 #define __MQTTD_H
 
 
+#define API_SERVER_SIDE
+#include <mqttapi.h>
+
+
 struct tagStore {
-	char				st_qos;
 	u_short				st_msgid;
 
 	mqtt_subscr_t			st_subscr;
 
-	TAILQ_ENTRY(tagStore)		st_node;
+	SLIST_ENTRY(tagStore)		st_node;
 };
 
 struct tagSession {
@@ -42,15 +45,30 @@ struct tagSession {
 		char			*msg;
 	} sess_will;
 
-	/* Data Storage by QoS class */
-	TAILQ_HEAD(qosStore, tagStore)	sess_sndqueue;
+	/* session subscriptions */
+	SLIST_HEAD(tStore, tagStore)	sess_subscr;
 
 	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)
+#define SESS_LOCK		pthread_mutex_lock(&mtx_sess)
+#define SESS_UNLOCK		pthread_mutex_unlock(&mtx_sess)
 
+struct tagPub {
+	ait_val_t		pub_name;
+	mqtt_msg_t		pub_packet;
 
+	TAILQ_ENTRY(tagPub)	pub_node;
+};
+typedef TAILQ_HEAD(, tagPub)	pubs_t;
+#define PUBS_LOCK		pthread_mutex_lock(&mtx_pub)
+#define PUBS_UNLOCK		pthread_mutex_unlock(&mtx_pub)
+
+
 extern sessions_t Sessions;
+extern pubs_t Pubs;
 extern sched_root_task_t *root;
 extern cfg_root_t cfg;
 extern pthread_mutex_t mtx_sess, mtx_pub;