Diff for /mqtt/inc/defs.h between versions 1.1.1.1.2.16 and 1.2.2.3

version 1.1.1.1.2.16, 2011/12/05 16:55:40 version 1.2.2.3, 2012/07/03 07:48:48
Line 3 Line 3
   
   
 #define STRSIZ                  256  #define STRSIZ                  256
#define MQTTMSG_MAX             65529#define RETAIN_TIMEOUT          1
 #if 0
 #define WILDCARDS               "/#+"  #define WILDCARDS               "/#+"
 #define MQTT_CONNFLGS_INIT      { 1, 1, 1, 3, 1, 1, 1 }  #define MQTT_CONNFLGS_INIT      { 1, 1, 1, 3, 1, 1, 1 }
   
Line 11 Line 12
 #define MQTT_CONN_STR           "MQIsdp"  #define MQTT_CONN_STR           "MQIsdp"
 #define MQTT_PROTO_VER          3  #define MQTT_PROTO_VER          3
 #define MQTT_KEEPALIVE          10  #define MQTT_KEEPALIVE          10
   #define MQTT_DEFAULT_MSGID      0xDEBA
   #endif
   
   #define DEFAULT_RETRY           1
 #define DEFAULT_CONFIG          "/etc/mqtt.conf"  #define DEFAULT_CONFIG          "/etc/mqtt.conf"
 #define MQTT_PORT               "1883"  #define MQTT_PORT               "1883"
 #define MQTT_HOST               "localhost"  #define MQTT_HOST               "localhost"
 #define MQTT_USER               "mqtt"  #define MQTT_USER               "mqtt"
   
   
#define VERB(x)         if ((x) <= Verbose)extern char cliCmd[], *cliStr[];
#define FTRACE(x)       VERB((x)) syslog(LOG_DEBUG, "I'm in %s(%d)", __func__, __LINE__); 
   
#define LOGERR          { \extern volatile intptr_t Kill;
                                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 struct tagCallbacks call;
extern sqlite3 *acc, *pub;
inline void mqtt_SetErr(int eno, char *estr, ...);extern FILE *logg;
inline struct mqtthdr *_mqtt_readHEADER(mqtt_msg_t * __restrict, u_char, int *, int *); 
 
extern int Verbose, Kill; 
extern sched_root_task_t *root; 
   
   
 #endif  #endif

Removed from v.1.1.1.1.2.16  
changed lines
  Added in v.1.2.2.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>