github
/
mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad merge.

Browse Source
pull/798/head
Roger A. Light 8 years ago
parent b2bb48ac2b
commit caa9e46fda
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

60
src/bridge.c
Unescape Escape View File

@ -128,23 +128,23 @@ int bridge__connect_step1(struct mosquitto_db *db, struct mosquitto *context)
context->in_packet.payload = NULL; context->in_packet.payload = NULL;
context->ping_t = 0; context->ping_t = 0;
context->bridge->lazy_reconnect = false; context->bridge->lazy_reconnect = false;
mqtt3_bridge_packet_cleanup(context); bridge__packet_cleanup(context);
mqtt3_db_message_reconnect_reset(db, context); db__message_reconnect_reset(db, context);
if(context->clean_session){ if(context->clean_session){
mqtt3_db_messages_delete(db, context); db__messages_delete(db, context);
} }
/* Delete all local subscriptions even for clean_session==false. We don't /* Delete all local subscriptions even for clean_session==false. We don't
* remove any messages and the next loop carries out the resubscription * remove any messages and the next loop carries out the resubscription
* anyway. This means any unwanted subs will be removed. * anyway. This means any unwanted subs will be removed.
*/ */
mqtt3_subs_clean_session(db, context); sub__clean_session(db, context);
for(i=0; i<context->bridge->topic_count; i++){ for(i=0; i<context->bridge->topic_count; i++){
if(context->bridge->topics[i].direction == bd_out || context->bridge->topics[i].direction == bd_both){ if(context->bridge->topics[i].direction == bd_out || context->bridge->topics[i].direction == bd_both){
_mosquitto_log_printf(NULL, MOSQ_LOG_DEBUG, "Bridge %s doing local SUBSCRIBE on topic %s", context->id, context->bridge->topics[i].local_topic); log__printf(NULL, MOSQ_LOG_DEBUG, "Bridge %s doing local SUBSCRIBE on topic %s", context->id, context->bridge->topics[i].local_topic);
if(mqtt3_sub_add(db, context, context->bridge->topics[i].local_topic, context->bridge->topics[i].qos, &db->subs)) return 1; if(sub__add(db, context, context->bridge->topics[i].local_topic, context->bridge->topics[i].qos, &db->subs)) return 1;
} }
} }
@ -152,46 +152,46 @@ int bridge__connect_step1(struct mosquitto_db *db, struct mosquitto *context)
if(context->bridge->notification_topic){ if(context->bridge->notification_topic){
if(!context->bridge->initial_notification_done){ if(!context->bridge->initial_notification_done){
notification_payload = '0'; notification_payload = '0';
mqtt3_db_messages_easy_queue(db, context, context->bridge->notification_topic, 1, 1, &notification_payload, 1); db__messages_easy_queue(db, context, context->bridge->notification_topic, 1, 1, &notification_payload, 1);
context->bridge->initial_notification_done = true; context->bridge->initial_notification_done = true;
} }
notification_payload = '0'; notification_payload = '0';
rc = _mosquitto_will_set(context, context->bridge->notification_topic, 1, &notification_payload, 1, true); rc = will__set(context, context->bridge->notification_topic, 1, &notification_payload, 1, true);
if(rc != MOSQ_ERR_SUCCESS){ if(rc != MOSQ_ERR_SUCCESS){
return rc; return rc;
} }
}else{ }else{
notification_topic_len = strlen(context->bridge->remote_clientid)+strlen("$SYS/broker/connection//state"); notification_topic_len = strlen(context->bridge->remote_clientid)+strlen("$SYS/broker/connection//state");
notification_topic = _mosquitto_malloc(sizeof(char)*(notification_topic_len+1)); notification_topic = mosquitto__malloc(sizeof(char)*(notification_topic_len+1));
if(!notification_topic) return MOSQ_ERR_NOMEM; if(!notification_topic) return MOSQ_ERR_NOMEM;
snprintf(notification_topic, notification_topic_len+1, "$SYS/broker/connection/%s/state", context->bridge->remote_clientid); snprintf(notification_topic, notification_topic_len+1, "$SYS/broker/connection/%s/state", context->bridge->remote_clientid);
if(!context->bridge->initial_notification_done){ if(!context->bridge->initial_notification_done){
notification_payload = '0'; notification_payload = '0';
mqtt3_db_messages_easy_queue(db, context, notification_topic, 1, 1, &notification_payload, 1); db__messages_easy_queue(db, context, notification_topic, 1, 1, &notification_payload, 1);
context->bridge->initial_notification_done = true; context->bridge->initial_notification_done = true;
} }
notification_payload = '0'; notification_payload = '0';
rc = _mosquitto_will_set(context, notification_topic, 1, &notification_payload, 1, true); rc = will__set(context, notification_topic, 1, &notification_payload, 1, true);
_mosquitto_free(notification_topic); mosquitto__free(notification_topic);
if(rc != MOSQ_ERR_SUCCESS){ if(rc != MOSQ_ERR_SUCCESS){
return rc; return rc;
} }
} }
} }
_mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "Connecting bridge %s (%s:%d)", context->bridge->name, context->bridge->addresses[context->bridge->cur_address].address, context->bridge->addresses[context->bridge->cur_address].port); log__printf(NULL, MOSQ_LOG_NOTICE, "Connecting bridge %s (%s:%d)", context->bridge->name, context->bridge->addresses[context->bridge->cur_address].address, context->bridge->addresses[context->bridge->cur_address].port);
rc = _mosquitto_try_connect_step1(context, context->bridge->addresses[context->bridge->cur_address].address); rc = net__try_connect_step1(context, context->bridge->addresses[context->bridge->cur_address].address);
if(rc > 0 ){ if(rc > 0 ){
if(rc == MOSQ_ERR_TLS){ if(rc == MOSQ_ERR_TLS){
_mosquitto_socket_close(db, context); net__socket_close(db, context);
return rc; /* Error already printed */ return rc; /* Error already printed */
}else if(rc == MOSQ_ERR_ERRNO){ }else if(rc == MOSQ_ERR_ERRNO){
_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", strerror(errno)); log__printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", strerror(errno));
}else if(rc == MOSQ_ERR_EAI){ }else if(rc == MOSQ_ERR_EAI){
_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", gai_strerror(errno)); log__printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", gai_strerror(errno));
} }
return rc; return rc;
@ -207,30 +207,30 @@ int bridge__connect_step2(struct mosquitto_db *db, struct mosquitto *context)
if(!context || !context->bridge) return MOSQ_ERR_INVAL; if(!context || !context->bridge) return MOSQ_ERR_INVAL;
_mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "Connecting bridge %s (%s:%d)", context->bridge->name, context->bridge->addresses[context->bridge->cur_address].address, context->bridge->addresses[context->bridge->cur_address].port); log__printf(NULL, MOSQ_LOG_NOTICE, "Connecting bridge %s (%s:%d)", context->bridge->name, context->bridge->addresses[context->bridge->cur_address].address, context->bridge->addresses[context->bridge->cur_address].port);
rc = _mosquitto_try_connect_step2(context, context->bridge->addresses[context->bridge->cur_address].port, &context->sock); rc = net__try_connect_step2(context, context->bridge->addresses[context->bridge->cur_address].port, &context->sock);
if(rc > 0 ){ if(rc > 0 ){
if(rc == MOSQ_ERR_TLS){ if(rc == MOSQ_ERR_TLS){
_mosquitto_socket_close(db, context); net__socket_close(db, context);
return rc; /* Error already printed */ return rc; /* Error already printed */
}else if(rc == MOSQ_ERR_ERRNO){ }else if(rc == MOSQ_ERR_ERRNO){
_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", strerror(errno)); log__printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", strerror(errno));
}else if(rc == MOSQ_ERR_EAI){ }else if(rc == MOSQ_ERR_EAI){
_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", gai_strerror(errno)); log__printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", gai_strerror(errno));
} }
return rc; return rc;
} }
rc = _mosquitto_socket_connect_step3(context, context->bridge->addresses[context->bridge->cur_address].address, context->bridge->addresses[context->bridge->cur_address].port, NULL, false); rc = net__socket_connect_step3(context, context->bridge->addresses[context->bridge->cur_address].address, context->bridge->addresses[context->bridge->cur_address].port, NULL, false);
if(rc > 0 ){ if(rc > 0 ){
if(rc == MOSQ_ERR_TLS){ if(rc == MOSQ_ERR_TLS){
_mosquitto_socket_close(db, context); net__socket_close(db, context);
return rc; /* Error already printed */ return rc; /* Error already printed */
}else if(rc == MOSQ_ERR_ERRNO){ }else if(rc == MOSQ_ERR_ERRNO){
_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", strerror(errno)); log__printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", strerror(errno));
}else if(rc == MOSQ_ERR_EAI){ }else if(rc == MOSQ_ERR_EAI){
_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", gai_strerror(errno)); log__printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", gai_strerror(errno));
} }
return rc; return rc;
@ -241,7 +241,7 @@ int bridge__connect_step2(struct mosquitto_db *db, struct mosquitto *context)
if(rc == MOSQ_ERR_CONN_PENDING){ if(rc == MOSQ_ERR_CONN_PENDING){
context->state = mosq_cs_connect_pending; context->state = mosq_cs_connect_pending;
} }
rc = _mosquitto_send_connect(context, context->keepalive, context->clean_session); rc = send__connect(context, context->keepalive, context->clean_session);
if(rc == MOSQ_ERR_SUCCESS){ if(rc == MOSQ_ERR_SUCCESS){
return MOSQ_ERR_SUCCESS; return MOSQ_ERR_SUCCESS;
}else if(rc == MOSQ_ERR_ERRNO && errno == ENOTCONN){ }else if(rc == MOSQ_ERR_ERRNO && errno == ENOTCONN){
@ -250,11 +250,11 @@ int bridge__connect_step2(struct mosquitto_db *db, struct mosquitto *context)
if(rc == MOSQ_ERR_TLS){ if(rc == MOSQ_ERR_TLS){
return rc; /* Error already printed */ return rc; /* Error already printed */
}else if(rc == MOSQ_ERR_ERRNO){ }else if(rc == MOSQ_ERR_ERRNO){
_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", strerror(errno)); log__printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", strerror(errno));
}else if(rc == MOSQ_ERR_EAI){ }else if(rc == MOSQ_ERR_EAI){
_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", gai_strerror(errno)); log__printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", gai_strerror(errno));
} }
_mosquitto_socket_close(db, context); net__socket_close(db, context);
return rc; return rc;
} }
} }

Write Preview
Loading…
Cancel
Save