/*
net.c -- most of the network code
- Copyright (C) 1998-2001 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2000,2001 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1998-2005 Ivo Timmermans,
+ 2000-2011 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
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id: net.c,v 1.35.4.145 2001/10/31 20:22:52 guus Exp $
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#ifdef HAVE_LINUX
- #include <netinet/ip.h>
- #include <netinet/tcp.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/signal.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <syslog.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-/* SunOS really wants sys/socket.h BEFORE net/if.h,
- and FreeBSD wants these lines below the rest. */
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <net/if.h>
+#include "system.h"
#include <openssl/rand.h>
-#include <openssl/evp.h>
-#include <openssl/pem.h>
-
-#ifndef HAVE_RAND_PSEUDO_BYTES
-#define RAND_pseudo_bytes RAND_bytes
-#endif
-
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
-#include <list.h>
+#include "utils.h"
+#include "avl_tree.h"
#include "conf.h"
#include "connection.h"
+#include "device.h"
+#include "event.h"
+#include "graph.h"
+#include "logger.h"
#include "meta.h"
#include "net.h"
#include "netutl.h"
#include "process.h"
#include "protocol.h"
-#include "subnet.h"
-#include "process.h"
#include "route.h"
-#include "device.h"
-
-#include "system.h"
-
-int maxtimeout = 900;
-int seconds_till_retry = 5;
-
-int tcp_socket = -1;
-int udp_socket = -1;
-
-int keylifetime = 0;
-int keyexpires = 0;
-
-int do_prune = 0;
-
-/* VPN packet I/O */
+#include "subnet.h"
+#include "xalloc.h"
-void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
-{
- vpn_packet_t outpkt;
- int outlen, outpad;
- EVP_CIPHER_CTX ctx;
-cp
- /* Decrypt the packet */
+bool do_purge = false;
+volatile bool running = false;
+#ifdef HAVE_PSELECT
+bool graph_dump = false;
+#endif
- EVP_DecryptInit(&ctx, myself->cipher, myself->key, myself->key + myself->cipher->key_len);
- EVP_DecryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len);
- EVP_DecryptFinal(&ctx, outpkt.salt + outlen, &outpad);
- outlen += outpad;
- outpkt.len = outlen - sizeof(outpkt.salt);
+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. */
+
+static void purge(void) {
+ avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
+ node_t *n;
+ edge_t *e;
+ subnet_t *s;
+
+ ifdebug(PROTOCOL) logger(LOG_DEBUG, "Purging unreachable nodes");
+
+ /* Remove all edges and subnets owned by unreachable nodes. */
+
+ for(nnode = node_tree->head; nnode; nnode = nnext) {
+ nnext = nnode->next;
+ n = nnode->data;
+
+ if(!n->status.reachable) {
+ ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Purging node %s (%s)", n->name,
+ n->hostname);
+
+ for(snode = n->subnet_tree->head; snode; snode = snext) {
+ snext = snode->next;
+ s = snode->data;
+ send_del_subnet(everyone, s);
+ if(!strictsubnets)
+ subnet_del(n, s);
+ }
+
+ for(enode = n->edge_tree->head; enode; enode = enext) {
+ enext = enode->next;
+ e = enode->data;
+ if(!tunnelserver)
+ send_del_edge(everyone, e);
+ edge_del(e);
+ }
+ }
+ }
- receive_packet(n, &outpkt);
-cp
-}
+ /* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */
-void receive_tcppacket(connection_t *c, char *buffer, int len)
-{
- vpn_packet_t outpkt;
-cp
- outpkt.len = len;
- memcpy(outpkt.data, buffer, len);
+ for(nnode = node_tree->head; nnode; nnode = nnext) {
+ nnext = nnode->next;
+ n = nnode->data;
- receive_packet(c->node, &outpkt);
-cp
-}
+ if(!n->status.reachable) {
+ for(enode = edge_weight_tree->head; enode; enode = enext) {
+ enext = enode->next;
+ e = enode->data;
-void receive_packet(node_t *n, vpn_packet_t *packet)
-{
-cp
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"), packet->len, n->name, n->hostname);
+ if(e->to == n)
+ break;
+ }
- route_incoming(n, packet);
-cp
-}
-
-void send_udppacket(node_t *n, vpn_packet_t *inpkt)
-{
- vpn_packet_t outpkt;
- int outlen, outpad;
- EVP_CIPHER_CTX ctx;
- struct sockaddr_in to;
- socklen_t tolen = sizeof(to);
- vpn_packet_t *copy;
-cp
- if(!n->status.validkey)
- {
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_INFO, _("No valid key known yet for %s (%s), queueing packet"),
- n->name, n->hostname);
-
- /* Since packet is on the stack of handle_tap_input(),
- we have to make a copy of it first. */
-
- copy = xmalloc(sizeof(vpn_packet_t));
- memcpy(copy, inpkt, sizeof(vpn_packet_t));
-
- list_insert_tail(n->queue, copy);
-
- if(!n->status.waitingforkey)
- send_req_key(n->nexthop->connection, myself, n);
- return;
- }
-
- /* Encrypt the packet. */
-
- RAND_pseudo_bytes(inpkt->salt, sizeof(inpkt->salt));
-
- EVP_EncryptInit(&ctx, n->cipher, n->key, n->key + n->cipher->key_len);
- EVP_EncryptUpdate(&ctx, outpkt.salt, &outlen, inpkt->salt, inpkt->len + sizeof(inpkt->salt));
- EVP_EncryptFinal(&ctx, outpkt.salt + outlen, &outpad);
- outlen += outpad;
-
- to.sin_family = AF_INET;
- to.sin_addr.s_addr = htonl(n->address);
- to.sin_port = htons(n->port);
-
- if((sendto(udp_socket, (char *) outpkt.salt, outlen, 0, (const struct sockaddr *)&to, tolen)) < 0)
- {
- syslog(LOG_ERR, _("Error sending packet to %s (%s): %m"),
- n->name, n->hostname);
- return;
- }
-cp
+ if(!enode && (!strictsubnets || !n->subnet_tree->head))
+ /* in strictsubnets mode do not delete nodes with subnets */
+ node_del(n);
+ }
+ }
}
/*
- send a packet to the given vpn ip.
+ put all file descriptors in an fd_set array
+ While we're at it, purge stuff that needs to be removed.
*/
-void send_packet(node_t *n, vpn_packet_t *packet)
-{
-cp
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
- packet->len, n->name, n->hostname);
-
- if(n == myself)
- {
- if(debug_lvl >= DEBUG_TRAFFIC)
- {
- syslog(LOG_NOTICE, _("Packet is looping back to us!"));
- }
-
- return;
- }
-
- if(n->via != n && debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_ERR, _("Sending packet to %s via %s (%s)"),
- n->name, n->via->name, n->via->hostname);
-
- if((myself->options | n->via->options) & OPTION_TCPONLY)
- {
- if(send_tcppacket(n->via->connection, packet))
- terminate_connection(n->via->connection, 1);
- }
- else
- send_udppacket(n->via, packet);
-}
-
-/* Broadcast a packet to all active direct connections */
-
-void broadcast_packet(node_t *from, vpn_packet_t *packet)
-{
- avl_node_t *node;
- connection_t *c;
-cp
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"),
- packet->len, from->name, from->hostname);
-
- for(node = connection_tree->head; node; node = node->next)
- {
- c = (connection_t *)node->data;
- if(c->status.active && c != from->nexthop->connection)
- send_packet(c->node, packet);
- }
-cp
-}
-
-void flush_queue(node_t *n)
-{
- list_node_t *node, *next;
-cp
- if(debug_lvl >= DEBUG_TRAFFIC)
- syslog(LOG_INFO, _("Flushing queue for %s (%s)"), n->name, n->hostname);
-
- for(node = n->queue->head; node; node = next)
- {
- next = node->next;
- send_udppacket(n, (vpn_packet_t *)node->data);
- list_delete_node(n->queue, node);
- }
-cp
-}
-
-/* Setup sockets */
-
-int setup_listen_socket(int port)
-{
- int nfd, flags;
- struct sockaddr_in a;
- int option;
- char *interface;
- char *address;
- ip_mask_t *ipmask;
-cp
- if((nfd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0)
- {
- syslog(LOG_ERR, _("Creating metasocket failed: %m"));
- return -1;
- }
-
- flags = fcntl(nfd, F_GETFL);
- if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
- {
- close(nfd);
- syslog(LOG_ERR, _("System call `%s' failed: %m"),
- "fcntl");
- return -1;
- }
-
- /* Optimize TCP settings */
-
- option = 1;
- setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option));
- setsockopt(nfd, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
-#ifdef HAVE_LINUX
- setsockopt(nfd, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
-
- option = IPTOS_LOWDELAY;
- setsockopt(nfd, SOL_IP, IP_TOS, &option, sizeof(option));
-
- if(get_config_string(lookup_config(config_tree, "BindToInterface"), &interface))
- if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, interface, strlen(interface)))
- {
- close(nfd);
- syslog(LOG_ERR, _("Can't bind to interface %s: %m"), interface);
- return -1;
- }
-#endif
+static int build_fdset(fd_set *readset, fd_set *writeset) {
+ avl_node_t *node, *next;
+ connection_t *c;
+ int i, max = 0;
+
+ FD_ZERO(readset);
+ FD_ZERO(writeset);
+
+ for(node = connection_tree->head; node; node = next) {
+ next = node->next;
+ c = node->data;
+
+ if(c->status.remove) {
+ connection_del(c);
+ if(!connection_tree->head)
+ purge();
+ } else {
+ FD_SET(c->socket, readset);
+ if(c->outbuflen > 0)
+ FD_SET(c->socket, writeset);
+ if(c->socket > max)
+ max = c->socket;
+ }
+ }
- memset(&a, 0, sizeof(a));
- a.sin_family = AF_INET;
- a.sin_addr.s_addr = htonl(INADDR_ANY);
- a.sin_port = htons(port);
-
- if(get_config_string(lookup_config(config_tree, "BindToAddress"), &address))
- {
- ipmask = strtoip(address);
- if(ipmask)
- {
- a.sin_addr.s_addr = htonl(ipmask->address);
- free(ipmask);
- }
- }
-
- if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
- {
- close(nfd);
- syslog(LOG_ERR, _("Can't bind to port %hd/tcp: %m"), port);
- return -1;
- }
-
- if(listen(nfd, 3))
- {
- close(nfd);
- syslog(LOG_ERR, _("System call `%s' failed: %m"),
- "listen");
- return -1;
- }
-cp
- return nfd;
-}
+ for(i = 0; i < listen_sockets; i++) {
+ FD_SET(listen_socket[i].tcp, readset);
+ if(listen_socket[i].tcp > max)
+ max = listen_socket[i].tcp;
+ FD_SET(listen_socket[i].udp, readset);
+ if(listen_socket[i].udp > max)
+ max = listen_socket[i].udp;
+ }
-int setup_vpn_in_socket(int port)
-{
- int nfd, flags;
- struct sockaddr_in a;
- const int one = 1;
-cp
- if((nfd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
- {
- close(nfd);
- syslog(LOG_ERR, _("Creating socket failed: %m"));
- return -1;
- }
-
- setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
-
- flags = fcntl(nfd, F_GETFL);
- if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0)
- {
- close(nfd);
- syslog(LOG_ERR, _("System call `%s' failed: %m"),
- "fcntl");
- return -1;
- }
-
- memset(&a, 0, sizeof(a));
- a.sin_family = AF_INET;
- a.sin_port = htons(port);
- a.sin_addr.s_addr = htonl(INADDR_ANY);
-
- if(bind(nfd, (struct sockaddr *)&a, sizeof(struct sockaddr)))
- {
- close(nfd);
- syslog(LOG_ERR, _("Can't bind to port %hd/udp: %m"), port);
- return -1;
- }
-cp
- return nfd;
+ if(device_fd >= 0)
+ FD_SET(device_fd, readset);
+ if(device_fd > max)
+ max = device_fd;
+
+ return max;
}
-int setup_outgoing_socket(connection_t *c)
-{
- int flags;
- struct sockaddr_in a;
-cp
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, c->hostname);
-
- c->socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-
- if(c->socket == -1)
- {
- syslog(LOG_ERR, _("Creating socket for %s port %d failed: %m"),
- c->hostname, c->port);
- return -1;
- }
-
- /* Bind first to get a fix on our source port???
-
- a.sin_family = AF_INET;
- a.sin_port = htons(0);
- a.sin_addr.s_addr = htonl(INADDR_ANY);
-
- if(bind(c->socket, (struct sockaddr *)&a, sizeof(struct sockaddr)))
- {
- close(c->socket);
- syslog(LOG_ERR, _("System call `%s' failed: %m"), "bind");
- return -1;
- }
-
- */
-
- /* Optimize TCP settings?
-
- option = 1;
- setsockopt(c->socket, SOL_SOCKET, SO_KEEPALIVE, &option, sizeof(option));
-#ifdef HAVE_LINUX
- setsockopt(c->socket, SOL_TCP, TCP_NODELAY, &option, sizeof(option));
-
- option = IPTOS_LOWDELAY;
- setsockopt(c->socket, SOL_IP, IP_TOS, &option, sizeof(option));
-#endif
-
- */
-
- /* Connect */
-
- a.sin_family = AF_INET;
- a.sin_port = htons(c->port);
- a.sin_addr.s_addr = htonl(c->address);
-
- if(connect(c->socket, (struct sockaddr *)&a, sizeof(a)) == -1)
- {
- close(c->socket);
- syslog(LOG_ERR, _("%s port %hd: %m"), c->hostname, c->port);
- return -1;
- }
-
- flags = fcntl(c->socket, F_GETFL);
+/*
+ Terminate a connection:
+ - Close the socket
+ - Remove associated edge and tell other connections about it if report = true
+ - Check if we need to retry making an outgoing connection
+ - Deactivate the host
+*/
+void terminate_connection(connection_t *c, bool report) {
+ if(c->status.remove)
+ return;
- if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0)
- {
- close(c->socket);
- syslog(LOG_ERR, _("fcntl for %s port %d: %m"),
- c->hostname, c->port);
- return -1;
- }
+ ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Closing connection with %s (%s)",
+ c->name, c->hostname);
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_INFO, _("Connected to %s port %hd"),
- c->hostname, c->port);
-cp
- return 0;
-}
+ c->status.remove = true;
+ c->status.active = false;
-int setup_outgoing_connection(char *name)
-{
- connection_t *c;
- node_t *n;
- struct hostent *h;
-cp
- n = lookup_node(name);
-
- if(n)
- if(n->connection)
- {
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_INFO, _("Already connected to %s"), name);
- return 0;
- }
-
- c = new_connection();
- c->name = xstrdup(name);
-
- init_configuration(&c->config_tree);
- read_connection_config(c);
-
- if(!get_config_string(lookup_config(c->config_tree, "Address"), &c->hostname))
- {
- syslog(LOG_ERR, _("No address specified for %s"), c->name);
- free_connection(c);
- return -1;
- }
-
- if(!get_config_port(lookup_config(c->config_tree, "Port"), &c->port))
- {
- syslog(LOG_ERR, _("No port specified for %s"), c->name);
- free_connection(c);
- return -1;
- }
-
- if(!(h = gethostbyname(c->hostname)))
- {
- syslog(LOG_ERR, _("Error looking up `%s': %m"), c->hostname);
- free_connection(c);
- return -1;
- }
-
- c->address = ntohl(*((ipv4_t*)(h->h_addr_list[0])));
- c->hostname = hostlookup(htonl(c->address));
-
- if(setup_outgoing_socket(c) < 0)
- {
- syslog(LOG_ERR, _("Could not set up a meta connection to %s (%s)"),
- c->name, c->hostname);
- free_connection(c);
- return -1;
- }
-
- c->status.outgoing = 1;
- c->last_ping_time = time(NULL);
-
- connection_add(c);
-
- send_id(c);
-cp
- return 0;
-}
+ if(c->node)
+ c->node->connection = NULL;
-int read_rsa_public_key(connection_t *c)
-{
- FILE *fp;
- char *fname;
- char *key;
- void *result;
-cp
- if(!c->rsa_key)
- c->rsa_key = RSA_new();
-
- /* First, check for simple PublicKey statement */
-
- if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &key))
- {
- BN_hex2bn(&c->rsa_key->n, key);
- BN_hex2bn(&c->rsa_key->e, "FFFF");
- return 0;
- }
-
- /* Else, check for PublicKeyFile statement and read it */
-
- if(get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
- {
- if(is_safe_path(fname))
- {
- if((fp = fopen(fname, "r")) == NULL)
- {
- syslog(LOG_ERR, _("Error reading RSA public key file `%s': %m"),
- fname);
- return -1;
- }
- result = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
- fclose(fp);
- if(!result)
- {
- syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %m"),
- fname);
- return -1;
- }
- return 0;
- }
- else
- return -1;
- }
-
- /* Else, check if a harnessed public key is in the config file */
-
- result = NULL;
-
- asprintf(&fname, "%s/hosts/%s", confbase, c->name);
- if((fp = fopen(fname, "r")))
- {
- result = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
- fclose(fp);
- free(fname);
- }
-
- free(fname);
-
- if(result)
- return 0;
- else
- {
- syslog(LOG_ERR, _("No public key for %s specified!"), c->name);
- return -1;
- }
-}
+ if(c->socket)
+ closesocket(c->socket);
-int read_rsa_private_key(void)
-{
- FILE *fp;
- void *result;
- char *fname, *key;
-cp
- if(!myself->connection->rsa_key)
- myself->connection->rsa_key = RSA_new();
-
- if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key))
- {
- BN_hex2bn(&myself->connection->rsa_key->d, key);
- BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
- }
- else if(get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
- {
- if((fp = fopen(fname, "r")) == NULL)
- {
- syslog(LOG_ERR, _("Error reading RSA private key file `%s': %m"),
- fname);
- return -1;
- }
- result = PEM_read_RSAPrivateKey(fp, &myself->connection->rsa_key, NULL, NULL);
- fclose(fp);
- if(!result)
- {
- syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"),
- fname);
- return -1;
- }
- }
- else
- {
- syslog(LOG_ERR, _("No private key for tinc daemon specified!"));
- return -1;
- }
-cp
- return 0;
-}
+ if(c->edge) {
+ if(report && !tunnelserver)
+ send_del_edge(everyone, c->edge);
-/*
- Configure node_t myself and set up the local sockets (listen only)
-*/
-int setup_myself(void)
-{
- config_t *cfg;
- subnet_t *subnet;
- char *name, *mode;
- int choice;
-cp
- myself = new_node();
- myself->connection = new_connection();
- init_configuration(&myself->connection->config_tree);
-
- asprintf(&myself->hostname, _("MYSELF"));
- asprintf(&myself->connection->hostname, _("MYSELF"));
-
- myself->connection->options = 0;
- myself->connection->protocol_version = PROT_CURRENT;
-
- if(!get_config_string(lookup_config(config_tree, "Name"), &name)) /* Not acceptable */
- {
- syslog(LOG_ERR, _("Name for tinc daemon required!"));
- return -1;
- }
-
- if(check_id(name))
- {
- syslog(LOG_ERR, _("Invalid name for myself!"));
- free(name);
- return -1;
- }
-
- myself->name = name;
- myself->connection->name = xstrdup(name);
-
-cp
- if(read_rsa_private_key())
- return -1;
-
- if(read_connection_config(myself->connection))
- {
- syslog(LOG_ERR, _("Cannot open host configuration file for myself!"));
- return -1;
- }
-
- if(read_rsa_public_key(myself->connection))
- return -1;
-cp
+ edge_del(c->edge);
-/*
- if(RSA_check_key(rsa_key) != 1)
- {
- syslog(LOG_ERR, _("Invalid public/private keypair!"));
- return -1;
- }
-*/
- if(!get_config_port(lookup_config(myself->connection->config_tree, "Port"), &myself->port))
- myself->port = 655;
-
- myself->connection->port = myself->port;
-
-/* Read in all the subnets specified in the host configuration file */
-
- cfg = lookup_config(myself->connection->config_tree, "Subnet");
-
- while(cfg)
- {
- if(!get_config_subnet(cfg, &subnet))
- return -1;
-
- subnet_add(myself, subnet);
-
- cfg = lookup_config_next(myself->connection->config_tree, cfg);
- }
-
-cp
- /* Check some options */
-
- if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice))
- if(choice)
- myself->options |= OPTION_INDIRECT;
-
- if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice))
- if(choice)
- myself->options |= OPTION_TCPONLY;
-
- if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice))
- if(choice)
- myself->options |= OPTION_INDIRECT;
-
- if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice))
- if(choice)
- myself->options |= OPTION_TCPONLY;
-
- if(myself->options & OPTION_TCPONLY)
- myself->options |= OPTION_INDIRECT;
-
- if(get_config_string(lookup_config(config_tree, "Mode"), &mode))
- {
- if(!strcasecmp(mode, "router"))
- routing_mode = RMODE_ROUTER;
- else if (!strcasecmp(mode, "switch"))
- routing_mode = RMODE_SWITCH;
- else if (!strcasecmp(mode, "hub"))
- routing_mode = RMODE_HUB;
- else
- {
- syslog(LOG_ERR, _("Invalid routing mode!"));
- return -1;
- }
- }
- else
- routing_mode = RMODE_ROUTER;
-
-cp
- /* Open sockets */
-
- if((tcp_socket = setup_listen_socket(myself->port)) < 0)
- {
- syslog(LOG_ERR, _("Unable to set up a listening TCP socket!"));
- return -1;
- }
-
- if((udp_socket = setup_vpn_in_socket(myself->port)) < 0)
- {
- syslog(LOG_ERR, _("Unable to set up a listening UDP socket!"));
- return -1;
- }
-cp
- /* Generate packet encryption key */
-
- myself->cipher = EVP_bf_cbc();
-
- myself->keylength = myself->cipher->key_len + myself->cipher->iv_len;
-
- myself->key = (char *)xmalloc(myself->keylength);
- RAND_pseudo_bytes(myself->key, myself->keylength);
-
- if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
- keylifetime = 3600;
-
- keyexpires = time(NULL) + keylifetime;
-cp
- /* Done */
-
- myself->nexthop = myself;
- myself->via = myself;
- myself->status.active = 1;
- node_add(myself);
-
- syslog(LOG_NOTICE, _("Ready: listening on port %hd"), myself->port);
-cp
- return 0;
-}
+ /* Run MST and SSSP algorithms */
-/*
- setup all initial network connections
-*/
-int setup_network_connections(void)
-{
-cp
- init_connections();
- init_subnets();
- init_nodes();
- init_edges();
-
- if(get_config_int(lookup_config(config_tree, "PingTimeout"), &timeout))
- {
- if(timeout < 1)
- {
- timeout = 86400;
- }
- }
- else
- timeout = 60;
-
- if(setup_device() < 0)
- return -1;
-
- /* Run tinc-up script to further initialize the tap interface */
- execute_script("tinc-up");
-
- if(setup_myself() < 0)
- return -1;
-
- signal(SIGALRM, try_outgoing_connections);
- alarm(5);
-cp
- return 0;
-}
+ graph();
-/*
- close all open network connections
-*/
-void close_network_connections(void)
-{
- avl_node_t *node, *next;
- connection_t *c;
-cp
- for(node = connection_tree->head; node; node = next)
- {
- next = node->next;
- c = (connection_t *)node->data;
- c->status.outgoing = 0;
- terminate_connection(c, 0);
- }
-
- terminate_connection(myself->connection, 0);
-
-// destroy_trees();
- exit_edges();
- exit_subnets();
- exit_nodes();
- exit_connections();
-
- execute_script("tinc-down");
-
- close_device();
-cp
- return;
-}
+ /* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
-/*
- handle an incoming tcp connect call and open
- a connection to it.
-*/
-connection_t *create_new_connection(int sfd)
-{
- connection_t *c;
- struct sockaddr_in ci;
- int len = sizeof(ci);
-cp
- c = new_connection();
-
- if(getpeername(sfd, (struct sockaddr *) &ci, (socklen_t *) &len) < 0)
- {
- syslog(LOG_ERR, _("System call `%s' failed: %m"),
- "getpeername");
- close(sfd);
- return NULL;
- }
-
- c->address = ntohl(ci.sin_addr.s_addr);
- c->hostname = hostlookup(ci.sin_addr.s_addr);
- c->port = htons(ci.sin_port); /* This one will be overwritten later */
- c->socket = sfd;
- c->last_ping_time = time(NULL);
-
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Connection from %s port %d"),
- c->hostname, htons(ci.sin_port));
-
- c->allow_request = ID;
-cp
- return c;
-}
+ if(report && !c->node->status.reachable) {
+ edge_t *e;
+ e = lookup_edge(c->node, myself);
+ if(e) {
+ if(!tunnelserver)
+ send_del_edge(everyone, e);
+ edge_del(e);
+ }
+ }
+ }
-/*
- put all file descriptors in an fd_set array
-*/
-void build_fdset(fd_set *fs)
-{
- avl_node_t *node;
- connection_t *c;
-cp
- FD_ZERO(fs);
-
- for(node = connection_tree->head; node; node = node->next)
- {
- c = (connection_t *)node->data;
- FD_SET(c->socket, fs);
- }
-
- FD_SET(tcp_socket, fs);
- FD_SET(udp_socket, fs);
- FD_SET(device_fd, fs);
-cp
-}
+ /* Check if this was our outgoing connection */
-/*
- receive incoming data from the listening
- udp socket and write it to the ethertap
- device after being decrypted
-*/
-void handle_incoming_vpn_data(void)
-{
- vpn_packet_t pkt;
- int x, l = sizeof(x);
- struct sockaddr_in from;
- socklen_t fromlen = sizeof(from);
- node_t *n;
-cp
- if(getsockopt(udp_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
- {
- syslog(LOG_ERR, _("This is a bug: %s:%d: %d:%m"),
- __FILE__, __LINE__, udp_socket);
- return;
- }
- if(x)
- {
- syslog(LOG_ERR, _("Incoming data socket error: %s"), strerror(x));
- return;
- }
-
- if((pkt.len = recvfrom(udp_socket, (char *) pkt.salt, MTU, 0, (struct sockaddr *)&from, &fromlen)) <= 0)
- {
- syslog(LOG_ERR, _("Receiving packet failed: %m"));
- return;
- }
-
- n = lookup_node_udp(ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
-
- if(!n)
- {
- syslog(LOG_WARNING, _("Received UDP packet on port %hd from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port));
- return;
- }
-/*
- if(n->connection)
- n->connection->last_ping_time = time(NULL);
-*/
- receive_udppacket(n, &pkt);
-cp
-}
+ if(c->outgoing) {
+ retry_outgoing(c->outgoing);
+ c->outgoing = NULL;
+ }
-/*
- Terminate a connection:
- - Close the socket
- - Remove associated edge and tell other connections about it if report = 1
- - Check if we need to retry making an outgoing connection
- - Deactivate the host
-*/
-void terminate_connection(connection_t *c, int report)
-{
- avl_node_t *node;
- connection_t *other;
-cp
- if(c->status.remove)
- return;
-
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_NOTICE, _("Closing connection with %s (%s)"),
- c->name, c->hostname);
-
- c->status.remove = 1;
-
- if(c->socket)
- close(c->socket);
-
- if(c->edge)
- {
- if(report)
- {
- for(node = connection_tree->head; node; node = node->next)
- {
- other = (connection_t *)node->data;
- if(other->status.active && other != c)
- send_del_edge(other, c->edge);
- }
- }
-
- edge_del(c->edge);
- }
-
- /* Check if this was our outgoing connection */
-
- if(c->status.outgoing)
- {
- c->status.outgoing = 0;
- signal(SIGALRM, try_outgoing_connections);
- alarm(seconds_till_retry);
- syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry);
- }
-
- /* Deactivate */
-
- c->status.active = 0;
- if(c->node)
- c->node->connection = NULL;
- do_prune = 1;
-cp
+ free(c->outbuf);
+ c->outbuf = NULL;
+ c->outbuflen = 0;
+ c->outbufsize = 0;
+ c->outbufstart = 0;
}
/*
end does not reply in time, we consider them dead
and close the connection.
*/
-void check_dead_connections(void)
-{
- time_t now;
- avl_node_t *node, *next;
- connection_t *c;
-cp
- now = time(NULL);
-
- for(node = connection_tree->head; node; node = next)
- {
- next = node->next;
- c = (connection_t *)node->data;
- if(c->last_ping_time + timeout < now)
- {
- if(c->status.active)
- {
- if(c->status.pinged)
- {
- if(debug_lvl >= DEBUG_PROTOCOL)
- syslog(LOG_INFO, _("%s (%s) didn't respond to PING"),
- c->name, c->hostname);
- c->status.timeout = 1;
- terminate_connection(c, 1);
- }
- else
- {
- send_ping(c);
- }
- }
- else
- {
- if(debug_lvl >= DEBUG_CONNECTIONS)
- syslog(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
- c->name, c->hostname);
- terminate_connection(c, 0);
- }
- }
- }
-cp
+static void check_dead_connections(void) {
+ avl_node_t *node, *next;
+ connection_t *c;
+
+ for(node = connection_tree->head; node; node = next) {
+ next = node->next;
+ c = node->data;
+
+ 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->status.timeout = true;
+ terminate_connection(c, true);
+ } else if(c->last_ping_time + pinginterval <= now) {
+ send_ping(c);
+ }
+ } else {
+ if(c->status.remove) {
+ 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",
+ c->name, c->hostname);
+ if(c->status.connecting) {
+ c->status.connecting = false;
+ closesocket(c->socket);
+ do_outgoing_connection(c);
+ } else {
+ terminate_connection(c, false);
+ }
+ }
+ }
+
+ 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->status.timeout = true;
+ terminate_connection(c, true);
+ }
+ }
+ }
}
/*
- accept a new tcp connect and create a
- new connection
+ check all connections to see if anything
+ happened on their sockets
*/
-int handle_new_meta_connection()
-{
- connection_t *new;
- struct sockaddr client;
- int fd, len = sizeof(client);
-cp
- if((fd = accept(tcp_socket, &client, &len)) < 0)
- {
- syslog(LOG_ERR, _("Accepting a new connection failed: %m"));
- return -1;
- }
-
- if(!(new = create_new_connection(fd)))
- {
- shutdown(fd, 2);
- close(fd);
- syslog(LOG_NOTICE, _("Closed attempted connection"));
- return 0;
- }
-
- connection_add(new);
-
- send_id(new);
-cp
- return 0;
-}
+static void check_network_activity(fd_set * readset, fd_set * writeset) {
+ connection_t *c;
+ avl_node_t *node;
+ int result, i;
+ socklen_t len = sizeof(result);
+ vpn_packet_t packet;
+ static int errors = 0;
+
+ /* check input from kernel */
+ if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
+ if(devops.read(&packet)) {
+ errors = 0;
+ packet.priority = 0;
+ route(myself, &packet);
+ } else {
+ usleep(errors * 50000);
+ errors++;
+ if(errors > 10) {
+ logger(LOG_ERR, "Too many errors from %s, exiting!", device);
+ running = false;
+ }
+ }
+ }
-void randomized_alarm(int seconds)
-{
- unsigned char r;
- RAND_pseudo_bytes(&r, 1);
- alarm((seconds * (int)r) / 128 + 1);
-}
+ /* check meta connections */
+ for(node = connection_tree->head; node; node = node->next) {
+ c = node->data;
+
+ if(c->status.remove)
+ continue;
+
+ if(FD_ISSET(c->socket, readset)) {
+ if(c->status.connecting) {
+ c->status.connecting = false;
+ getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
+
+ if(!result)
+ finish_connecting(c);
+ else {
+ ifdebug(CONNECTIONS) logger(LOG_DEBUG,
+ "Error while connecting to %s (%s): %s",
+ c->name, c->hostname, sockstrerror(result));
+ closesocket(c->socket);
+ do_outgoing_connection(c);
+ continue;
+ }
+ }
+
+ if(!receive_meta(c)) {
+ terminate_connection(c, c->status.active);
+ continue;
+ }
+ }
+
+ if(FD_ISSET(c->socket, writeset)) {
+ if(!flush_meta(c)) {
+ terminate_connection(c, c->status.active);
+ continue;
+ }
+ }
+ }
-/* This function is severely fucked up.
- We want to redesign it so the following rules apply:
-
- - Try all ConnectTo's in a row:
- - if a connect() fails, try next one immediately,
- - if it works, wait 5 seconds or so.
- - If none of them were succesful, increase delay and retry.
- - If all were succesful, don't try anymore.
-*/
+ for(i = 0; i < listen_sockets; i++) {
+ if(FD_ISSET(listen_socket[i].udp, readset))
+ handle_incoming_vpn_data(listen_socket[i].udp);
-RETSIGTYPE
-try_outgoing_connections(int a)
-{
- static config_t *cfg = NULL;
- static int retry = 0;
- char *name;
-cp
- if(!cfg)
- cfg = lookup_config(config_tree, "ConnectTo");
-
- if(!cfg)
- return;
-
- while(cfg)
- {
- get_config_string(cfg, &name);
- cfg = lookup_config_next(config_tree, cfg); /* Next time skip to next ConnectTo line */
-
- if(check_id(name))
- {
- syslog(LOG_ERR, _("Invalid name for outgoing connection in %s line %d"), cfg->file, cfg->line);
- continue;
- }
-
- if(setup_outgoing_connection(name)) /* function returns 0 when there are no problems */
- retry = 1;
-
- }
-
- get_config_int(lookup_config(config_tree, "MaxTimeout"), &maxtimeout);
-
- if(retry)
- {
- seconds_till_retry += 5;
- if(seconds_till_retry > maxtimeout) /* Don't wait more than MAXTIMEOUT seconds. */
- seconds_till_retry = maxtimeout;
-
- syslog(LOG_ERR, _("Failed to setup all outgoing connections, will retry in %d seconds"),
- seconds_till_retry);
-
- /* Randomize timeout to avoid global synchronisation effects */
- randomized_alarm(seconds_till_retry);
- }
- else
- {
- seconds_till_retry = 5;
- }
-cp
+ if(FD_ISSET(listen_socket[i].tcp, readset))
+ handle_new_meta_connection(listen_socket[i].tcp);
+ }
}
/*
- check all connections to see if anything
- happened on their sockets
+ this is where it all happens...
*/
-void check_network_activity(fd_set *f)
-{
- connection_t *c;
- avl_node_t *node;
-cp
- if(FD_ISSET(udp_socket, f))
- handle_incoming_vpn_data();
-
- for(node = connection_tree->head; node; node = node->next)
- {
- c = (connection_t *)node->data;
-
- if(c->status.remove)
- return;
-
- if(FD_ISSET(c->socket, f))
- if(receive_meta(c) < 0)
- {
- terminate_connection(c, c->status.active);
- return;
- }
- }
-
- if(FD_ISSET(tcp_socket, f))
- handle_new_meta_connection();
-cp
-}
+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;
+
+ last_ping_check = now;
+ last_config_check = now;
+ last_graph_dump = now;
+
+ 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
-void prune_connections(void)
-{
- connection_t *c;
- avl_node_t *node, *next;
-cp
- for(node = connection_tree->head; node; node = next)
- {
- next = node->next;
- c = (connection_t *)node->data;
-
- if(c->status.remove)
- connection_del(c);
- }
-cp
-}
+ running = true;
+
+ while(running) {
+#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
-/*
- this is where it all happens...
-*/
-void main_loop(void)
-{
- fd_set fset;
- struct timeval tv;
- int r;
- time_t last_ping_check;
- int t;
- vpn_packet_t packet;
-cp
- last_ping_check = time(NULL);
-
- for(;;)
- {
- tv.tv_sec = timeout;
- tv.tv_usec = 0;
-
- if(do_prune)
- {
- prune_connections();
- do_prune = 0;
- }
-
- build_fdset(&fset);
-
- if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
- {
- if(errno != EINTR) /* because of alarm */
- {
- syslog(LOG_ERR, _("Error while waiting for input: %m"));
- return;
- }
- }
-
- if(sighup)
- {
- syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));
- sighup = 0;
- close_network_connections();
- exit_configuration(&config_tree);
-
- if(read_server_config())
- {
- syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
- exit(1);
- }
-
- sleep(5);
-
- if(setup_network_connections())
- return;
-
- continue;
- }
-
- t = time(NULL);
-
- /* Let's check if everybody is still alive */
-
- if(last_ping_check + timeout < t)
- {
- check_dead_connections();
- last_ping_check = time(NULL);
-
- /* Should we regenerate our key? */
-
- if(keyexpires < t)
- {
- if(debug_lvl >= DEBUG_STATUS)
- syslog(LOG_INFO, _("Regenerating symmetric key"));
-
- RAND_pseudo_bytes(myself->key, myself->keylength);
- send_key_changed(myself->connection, myself);
- keyexpires = time(NULL) + keylifetime;
- }
+ 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
+
+ if(r < 0) {
+ if(!sockwouldblock(sockerrno)) {
+ logger(LOG_ERR, "Error while waiting for input: %s", sockstrerror(sockerrno));
+ dump_connections();
+ return 1;
+ }
+ }
+
+ if(r > 0)
+ check_network_activity(&readset, &writeset);
+
+ if(do_purge) {
+ purge();
+ do_purge = false;
+ }
+
+ /* Let's check if everybody is still alive */
+
+ if(last_ping_check + pingtimeout <= now) {
+ check_dead_connections();
+ last_ping_check = now;
+
+ if(routing_mode == RMODE_SWITCH)
+ age_subnets();
+
+ age_past_requests();
+
+ /* Should we regenerate our key? */
+
+ if(keyexpires <= now) {
+ avl_node_t *node;
+ node_t *n;
+
+ ifdebug(STATUS) logger(LOG_INFO, "Expiring symmetric keys");
+
+ for(node = node_tree->head; node; node = node->next) {
+ n = node->data;
+ if(n->inkey) {
+ free(n->inkey);
+ n->inkey = NULL;
+ }
+ }
+
+ send_key_changed();
+ keyexpires = now + keylifetime;
+ }
+
+ /* 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();
+ for(node = connection_tree->head; node; node = node->next) {
+ connection_t *c = node->data;
+ send_ping(c);
+ }
+ sigalrm = false;
+ }
+
+ while((event = get_expired_event())) {
+ event->handler(event->data);
+ free_event(event);
+ }
+
+ if(sighup) {
+ connection_t *c;
+ avl_node_t *node, *next;
+ char *fname;
+ struct stat s;
+
+ sighup = false;
+
+ reopenlogger();
+
+ /* Reread our own configuration file */
+
+ exit_configuration(&config_tree);
+ init_configuration(&config_tree);
+
+ if(!read_server_config()) {
+ 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) {
+ c = node->data;
+
+ xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+ if(stat(fname, &s) || s.st_mtime > last_config_check)
+ terminate_connection(c, c->status.active);
+ free(fname);
+ }
+
+ last_config_check = now;
+
+ /* 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(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(everyone, subnet);
+ if(subnet->owner->status.reachable)
+ subnet_update(subnet->owner, subnet, true);
+ }
+ }
+ }
+
+ /* Try to make outgoing connections */
+
+ try_outgoing_connections();
+ }
+
+ /* Dump graph if wanted every 60 seconds*/
+
+ if(last_graph_dump + 60 <= now) {
+ dump_graph();
+ last_graph_dump = now;
+ }
}
- if(r > 0)
- {
- check_network_activity(&fset);
-
- /* local tap data */
- if(FD_ISSET(device_fd, &fset))
- {
- if(read_packet(&packet))
- return;
- else
- route_outgoing(&packet);
- }
- }
- }
-cp
+#ifdef HAVE_PSELECT
+ /* Restore SIGHUP & SIGALARM mask */
+ sigprocmask(SIG_SETMASK, &omask, NULL);
+#endif
+
+ return 0;
}