X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet.c;h=d2eacf356c14efec800e16a0ab26633add271d2e;hb=c83c2d080f21b12db42ef664d7c3272b8b700656;hp=97b1e5dfcb3487d63efcb57869baf3f9d919b2ed;hpb=053af97c9e729ab485609e4202f5195fdc8aeeb5;p=tinc diff --git a/src/net.c b/src/net.c index 97b1e5df..d2eacf35 100644 --- 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,6 +303,7 @@ 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; @@ -404,7 +406,7 @@ int reload_configuration(void) { free(fname); } - last_config_check = time(NULL); + last_config_check = now.tv_sec; return 0; }