--- mqtt/inc/defs.h	2012/01/05 10:01:20	1.1.1.1.2.21
+++ mqtt/inc/defs.h	2012/07/22 22:44:26	1.4.2.1
@@ -1,19 +1,57 @@
+/*************************************************************************
+* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
+*  by Michael Pounov <misho@openbsd-bg.org>
+*
+* $Author: misho $
+* $Id: defs.h,v 1.4.2.1 2012/07/22 22:44:26 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 __DEFS_H
 #define __DEFS_H
 
 
+#ifndef STRSIZ
 #define STRSIZ			256
-#define MAX_CONNID		24
-#define MAX_CRED		13
-#define MQTTMSG_MAX		65529
-#define WILDCARDS		"/#+"
-#define MQTT_CONNFLGS_INIT	{ 1, 1, 1, 3, 1, 1, 1 }
+#endif
 
-#define MQTT_DATA_MAX		268435455
-#define MQTT_CONN_STR		"MQIsdp"
-#define MQTT_PROTO_VER		3
-#define MQTT_KEEPALIVE		10
-#define MQTT_DEFAULT_MSGID	0xDEBA
+#define RETAIN_TIMEOUT		1
 
 #define DEFAULT_RETRY		1
 #define DEFAULT_CONFIG		"/etc/mqtt.conf"
@@ -22,22 +60,9 @@
 #define MQTT_USER		"mqtt"
 
 
-#define LOGERR		{ \
-				mqtt_Errno = errno; \
-				strlcpy(mqtt_Error, strerror(errno), sizeof mqtt_Error); \
-			}
-
-
-extern int mqtt_Errno;
-extern char mqtt_Error[STRSIZ];
-extern struct tagCallbacks call;
-
 extern char cliCmd[], *cliStr[];
 
-inline void mqtt_SetErr(int eno, char *estr, ...);
-inline struct mqtthdr *_mqtt_readHEADER(mqtt_msg_t * __restrict, u_char, int *, int *);
-
-extern intptr_t Kill;
+extern volatile intptr_t Kill;
 
 extern struct tagCallbacks call;
 extern sqlite3 *acc, *pub;