--- mqtt/inc/defs.h	2011/11/21 13:05:33	1.1.1.1.2.3
+++ mqtt/inc/defs.h	2012/04/24 13:54:50	1.2.2.2
@@ -2,16 +2,33 @@
 #define __DEFS_H
 
 
-#define STRSIZ		256
-#define WILDCARDS	"/#+"
+#define STRSIZ			256
+#define INIT_SNDQ		50
+#if 0
+#define WILDCARDS		"/#+"
+#define MQTT_CONNFLGS_INIT	{ 1, 1, 1, 3, 1, 1, 1 }
 
-#define LOGERR	{ \
-			mqtt_Errno = errno; \
-			strlcpy(mqtt_Error, strerror(errno), sizeof mqtt_Error); \
-		}
+#define MQTT_DATA_MAX		268435455
+#define MQTT_CONN_STR		"MQIsdp"
+#define MQTT_PROTO_VER		3
+#define MQTT_KEEPALIVE		10
+#define MQTT_DEFAULT_MSGID	0xDEBA
+#endif
 
+#define DEFAULT_RETRY		1
+#define DEFAULT_CONFIG		"/etc/mqtt.conf"
+#define MQTT_PORT		"1883"
+#define MQTT_HOST		"localhost"
+#define MQTT_USER		"mqtt"
 
-inline void mqtt_SetErr(int eno, char *estr, ...);
+
+extern char cliCmd[], *cliStr[];
+
+extern volatile intptr_t Kill;
+
+extern struct tagCallbacks call;
+extern sqlite3 *acc, *pub;
+extern FILE *logg;
 
 
 #endif