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

diff --git a/src/net_socket.c b/src/net_socket.c
index 7ef81931..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,6 +350,21 @@ 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) {
+	ifdebug(META) logger(LOG_DEBUG, _("handle_meta_write() called"));
+}
+
+void handle_meta_connection_error(struct bufferevent *event, short what, void *data) {
+	connection_t *c = data;
+	logger(LOG_EMERG, _("handle_meta_connection_error() called: %d: %s"), what, strerror(errno));
+	terminate_connection(c, c->status.active);
+}
+
 void setup_outgoing_connection(outgoing_t *outgoing) {
 	connection_t *c;
 	node_t *n;
@@ -392,12 +408,14 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 
 	do_outgoing_connection(c);
 
-	event_set(&c->ev, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
-	event_set(&c->outev, c->socket, EV_WRITE | EV_PERSIST, flush_meta, c);
-	if(event_add(&c->ev, NULL) < 0) {
-		logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
+	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_read, handle_meta_write, handle_meta_connection_error, c);
+	if(!c->buffer) {
+		logger(LOG_EMERG, _("bufferevent_new() failed: %s"), strerror(errno));
 		abort();
 	}
+	bufferevent_disable(c->buffer, EV_READ);
 }
 
 /*
@@ -435,13 +453,14 @@ void handle_new_meta_connection(int sock, short events, void *data) {
 
 	ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection from %s"), c->hostname);
 
-	event_set(&c->ev, c->socket, EV_READ | EV_PERSIST, handle_meta_connection_data, c);
-	event_set(&c->outev, c->socket, EV_WRITE | EV_PERSIST, flush_meta, c);
-	if(event_add(&c->ev, NULL) < 0) {
-		logger(LOG_ERR, _("event_add failed: %s"), strerror(errno));
-		connection_del(c);
-		return;
+	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, NULL, handle_meta_write, handle_meta_connection_error, c);
+	if(!c->buffer) {
+		logger(LOG_EMERG, _("bufferevent_new() failed: %s"), strerror(errno));
+		abort();
 	}
+	bufferevent_disable(c->buffer, EV_READ);
 		
 	configure_tcp(c);