--- mqtt/inc/mqttd.h	2011/12/08 17:02:25	1.1.2.2
+++ mqtt/inc/mqttd.h	2012/07/03 12:46:00	1.4
@@ -1,29 +1,107 @@
+/*************************************************************************
+* (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 {
+	u_short				st_msgid;
+
+	mqtt_subscr_t			st_subscr;
+
+	SLIST_ENTRY(tagStore)		st_node;
+};
+
 struct tagSession {
-	pthread_t		sess_tid;
-	mqtt_msg_t		*sess_buf;
+	/* server dispatcher */
+	mqtt_srv_t			*sess_srv;
 
-	io_sockaddr_t		sess_addr;
-	struct timeval		sess_ka;
+	/* client network settings */
+	int				sess_sock;
+	u_short				sess_ka;
+	/* client send retry in miliseconds, if client not receive message */
+	u_int				sess_retry;
+	/* message work buffer */
+	mqtt_msg_t			*sess_buf;
 
-	char			sess_cid[MAX_CONNID];
-	char			sess_user[MAX_CRED];
-	char			sess_pass[MAX_CRED];
+	/* authentication user info */
+	char				sess_cid[MAX_CONNID];
+	char				sess_user[MAX_CRED];
+	char				sess_pass[MAX_CRED];
+	char				sess_addr[64];
 
-	char			clear;
+	/* connect flags */
+	char				sess_clean;
 	struct {
-		char		flag;
-		char		qos;
-		char		retain;
+		char			flag;
+		char			qos;
+		char			retain;
+		char			*topic;
+		char			*msg;
 	} sess_will;
 
-	TAILQ_ENTRY(tagSession)	sess_node;
-};
+	/* session subscriptions & send pubs */
+	SLIST_HEAD(tStore, tagStore)	sess_subscr;
 
+	TAILQ_ENTRY(tagSession)		sess_node;
+};
 typedef TAILQ_HEAD(, tagSession) sessions_t;
+
+
+extern sessions_t Sessions;
+extern sched_root_task_t *root;
+extern cfg_root_t cfg;
+
+
+/* function prototypes */
+void *startSession(sched_task_t *task);
 
 
 #endif