X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=b82dae805c843c5428beb908424c159d43a0aeaa;hp=8d0a0cf481ce9ca34197526ec68752785e487972;hb=152ef16e5a610a59a7350a9b194c80f156fe084d;hpb=035c8e14f3630424c87be520c1c296a58e67424a diff --git a/src/net.c b/src/net.c index 8d0a0cf4..b82dae80 100644 --- a/src/net.c +++ b/src/net.c @@ -1,7 +1,7 @@ /* net.c -- most of the network code Copyright (C) 1998-2005 Ivo Timmermans, - 2000-2014 Guus Sliepen + 2000-2015 Guus Sliepen 2006 Scott Lamb 2011 Loïc Grenié @@ -41,14 +41,6 @@ #include "subnet.h" #include "xalloc.h" -#ifdef HAVE_ARPA_NAMESER_H -#include -#endif - -#ifdef HAVE_RESOLV_H -#include -#endif - bool do_purge = false; volatile bool running = false; #ifdef HAVE_PSELECT @@ -254,7 +246,7 @@ static void check_dead_connections(void) { if(c->status.active) { if(c->status.pinged) { ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", - c->name, c->hostname, (long)now - c->last_ping_time); + c->name, c->hostname, (long)(now - c->last_ping_time)); c->status.timeout = true; terminate_connection(c, true); } else if(c->last_ping_time + pinginterval <= now) { @@ -283,7 +275,7 @@ static void check_dead_connections(void) { if(c->status.active) { ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) could not flush for %ld seconds (%d bytes remaining)", - c->name, c->hostname, (long)now - c->last_flushed_time, c->outbuflen); + c->name, c->hostname, (long)(now - c->last_flushed_time), c->outbuflen); c->status.timeout = true; terminate_connection(c, true); } @@ -508,9 +500,6 @@ int main_loop(void) { avl_node_t *node; logger(LOG_INFO, "Flushing event queue"); expire_events(); -#if HAVE_DECL_RES_INIT - res_init(); -#endif for(node = connection_tree->head; node; node = node->next) { connection_t *c = node->data; if(c->status.active)