/*
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2011 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2012 Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
+ 2011 Loïc Grenié <loic.grenie@gmail.com>
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
#include "subnet.h"
#include "xalloc.h"
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
+
bool do_purge = false;
volatile bool running = false;
+#ifdef HAVE_PSELECT
+bool graph_dump = false;
+#endif
time_t now = 0;
int contradicting_add_edge = 0;
int contradicting_del_edge = 0;
+static int sleeptime = 10;
/* Purge edges and subnets of unreachable nodes. Use carefully. */
for(snode = n->subnet_tree->head; snode; snode = snext) {
snext = snode->next;
s = snode->data;
- send_del_subnet(broadcast, s);
+ send_del_subnet(everyone, s);
if(!strictsubnets)
subnet_del(n, s);
}
enext = enode->next;
e = enode->data;
if(!tunnelserver)
- send_del_edge(broadcast, e);
+ send_del_edge(everyone, e);
edge_del(e);
}
}
purge();
} else {
FD_SET(c->socket, readset);
- if(c->outbuflen > 0)
+ if(c->outbuflen > 0 || c->status.connecting)
FD_SET(c->socket, writeset);
if(c->socket > max)
max = c->socket;
if(c->edge) {
if(report && !tunnelserver)
- send_del_edge(broadcast, c->edge);
+ send_del_edge(everyone, c->edge);
edge_del(c->edge);
e = lookup_edge(c->node, myself);
if(e) {
if(!tunnelserver)
- send_del_edge(broadcast, e);
+ send_del_edge(everyone, e);
edge_del(e);
}
}
}
+ free_connection_partially(c);
+
/* Check if this was our outgoing connection */
if(c->outgoing) {
- retry_outgoing(c->outgoing);
- c->outgoing = NULL;
+ c->status.remove = false;
+ do_outgoing_connection(c);
}
- free(c->outbuf);
- c->outbuf = NULL;
- c->outbuflen = 0;
- c->outbufsize = 0;
- c->outbufstart = 0;
+#ifndef HAVE_MINGW
+ /* Clean up dead proxy processes */
+
+ while(waitpid(-1, NULL, WNOHANG) > 0);
+#endif
}
/*
next = node->next;
c = node->data;
- if(c->last_ping_time + pingtimeout < now) {
+ 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",
- c->name, c->hostname, 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) {
+ } else if(c->last_ping_time + pinginterval <= now) {
send_ping(c);
}
} else {
}
}
- if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) {
+ 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)",
- c->name, c->hostname, 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);
}
/* check input from kernel */
if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
- if(read_packet(&packet)) {
- errors = 0;
- packet.priority = 0;
- route(myself, &packet);
+ if(devops.read(&packet)) {
+ if(packet.len) {
+ errors = 0;
+ packet.priority = 0;
+ route(myself, &packet);
+ }
} else {
usleep(errors * 50000);
errors++;
if(c->status.remove)
continue;
- if(FD_ISSET(c->socket, readset)) {
+ if(FD_ISSET(c->socket, writeset)) {
if(c->status.connecting) {
c->status.connecting = false;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
}
}
- if(!receive_meta(c)) {
+ if(!flush_meta(c)) {
terminate_connection(c, c->status.active);
continue;
}
}
- if(FD_ISSET(c->socket, writeset)) {
- if(!flush_meta(c)) {
+ if(FD_ISSET(c->socket, readset)) {
+ if(!receive_meta(c)) {
terminate_connection(c, c->status.active);
continue;
}
for(i = 0; i < listen_sockets; i++) {
if(FD_ISSET(listen_socket[i].udp, readset))
- handle_incoming_vpn_data(listen_socket[i].udp);
+ handle_incoming_vpn_data(i);
if(FD_ISSET(listen_socket[i].tcp, readset))
handle_new_meta_connection(listen_socket[i].tcp);
*/
int main_loop(void) {
fd_set readset, writeset;
+#ifdef HAVE_PSELECT
+ struct timespec tv;
+ sigset_t omask, block_mask;
+ time_t next_event;
+#else
struct timeval tv;
+#endif
int r, maxfd;
time_t last_ping_check, last_config_check, last_graph_dump;
event_t *event;
srand(now);
+#ifdef HAVE_PSELECT
+ if(lookup_config(config_tree, "GraphDumpFile"))
+ graph_dump = true;
+ /* Block SIGHUP & SIGALRM */
+ sigemptyset(&block_mask);
+ sigaddset(&block_mask, SIGHUP);
+ sigaddset(&block_mask, SIGALRM);
+ sigprocmask(SIG_BLOCK, &block_mask, &omask);
+#endif
+
running = true;
while(running) {
- now = time(NULL);
-
- // tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
+#ifdef HAVE_PSELECT
+ next_event = last_ping_check + pingtimeout;
+ if(graph_dump && next_event > last_graph_dump + 60)
+ next_event = last_graph_dump + 60;
+
+ if((event = peek_next_event()) && next_event > event->time)
+ next_event = event->time;
+
+ if(next_event <= now)
+ tv.tv_sec = 0;
+ else
+ tv.tv_sec = next_event - now;
+ tv.tv_nsec = 0;
+#else
tv.tv_sec = 1;
tv.tv_usec = 0;
+#endif
maxfd = build_fdset(&readset, &writeset);
#ifdef HAVE_MINGW
LeaveCriticalSection(&mutex);
#endif
+#ifdef HAVE_PSELECT
+ r = pselect(maxfd + 1, &readset, &writeset, NULL, &tv, &omask);
+#else
r = select(maxfd + 1, &readset, &writeset, NULL, &tv);
+#endif
+ now = time(NULL);
#ifdef HAVE_MINGW
EnterCriticalSection(&mutex);
#endif
/* Let's check if everybody is still alive */
- if(last_ping_check + pingtimeout < now) {
+ if(last_ping_check + pingtimeout <= now) {
check_dead_connections();
last_ping_check = now;
/* Should we regenerate our key? */
- if(keyexpires < now) {
+ if(keyexpires <= now) {
avl_node_t *node;
node_t *n;
}
}
- send_key_changed(broadcast, myself);
+ send_key_changed();
keyexpires = now + keylifetime;
}
- if(contradicting_del_edge > 10 && contradicting_add_edge > 10) {
- logger(LOG_WARNING, "Possible node with same Name as us!");
-
- if(rand() % 3 == 0) {
- logger(LOG_ERR, "Shutting down, check configuration of all nodes for duplicate Names!");
- running = false;
- break;
- }
-
- contradicting_add_edge = 0;
- contradicting_del_edge = 0;
+ /* Detect ADD_EDGE/DEL_EDGE storms that are caused when
+ * two tinc daemons with the same name are on the VPN.
+ * If so, sleep a while. If this happens multiple times
+ * in a row, sleep longer. */
+
+ if(contradicting_del_edge > 100 && contradicting_add_edge > 100) {
+ logger(LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime);
+ usleep(sleeptime * 1000000LL);
+ sleeptime *= 2;
+ if(sleeptime < 0)
+ sleeptime = 3600;
+ } else {
+ sleeptime /= 2;
+ if(sleeptime < 10)
+ sleeptime = 10;
}
+
+ contradicting_add_edge = 0;
+ contradicting_del_edge = 0;
}
if(sigalrm) {
avl_node_t *node;
logger(LOG_INFO, "Flushing event queue");
expire_events();
+#ifdef HAVE_DECL_RES_INIT
+ res_init();
+#endif
for(node = connection_tree->head; node; node = node->next) {
connection_t *c = node->data;
- send_ping(c);
+ if(c->status.active)
+ send_ping(c);
}
sigalrm = false;
}
struct stat s;
sighup = false;
+
+ reopenlogger();
/* Reread our own configuration file */
next = node->next;
subnet = node->data;
if(subnet->expires == 1) {
- send_del_subnet(broadcast, subnet);
+ send_del_subnet(everyone, subnet);
if(subnet->owner->status.reachable)
subnet_update(subnet->owner, subnet, false);
subnet_del(subnet->owner, subnet);
} else if(subnet->expires == -1) {
subnet->expires = 0;
} else {
- send_add_subnet(broadcast, subnet);
+ send_add_subnet(everyone, subnet);
if(subnet->owner->status.reachable)
subnet_update(subnet->owner, subnet, true);
}
/* Dump graph if wanted every 60 seconds*/
- if(last_graph_dump + 60 < now) {
+ if(last_graph_dump + 60 <= now) {
dump_graph();
last_graph_dump = now;
}
}
+#ifdef HAVE_PSELECT
+ /* Restore SIGHUP & SIGALARM mask */
+ sigprocmask(SIG_SETMASK, &omask, NULL);
+#endif
+
return 0;
}
projects / oweals / tinc.git / blobdiff