Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 9d20fd577e5116ec13946372172281c95f68cbf2..f0e1cdfe948bdf1a75524c8c477a287b1a441b6c 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -143,7 +143,7 @@ static void keyexpire_handler(int fd, short events, void *data) {
        regenerate_key();
 }
 
-void regenerate_key() {
+void regenerate_key(void) {
        if(timeout_initialized(&keyexpire_event)) {
                ifdebug(STATUS) logger(LOG_INFO, "Expiring symmetric keys");
                event_del(&keyexpire_event);
@@ -608,7 +608,7 @@ void close_network_connections(void) {
        for(node = connection_tree->head; node; node = next) {
                next = node->next;
                c = node->data;
-               c->outgoing = false;
+               c->outgoing = NULL;
                terminate_connection(c, false);
        }