Use read_host_config() where appropriate.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 97b1e5d..8a63615 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -224,7 +224,7 @@ static void periodic_handler(void *data) {
 
                                if(!found) {
                                        logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
-                                       outgoing_t *outgoing = xmalloc_and_zero(sizeof *outgoing);
+                                       outgoing_t *outgoing = xzalloc(sizeof *outgoing);
                                        outgoing->name = xstrdup(n->name);
                                        list_insert_tail(outgoing_list, outgoing);
                                        setup_outgoing_connection(outgoing);
@@ -287,6 +287,7 @@ void handle_meta_connection_data(connection_t *c) {
        }
 }
 
+#ifndef HAVE_MINGW
 static void sigterm_handler(void *data) {
        logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum));
        event_exit();
@@ -302,9 +303,10 @@ static void sigalrm_handler(void *data) {
        logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum));
        retry();
 }
+#endif
 
 int reload_configuration(void) {
-       char *fname;
+       char *fname = NULL;
 
        /* Reread our own configuration file */
 
@@ -404,7 +406,7 @@ int reload_configuration(void) {
                free(fname);
        }
 
-       last_config_check = time(NULL);
+       last_config_check = now.tv_sec;
 
        return 0;
 }