Backport fixes from trunk since revision 1555.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 0b9a132..c2c1da9 100644 (file)
--- 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;
        }
@@ -355,7 +356,7 @@ void handle_meta_read(struct bufferevent *event, void *data) {
 }
 
 void handle_meta_write(struct bufferevent *event, void *data) {
-       logger(LOG_DEBUG, _("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) {