--- mqtt/inc/defs.h	2011/11/22 14:48:25	1.1.1.1.2.6
+++ mqtt/inc/defs.h	2012/07/03 09:02:50	1.3
@@ -3,41 +3,32 @@
 
 
 #define STRSIZ			256
-#define MQTTMSG_MAX		65529
+#define RETAIN_TIMEOUT		1
+#if 0
 #define WILDCARDS		"/#+"
+#define MQTT_CONNFLGS_INIT	{ 1, 1, 1, 3, 1, 1, 1 }
 
 #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 MQTT_TYPE_UNKNOWN	0	/* reserved */
-#define MQTT_TYPE_CONNECT	1	/* client request to connect to server */
-#define MQTT_TYPE_CONNACK	2	/* connect acknowledgment */
-#define MQTT_TYPE_PUBLISH	3	/* publish message */
-#define MQTT_TYPE_PUBACK	4	/* publish acknowledgment */
-#define MQTT_TYPE_PUBREC	5	/* publish received (assured delivery part 1) */
-#define MQTT_TYPE_PUBREL	6	/* publish release (assured delivery part 2) */
-#define MQTT_TYPE_PUBCOMP	7	/* publish complete (assured delivery part 3) */
-#define MQTT_TYPE_SUBSCRIBE	8	/* client subscribe request */
-#define MQTT_TYPE_SUBACK	9	/* subscribe acknowledgment */
-#define MQTT_TYPE_UNSUBSCRIBE	10	/* client unsubscribe request */
-#define MQTT_TYPE_UNSUBACK	11	/* unsubscribe acknowledgment */
-#define MQTT_TYPE_PINGREQ	12	/* PING request */
-#define MQTT_TYPE_PINGRESP	13	/* PING response */
-#define MQTT_TYPE_DISCONNECT	14	/* client is disconnecting */
-#define MQTT_TYPE_MAX		15	/* reserved */
+#define DEFAULT_RETRY		1
+#define DEFAULT_CONFIG		"/etc/mqtt.conf"
+#define MQTT_PORT		"1883"
+#define MQTT_HOST		"localhost"
+#define MQTT_USER		"mqtt"
 
 
-#define LOGERR	{ \
-			mqtt_Errno = errno; \
-			strlcpy(mqtt_Error, strerror(errno), sizeof mqtt_Error); \
-		}
+extern char cliCmd[], *cliStr[];
 
+extern volatile intptr_t Kill;
 
-extern int mqtt_Errno;
-extern char mqtt_Error[STRSIZ];
-inline void mqtt_SetErr(int eno, char *estr, ...);
+extern struct tagCallbacks call;
+extern sqlite3 *acc, *pub;
+extern FILE *logg;
 
 
 #endif