--- mqtt/inc/defs.h	2011/11/29 23:23:31	1.1.1.1.2.10
+++ mqtt/inc/defs.h	2011/12/05 16:55:40	1.1.1.1.2.16
@@ -5,6 +5,7 @@
 #define STRSIZ			256
 #define MQTTMSG_MAX		65529
 #define WILDCARDS		"/#+"
+#define MQTT_CONNFLGS_INIT	{ 1, 1, 1, 3, 1, 1, 1 }
 
 #define MQTT_DATA_MAX		268435455
 #define MQTT_CONN_STR		"MQIsdp"
@@ -12,14 +13,18 @@
 #define MQTT_KEEPALIVE		10
 
 #define DEFAULT_CONFIG		"/etc/mqtt.conf"
+#define MQTT_PORT		"1883"
+#define MQTT_HOST		"localhost"
+#define MQTT_USER		"mqtt"
 
 
-#define VERB(x)	if ((x) <= Verbose)
+#define VERB(x)		if ((x) <= Verbose)
+#define FTRACE(x)	VERB((x)) syslog(LOG_DEBUG, "I'm in %s(%d)", __func__, __LINE__);
 
-#define LOGERR	{ \
-			mqtt_Errno = errno; \
-			strlcpy(mqtt_Error, strerror(errno), sizeof mqtt_Error); \
-		}
+#define LOGERR		{ \
+				mqtt_Errno = errno; \
+				strlcpy(mqtt_Error, strerror(errno), sizeof mqtt_Error); \
+			}
 
 
 extern int mqtt_Errno;
@@ -27,8 +32,10 @@ extern char mqtt_Error[STRSIZ];
 extern struct tagCallbacks call;
 
 inline void mqtt_SetErr(int eno, char *estr, ...);
+inline struct mqtthdr *_mqtt_readHEADER(mqtt_msg_t * __restrict, u_char, int *, int *);
 
-extern int Verbose;
+extern int Verbose, Kill;
+extern sched_root_task_t *root;
 
 
 #endif