--- mqtt/inc/mqttd.h	2012/04/24 13:54:50	1.2.2.6
+++ mqtt/inc/mqttd.h	2012/07/03 12:46:00	1.4
@@ -1,9 +1,57 @@
+/*************************************************************************
+* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
+*  by Michael Pounov <misho@openbsd-bg.org>
+*
+* $Author: misho $
+* $Id: mqttd.h,v 1.4 2012/07/03 12:46:00 misho Exp $
+*
+**************************************************************************
+The ELWIX and AITNET software is distributed under the following
+terms:
+
+All of the documentation and software included in the ELWIX and AITNET
+Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
+
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+	by Michael Pounov <misho@elwix.org>.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+This product includes software developed by Michael Pounov <misho@elwix.org>
+ELWIX - Embedded LightWeight unIX and its contributors.
+4. Neither the name of AITNET nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
 #ifndef __MQTTD_H
 #define __MQTTD_H
 
 
+#define API_SERVER_SIDE
+#include <mqttapi.h>
+
+
 struct tagStore {
-	char				st_qos;
 	u_short				st_msgid;
 
 	mqtt_subscr_t			st_subscr;
@@ -12,9 +60,6 @@ struct tagStore {
 };
 
 struct tagSession {
-	/* client session thread id */
-	pthread_t			sess_tid;
-	pthread_mutex_t			sess_mtx;
 	/* server dispatcher */
 	mqtt_srv_t			*sess_srv;
 
@@ -42,36 +87,21 @@ struct tagSession {
 		char			*msg;
 	} sess_will;
 
-	/* session scheduler */
-	sched_root_task_t		*sess_root;
-
-	/* session subscriptions */
+	/* session subscriptions & send pubs */
 	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;
+
+
+/* function prototypes */
+void *startSession(sched_task_t *task);
 
 
 #endif