X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=c2c1da968f459d43d0646053a974dec545b195a2;hb=76165488f8201a59e649b4eec02ee31398b3fb92;hp=1686c609f65646da62b98c170e7f59c2660c43b9;hpb=fbf305c09d91bf34b1504b58d50392df2e6bcfba;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index 1686c609..c2c1da96 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -294,7 +294,8 @@ begin:
 	}
 
 	if(!c->outgoing->aip) {
-		freeaddrinfo(c->outgoing->ai);
+		if(c->outgoing->ai)
+			freeaddrinfo(c->outgoing->ai);
 		c->outgoing->ai = NULL;
 		goto begin;
 	}
@@ -349,8 +350,13 @@ begin:
 	return;
 }
 
+void handle_meta_read(struct bufferevent *event, void *data) {
+	logger(LOG_EMERG, _("handle_meta_read() called"));
+	abort();
+}
+
 void handle_meta_write(struct bufferevent *event, void *data) {
-	logger(LOG_EMERG, _("handle_meta_write() called"));
+	ifdebug(META) logger(LOG_DEBUG, _("handle_meta_write() called"));
 }
 
 void handle_meta_connection_error(struct bufferevent *event, short what, void *data) {
@@ -404,7 +410,7 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 
 	event_set(&c->inevent, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
 	event_add(&c->inevent, NULL);
-	c->buffer = bufferevent_new(c->socket, handle_meta_connection_data, handle_meta_write, handle_meta_connection_error, c);
+	c->buffer = bufferevent_new(c->socket, handle_meta_read, handle_meta_write, handle_meta_connection_error, c);
 	if(!c->buffer) {
 		logger(LOG_EMERG, _("bufferevent_new() failed: %s"), strerror(errno));
 		abort();