--- mqtt/inc/mqttd.h	2012/05/05 14:51:01	1.2.2.10
+++ mqtt/inc/mqttd.h	2012/06/01 10:39:48	1.2.2.12
@@ -14,6 +14,12 @@ struct tagStore {
 	SLIST_ENTRY(tagStore)		st_node;
 };
 
+struct tagPkt {
+	ait_val_t			*pkt_data;
+
+	SLIST_ENTRY(tagPkt)		pkt_node;
+};
+
 struct tagSession {
 	/* server dispatcher */
 	mqtt_srv_t			*sess_srv;
@@ -42,24 +48,16 @@ struct tagSession {
 		char			*msg;
 	} sess_will;
 
-	/* session subscriptions */
+	/* session subscriptions & send pubs */
 	SLIST_HEAD(tStore, tagStore)	sess_subscr;
+	SLIST_HEAD(tPkt, tagPkt)	sess_sndpkt;
 
 	TAILQ_ENTRY(tagSession)		sess_node;
 };
 typedef TAILQ_HEAD(, tagSession) sessions_t;
 
-struct tagPub {
-	ait_val_t		pub_name;
-	mqtt_msg_t		pub_packet;
 
-	TAILQ_ENTRY(tagPub)	pub_node;
-};
-typedef TAILQ_HEAD(, tagPub)	pubs_t;
-
-
 extern sessions_t Sessions;
-extern pubs_t Pubs;
 extern sched_root_task_t *root;
 extern cfg_root_t cfg;