/*
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2010 Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
This program is free software; you can redistribute it and/or modify
#include "system.h"
-#include <openssl/rand.h>
-
#include "utils.h"
#include "splay_tree.h"
#include "conf.h"
#include "subnet.h"
#include "xalloc.h"
+int contradicting_add_edge = 0;
+int contradicting_del_edge = 0;
+
/* Purge edges and subnets of unreachable nodes. Use carefully. */
void purge(void) {
for(snode = n->subnet_tree->head; snode; snode = snext) {
snext = snode->next;
s = snode->data;
- if(!tunnelserver)
- send_del_subnet(broadcast, s);
- subnet_del(n, s);
+ send_del_subnet(broadcast, s);
+ if(!strictsubnets)
+ subnet_del(n, s);
}
for(enode = n->edge_tree->head; enode; enode = enext) {
break;
}
- if(!enode)
+ if(!enode && (!strictsubnets || !n->subnet_tree->head))
+ /* in strictsubnets mode do not delete nodes with subnets */
node_del(n);
}
}
end does not reply in time, we consider them dead
and close the connection.
*/
-static void timeout_handler(int fd, short events, void *event) {
+static void timeout_handler(void *arg) {
+ event_t *event = arg;
splay_node_t *node, *next;
connection_t *c;
time_t now = time(NULL);
}
}
- event_add(event, &(struct timeval){pingtimeout, 0});
+ if(contradicting_del_edge && contradicting_add_edge) {
+ 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!");
+ abort();
+ return;
+ }
+
+ contradicting_add_edge = 0;
+ contradicting_del_edge = 0;
+ }
+
+ event->time = now + pingtimeout;
+ event_add(event);
}
-void handle_meta_connection_data(int fd, short events, void *data) {
+void handle_meta_connection_data(void *data) {
connection_t *c = data;
int result;
socklen_t len = sizeof result;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
- if(!result)
+ if(!result) {
+ mutex_lock(&mutex);
finish_connecting(c);
- else {
+ mutex_unlock(&mutex);
+ } else {
ifdebug(CONNECTIONS) logger(LOG_DEBUG,
"Error while connecting to %s (%s): %s",
c->name, c->hostname, sockstrerror(result));
closesocket(c->socket);
+ mutex_lock(&mutex);
do_outgoing_connection(c);
+ mutex_unlock(&mutex);
return;
}
}
- if (!receive_meta(c)) {
- terminate_connection(c, c->status.active);
- return;
+ while(true) {
+ if (!receive_meta(c)) {
+ terminate_connection(c, c->status.active);
+ break;
+ }
}
}
static void sigterm_handler(int signal, short events, void *data) {
logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
- event_loopexit(NULL);
+ exit(0);
}
static void sighup_handler(int signal, short events, void *data) {
if(!read_server_config()) {
logger(LOG_ERR, "Unable to reread configuration file, exitting.");
- event_loopexit(NULL);
+ abort();
return EINVAL;
}
last_config_check = time(NULL);
+ /* If StrictSubnet is set, expire deleted Subnets and read new ones in */
+
+ if(strictsubnets) {
+ subnet_t *subnet;
+
+
+ for(node = subnet_tree->head; node; node = node->next) {
+ subnet = node->data;
+ subnet->expires = 1;
+ }
+
+ load_all_subnets();
+
+ for(node = subnet_tree->head; node; node = next) {
+ next = node->next;
+ subnet = node->data;
+ if(subnet->expires == 1) {
+ send_del_subnet(broadcast, 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);
+ if(subnet->owner->status.reachable)
+ subnet_update(subnet->owner, subnet, true);
+ }
+ }
+ }
+
/* Try to make outgoing connections */
try_outgoing_connections();
c = node->data;
if(c->outgoing && !c->node) {
- if(timeout_initialized(&c->outgoing->ev))
- event_del(&c->outgoing->ev);
+ event_del(&c->outgoing->ev);
if(c->status.connecting)
close(c->socket);
c->outgoing->timeout = 0;
*/
int main_loop(void) {
struct event timeout_event;
- struct event sighup_event;
- struct event sigterm_event;
- struct event sigquit_event;
- timeout_set(&timeout_event, timeout_handler, &timeout_event);
- event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
+ timeout_event.time = time(NULL) + pingtimeout;
+ timeout_event.handler = timeout_handler;
+ timeout_event.data = &timeout_event;
+
+ event_add(&timeout_event);
#ifdef SIGHUP
- signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
- signal_add(&sighup_event, NULL);
+ signal(SIGHUP, sighup_handler);
#endif
#ifdef SIGTERM
- signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL);
- signal_add(&sigterm_event, NULL);
+ signal(SIGTERM, sigterm_handler);
#endif
#ifdef SIGQUIT
- signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL);
- signal_add(&sigquit_event, NULL);
+ signal(SIGQUIT, sigterm_handler);
#endif
- if(event_loop(0) < 0) {
- logger(LOG_ERR, "Error while waiting for input: %s", strerror(errno));
- return 1;
+ while(true) {
+ mutex_unlock(&mutex);
+ usleep(1000000);
+ mutex_lock(&mutex);
+
+ struct event *event;
+ while((event = get_expired_event())) {
+ event->handler(event->data);
+ }
}
- signal_del(&sighup_event);
- signal_del(&sigterm_event);
- signal_del(&sigquit_event);
event_del(&timeout_event);
return 0;
projects / tinc / blobdiff