X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=9669bc971972488e80ba69391b3841da952f13dc;hb=373b0c12d9d0e8a3b449fd18be704e28dd6403e1;hp=7efe7fa3f86cfe39739be804bd0e347f53917542;hpb=6debc6c79ba385d35f646e0958f84ace5b8f4b4d;p=tinc diff --git a/src/net.c b/src/net.c index 7efe7fa3..9669bc97 100644 --- a/src/net.c +++ b/src/net.c @@ -160,7 +160,7 @@ void terminate_connection(connection_t *c, bool report) { do_outgoing_connection(outgoing); } -#ifndef HAVE_MINGW +#ifndef HAVE_WINDOWS /* Clean up dead proxy processes */ while(waitpid(-1, NULL, WNOHANG) > 0); @@ -269,9 +269,7 @@ static void periodic_handler(void *data) { if(contradicting_del_edge > 100 && contradicting_add_edge > 100) { logger(DEBUG_ALWAYS, LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime); - nanosleep(&(struct timespec) { - sleeptime, 0 - }, NULL); + sleep_millis(sleeptime * 1000); sleeptime *= 2; if(sleeptime < 0) { @@ -310,7 +308,7 @@ void handle_meta_connection_data(connection_t *c) { } } -#ifndef HAVE_MINGW +#ifndef HAVE_WINDOWS static void sigterm_handler(void *data) { logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum)); event_exit(); @@ -489,7 +487,7 @@ int main_loop(void) { 0, 0 }); -#ifndef HAVE_MINGW +#ifndef HAVE_WINDOWS signal_t sighup = {0}; signal_t sigterm = {0}; signal_t sigquit = {0}; @@ -508,7 +506,7 @@ int main_loop(void) { return 1; } -#ifndef HAVE_MINGW +#ifndef HAVE_WINDOWS signal_del(&sighup); signal_del(&sigterm); signal_del(&sigquit);