--- mqtt/inc/mqtt.h	2011/12/13 09:51:35	1.1.2.5
+++ mqtt/inc/mqtt.h	2017/10/08 22:49:24	1.5
@@ -1,11 +1,64 @@
+/*************************************************************************
+* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
+*  by Michael Pounov <misho@openbsd-bg.org>
+*
+* $Author: misho $
+* $Id: mqtt.h,v 1.5 2017/10/08 22:49:24 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, 2013
+	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 __MQTT_H
 #define __MQTT_H
 
 
+#define API_CLIENT_SIDE
+#include <aitmqtt.h>
+#include <mqttapi.h>
+
+
 struct tagArgs {
-	io_sockaddr_t	addr;
+	mqtt_cli_t	*cli;
+	sockaddr_t	addr;
+	u_short		ka;
 	mqtt_msg_t	*msg;
 
+	ait_val_t	ConnID;
 	ait_val_t	User;
 	ait_val_t	Pass;
 
@@ -14,15 +67,19 @@ struct tagArgs {
 		ait_val_t	Msg;
 	} Will;
 
-	char		Dup;
-	char		Retain;
-	char		QoS;
-	char		isFile;
-	ait_val_t	Value;
+	u_char		Dup;
+	u_char		Retain;
+	u_char		QoS;
+	u_char		notClear;
 
+	struct {
+		u_char		isFile;
+		ait_val_t	Value;
+	};
+
 	ait_val_t	Publish;
 
-	array_t		*Subscribes;
+	mqtt_subscr_t	*subscr;
 
 	void		(*free)(struct tagArgs*);
 };