From e0e8cc9f3e7c3b3d1e283250725a174ad3670ef7 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Mon, 6 Feb 2017 23:10:43 +0000
Subject: [PATCH] [344] Fix leaks and incorrect connect call.

---
 lib/net_mosq.h |  1 +
 src/bridge.c   | 16 +++++++++++++++-
 src/loop.c     | 36 ++++++++++++++++++++++++------------
 3 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/lib/net_mosq.h b/lib/net_mosq.h
index 569e9452..b504ebc0 100644
--- a/lib/net_mosq.h
+++ b/lib/net_mosq.h
@@ -63,6 +63,7 @@ int _mosquitto_socket_close(struct mosquitto *mosq);
 int _mosquitto_try_connect(struct mosquitto *mosq, const char *host, uint16_t port, mosq_sock_t *sock, const char *bind_address, bool blocking);
 int _mosquitto_try_connect_step1(struct mosquitto *mosq, const char *host);
 int _mosquitto_try_connect_step2(struct mosquitto *mosq, uint16_t port, mosq_sock_t *sock);
+int _mosquitto_socket_connect_step3(struct mosquitto *mosq, const char *host, uint16_t port, const char *bind_address, bool blocking);
 int _mosquitto_socket_nonblock(mosq_sock_t sock);
 int _mosquitto_socketpair(mosq_sock_t *sp1, mosq_sock_t *sp2);
 
diff --git a/src/bridge.c b/src/bridge.c
index e9a3d0ee..5f5eb1b3 100644
--- a/src/bridge.c
+++ b/src/bridge.c
@@ -238,7 +238,21 @@ int mqtt3_bridge_connect_step2(struct mosquitto_db *db, struct mosquitto *contex
 	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);
-	rc = _mosquitto_socket_connect(context, context->bridge->addresses[context->bridge->cur_address].address, context->bridge->addresses[context->bridge->cur_address].port, NULL, false);
+	rc = _mosquitto_try_connect_step2(context, context->bridge->addresses[context->bridge->cur_address].port, &context->sock);
+	if(rc > 0 ){
+		if(rc == MOSQ_ERR_TLS){
+			_mosquitto_socket_close(db, context);
+			return rc; /* Error already printed */
+		}else if(rc == MOSQ_ERR_ERRNO){
+			_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", strerror(errno));
+		}else if(rc == MOSQ_ERR_EAI){
+			_mosquitto_log_printf(NULL, MOSQ_LOG_ERR, "Error creating bridge: %s.", gai_strerror(errno));
+		}
+
+		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);
 	if(rc > 0 ){
 		if(rc == MOSQ_ERR_TLS){
 			_mosquitto_socket_close(db, context);
diff --git a/src/loop.c b/src/loop.c
index d3d5e6a8..a4014f0c 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -250,21 +250,33 @@ int mosquitto_main_loop(struct mosquitto_db *db, mosq_sock_t *listensock, int li
 #ifdef __linux__
 						if(context->adns){
 							/* Waiting on DNS lookup */
-							rc = mqtt3_bridge_connect_step2(db, context);
-							if(rc == MOSQ_ERR_SUCCESS){
-								pollfds[pollfd_index].fd = context->sock;
-								pollfds[pollfd_index].events = POLLIN;
-								pollfds[pollfd_index].revents = 0;
-								if(context->current_out_packet){
-									pollfds[pollfd_index].events |= POLLOUT;
+							rc = gai_error(context->adns);
+							if(rc == EAI_INPROGRESS){
+								/* Just keep on waiting */
+							}else if(rc == 0){
+								rc = mqtt3_bridge_connect_step2(db, context);
+								if(rc == MOSQ_ERR_SUCCESS){
+									pollfds[pollfd_index].fd = context->sock;
+									pollfds[pollfd_index].events = POLLIN;
+									pollfds[pollfd_index].revents = 0;
+									if(context->current_out_packet){
+										pollfds[pollfd_index].events |= POLLOUT;
+									}
+									context->pollfd_index = pollfd_index;
+									pollfd_index++;
+								}else{
+									context->bridge->cur_address++;
+									if(context->bridge->cur_address == context->bridge->address_count){
+										context->bridge->cur_address = 0;
+									}
 								}
-								context->pollfd_index = pollfd_index;
-								pollfd_index++;
 							}else{
-								context->bridge->cur_address++;
-								if(context->bridge->cur_address == context->bridge->address_count){
-									context->bridge->cur_address = 0;
+								/* Need to retry */
+								if(context->adns->ar_result){
+									freeaddrinfo(context->adns->ar_result);
 								}
+								_mosquitto_free(context->adns);
+								context->adns = NULL;
 							}
 						}else{
 							rc = mqtt3_bridge_connect_step1(db, context);