X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;h=40120962312de31420813f864ad5352e768e2fcf;hb=d772289f6d6adfb8932658b533349d43f08ec326;hp=6093f0e028ffa2118011e1dea5daeaa39640dc96;hpb=cdb793f687262b9f56823ca9046523a609a758af;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index 6093f0e0..40120962 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -449,7 +449,7 @@ begin:
 	return;
 }
 
-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;
@@ -462,11 +462,11 @@ void handle_meta_write(int sock, short events, void *data) {
 	}
 
 	buffer_read(&c->outbuf, outlen);
-	if(!c->outbuf.len)
+	if(!c->outbuf.len && event_initialized(&c->outevent))
 		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);
@@ -476,7 +476,8 @@ void setup_outgoing_connection(outgoing_t *outgoing) {
 	connection_t *c;
 	node_t *n;
 
-	event_del(&outgoing->ev);
+	if(event_initialized(&outgoing->ev))
+		event_del(&outgoing->ev);
 
 	n = lookup_node(outgoing->name);
 
@@ -563,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);