X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=97a80584769d7773c97c58c3ab319fe2387c1443;hb=04de15984f1479d0142bdfa5bd968274aea2209e;hp=163553ad3de22374e4c13ea287438f98efe28f71;hpb=8ddcad5fa1908727f68abb461b615c666616064f;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index 163553ad..97a80584 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -137,9 +137,9 @@ static bool bind_to_address(connection_t *c) {
 	status = getaddrinfo(node, /* service = */ NULL,
 			&ai_hints, &ai_list);
 	if(status) {
-		free(node);
 		logger(LOG_WARNING, "Error looking up %s port %s: %s",
 				node, "any", gai_strerror(status));
+		free(node);
 		return false;
 	}
 	assert(ai_list != NULL);
@@ -350,7 +350,7 @@ void finish_connecting(connection_t *c) {
 	send_id(c);
 }
 
-void do_outgoing_connection(connection_t *c) {
+bool do_outgoing_connection(connection_t *c) {
 	char *address, *port, *space;
 	int result;
 
@@ -367,7 +367,7 @@ begin:
 			retry_outgoing(c->outgoing);
 			c->outgoing = NULL;
 			connection_del(c);
-			return;
+			return false;
 		}
 
 		get_config_string(c->outgoing->cfg, &address);
@@ -434,7 +434,7 @@ begin:
 	if(result == -1) {
 		if(sockinprogress(sockerrno)) {
 			c->status.connecting = true;
-			return;
+			return true;
 		}
 
 		closesocket(c->socket);
@@ -446,10 +446,10 @@ begin:
 
 	finish_connecting(c);
 
-	return;
+	return true;
 }
 
-void handle_meta_write(int sock, short events, void *data) {
+static void handle_meta_write(int sock, short events, void *data) {
 	ifdebug(META) logger(LOG_DEBUG, "handle_meta_write() called");
 
 	connection_t *c = data;
@@ -466,7 +466,7 @@ void handle_meta_write(int sock, short events, void *data) {
 		event_del(&c->outevent);
 }
 
-void handle_meta_connection_error(struct bufferevent *event, short what, void *data) {
+static void handle_meta_connection_error(struct bufferevent *event, short what, void *data) {
 	connection_t *c = data;
 	logger(LOG_ERR, "handle_meta_connection_error() called: %d: %s", what, strerror(errno));
 	terminate_connection(c, c->status.active);
@@ -512,11 +512,11 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 
 	connection_add(c);
 
-	do_outgoing_connection(c);
-
-	event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
-	event_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, c);
-	event_add(&c->inevent, NULL);
+	if (do_outgoing_connection(c)) {
+		event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
+		event_set(&c->outevent, c->socket, EV_WRITE | EV_PERSIST, handle_meta_write, c);
+		event_add(&c->inevent, NULL);
+	}
 }
 
 /*
@@ -564,7 +564,7 @@ void handle_new_meta_connection(int sock, short events, void *data) {
 	send_id(c);
 }
 
-void free_outgoing(outgoing_t *outgoing) {
+static void free_outgoing(outgoing_t *outgoing) {
 	if(outgoing->ai)
 		freeaddrinfo(outgoing->ai);