[467096] Fix incorrect bridge notification.

If a custom notification topic was used, the bridge status would be set
to 1 before a connection was attempted, this has been fixed.

Initial updates to the status topic are now only set once, when the
broker starts, rather than each time the bridge attempts to reconnect.

Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=467096

ChangeLog.txt

@@ -1,3 +1,5 @@
+- Fix incorrect bridge notification on initial connection. Closes #467096.
+
 1.4.2 - 20150507
 ================
 

src/bridge.c

@@ -175,8 +175,11 @@ int mqtt3_bridge_connect(struct mosquitto_db *db, struct mosquitto *context)
 
  if(context->bridge->notifications){
  if(context->bridge->notification_topic){
- notification_payload = '1';
- mqtt3_db_messages_easy_queue(db, context, context->bridge->notification_topic, 1, 1, &notification_payload, 1);
+ if(!context->bridge->initial_notification_done){
+ notification_payload = '0';
+ mqtt3_db_messages_easy_queue(db, context, context->bridge->notification_topic, 1, 1, &notification_payload, 1);
+ context->bridge->initial_notification_done = true;
+ }
  notification_payload = '0';
  rc = _mosquitto_will_set(context, context->bridge->notification_topic, 1, &notification_payload, 1, true);
  if(rc != MOSQ_ERR_SUCCESS){
@@ -189,8 +192,11 @@ int mqtt3_bridge_connect(struct mosquitto_db *db, struct mosquitto *context)
 
  snprintf(notification_topic, notification_topic_len+1, "$SYS/broker/connection/%s/state", context->bridge->remote_clientid);
 
- notification_payload = '0';
- mqtt3_db_messages_easy_queue(db, context, notification_topic, 1, 1, &notification_payload, 1);
+ if(!context->bridge->initial_notification_done){
+ notification_payload = '0';
+ mqtt3_db_messages_easy_queue(db, context, notification_topic, 1, 1, &notification_payload, 1);
+ context->bridge->initial_notification_done = true;
+ }
 
  notification_payload = '0';
  rc = _mosquitto_will_set(context, notification_topic, 1, &notification_payload, 1, true);

src/mosquitto_broker.h

@@ -306,6 +306,7 @@ struct _mqtt3_bridge{
  int threshold;
  bool lazy_reconnect;
  bool attempt_unsubscribe;
+ bool initial_notification_done;
 #ifdef WITH_TLS
  char *tls_cafile;
  char *tls_capath;