X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=f24d18ad81db06d713b329a95180741b2d33c0fa;hp=0b617bd08ac3bffaf420c570eb56de7563607f26;hb=b1945f70fe993ca447555a1e27f35638b0c1fd8b;hpb=5dde6461a321ee47b06e33f8203f2acf00a31a51 diff --git a/src/net.c b/src/net.c index 0b617bd0..f24d18ad 100644 --- a/src/net.c +++ b/src/net.c @@ -2,6 +2,7 @@ net.c -- most of the network code Copyright (C) 1998-2005 Ivo Timmermans, 2000-2009 Guus Sliepen + 2006 Scott Lamb This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -52,9 +53,7 @@ static void purge(void) { edge_t *e; subnet_t *s; - cp(); - - ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes")); + ifdebug(PROTOCOL) logger(LOG_DEBUG, "Purging unreachable nodes"); /* Remove all edges and subnets owned by unreachable nodes. */ @@ -63,7 +62,7 @@ static void purge(void) { n = nnode->data; if(!n->status.reachable) { - ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name, + ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Purging node %s (%s)", n->name, n->hostname); for(snode = n->subnet_tree->head; snode; snode = snext) { @@ -114,8 +113,6 @@ static int build_fdset(fd_set *readset, fd_set *writeset) { connection_t *c; int i, max = 0; - cp(); - FD_ZERO(readset); FD_ZERO(writeset); @@ -161,12 +158,10 @@ static int build_fdset(fd_set *readset, fd_set *writeset) { - Deactivate the host */ void terminate_connection(connection_t *c, bool report) { - cp(); - if(c->status.remove) return; - ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"), + ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Closing connection with %s (%s)", c->name, c->hostname); c->status.remove = true; @@ -227,8 +222,6 @@ static void check_dead_connections(void) { avl_node_t *node, *next; connection_t *c; - cp(); - for(node = connection_tree->head; node; node = next) { next = node->next; c = node->data; @@ -236,7 +229,7 @@ static void check_dead_connections(void) { if(c->last_ping_time + pingtimeout < now) { if(c->status.active) { if(c->status.pinged) { - ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING in %ld seconds"), + ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", c->name, c->hostname, now - c->last_ping_time); c->status.timeout = true; terminate_connection(c, true); @@ -245,12 +238,12 @@ static void check_dead_connections(void) { } } else { if(c->status.remove) { - logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."), + logger(LOG_WARNING, "Old connection_t for %s (%s) status %04x still lingering, deleting...", c->name, c->hostname, bitfield_to_int(&c->status, sizeof c->status)); connection_del(c); continue; } - ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"), + ifdebug(CONNECTIONS) logger(LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname); if(c->status.connecting) { c->status.connecting = false; @@ -265,7 +258,7 @@ static void check_dead_connections(void) { if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) { if(c->status.active) { ifdebug(CONNECTIONS) logger(LOG_INFO, - _("%s (%s) could not flush for %ld seconds (%d bytes remaining)"), + "%s (%s) could not flush for %ld seconds (%d bytes remaining)", c->name, c->hostname, now - c->last_flushed_time, c->outbuflen); c->status.timeout = true; terminate_connection(c, true); @@ -285,8 +278,6 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) { socklen_t len = sizeof(result); vpn_packet_t packet; - cp(); - /* check input from kernel */ if(device_fd >= 0 && FD_ISSET(device_fd, readset)) { if(read_packet(&packet)) { @@ -311,8 +302,8 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) { finish_connecting(c); else { ifdebug(CONNECTIONS) logger(LOG_DEBUG, - _("Error while connecting to %s (%s): %s"), - c->name, c->hostname, strerror(result)); + "Error while connecting to %s (%s): %s", + c->name, c->hostname, sockstrerror(result)); closesocket(c->socket); do_outgoing_connection(c); continue; @@ -352,8 +343,6 @@ int main_loop(void) { time_t last_ping_check, last_config_check, last_graph_dump; event_t *event; - cp(); - last_ping_check = now; last_config_check = now; last_graph_dump = now; @@ -380,18 +369,15 @@ int main_loop(void) { #endif if(r < 0) { - if(errno != EINTR && errno != EAGAIN) { - logger(LOG_ERR, _("Error while waiting for input: %s"), - strerror(errno)); - cp_trace(); + if(!sockwouldblock(sockerrno)) { + logger(LOG_ERR, "Error while waiting for input: %s", sockstrerror(sockerrno)); dump_connections(); return 1; } - - continue; } - check_network_activity(&readset, &writeset); + if(r > 0) + check_network_activity(&readset, &writeset); if(do_purge) { purge(); @@ -415,7 +401,7 @@ int main_loop(void) { avl_node_t *node; node_t *n; - ifdebug(STATUS) logger(LOG_INFO, _("Expiring symmetric keys")); + ifdebug(STATUS) logger(LOG_INFO, "Expiring symmetric keys"); for(node = node_tree->head; node; node = node->next) { n = node->data; @@ -431,8 +417,13 @@ int main_loop(void) { } if(sigalrm) { - logger(LOG_INFO, _("Flushing event queue")); + avl_node_t *node; + logger(LOG_INFO, "Flushing event queue"); expire_events(); + for(node = connection_tree->head; node; node = node->next) { + connection_t *c = node->data; + send_ping(c); + } sigalrm = false; } @@ -443,7 +434,7 @@ int main_loop(void) { if(sighup) { connection_t *c; - avl_node_t *node; + avl_node_t *node, *next; char *fname; struct stat s; @@ -455,10 +446,35 @@ int main_loop(void) { init_configuration(&config_tree); if(!read_server_config()) { - logger(LOG_ERR, _("Unable to reread configuration file, exitting.")); + logger(LOG_ERR, "Unable to reread configuration file, exitting."); return 1; } + /* Cancel non-active outgoing connections */ + + for(node = connection_tree->head; node; node = next) { + next = node->next; + c = node->data; + + c->outgoing = NULL; + + if(c->status.connecting) { + terminate_connection(c, false); + connection_del(c); + } + } + + /* Wipe list of outgoing connections */ + + for(list_node_t *node = outgoing_list->head; node; node = node->next) { + outgoing_t *outgoing = node->data; + + if(outgoing->event) + event_del(outgoing->event); + } + + list_delete_list(outgoing_list); + /* Close connections to hosts that have a changed or deleted host config file */ for(node = connection_tree->head; node; node = node->next) {