/*
net.c -- most of the network code
- Copyright (C) 1998-2002 Ivo Timmermans <itimmermans@bigfoot.com>,
- 2000-2002 Guus Sliepen <guus@sliepen.warande.net>
+ Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>,
+ 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
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
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.160 2002/03/01 14:09:31 guus Exp $
+ $Id: net.c,v 1.35.4.175 2002/09/03 20:43:25 guus Exp $
*/
#include "config.h"
#include <fcntl.h>
#include <netdb.h>
#include <netinet/in.h>
-#ifdef HAVE_LINUX
+#ifdef HAVE_NETINET_IN_SYSTM_H
+ #include <netinet/in_systm.h>
+#endif
+#ifdef HAVE_NETINET_IP_H
#include <netinet/ip.h>
+#endif
+#ifdef HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
#include <stdio.h>
#include "process.h"
#include "protocol.h"
#include "subnet.h"
-#include "graph.h"
#include "process.h"
#include "route.h"
#include "device.h"
#include "system.h"
-int do_prune = 0;
+#ifndef HAVE_RAND_PSEUDO_BYTES
+#define RAND_pseudo_bytes RAND_bytes
+#endif
+
int do_purge = 0;
int sighup = 0;
int sigalrm = 0;
time_t now = 0;
-/*
- put all file descriptors in an fd_set array
-*/
-void build_fdset(fd_set *fs)
-{
- avl_node_t *node;
- connection_t *c;
- int i;
-cp
- FD_ZERO(fs);
-
- for(node = connection_tree->head; node; node = node->next)
- {
- c = (connection_t *)node->data;
- FD_SET(c->socket, fs);
- }
-
- for(i = 0; i < listen_sockets; i++)
- {
- FD_SET(tcp_socket[i], fs);
- FD_SET(udp_socket[i], fs);
- }
-
- FD_SET(device_fd, fs);
-cp
-}
-
-/* Purge edges and subnets of unreachable nodes. Use carefully. */
+/* Purge subnets of unreachable nodes. Use carefully. */
void purge(void)
{
- avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext, *cnode;
+ avl_node_t *nnode, *nnext, *snode, *snext, *cnode;
node_t *n;
- edge_t *e;
subnet_t *s;
connection_t *c;
cp
subnet_del(n, s);
}
- for(enode = n->edge_tree->head; enode; enode = enext)
- {
- enext = enode->next;
- e = (edge_t *)enode->data;
+ node_del(n);
+ }
+ }
+cp
+}
- for(cnode = connection_tree->head; cnode; cnode = cnode->next)
+/*
+ put all file descriptors in an fd_set array
+ While we're at it, purge stuff that needs to be removed.
+*/
+void build_fdset(fd_set *fs)
+{
+ avl_node_t *node, *next;
+ connection_t *c;
+ int i;
+cp
+ FD_ZERO(fs);
+
+ for(node = connection_tree->head; node; node = next)
+ {
+ next = node->next;
+ c = (connection_t *)node->data;
+
+ if(c->status.remove)
{
- c = (connection_t *)cnode->data;
- if(c->status.active)
- send_del_edge(c, e);
+ connection_del(c);
+ if(!connection_tree->head)
+ purge();
}
+ else
+ FD_SET(c->socket, fs);
+ }
- edge_del(e);
- }
-
- node_del(n);
+ for(i = 0; i < listen_sockets; i++)
+ {
+ FD_SET(listen_socket[i].tcp, fs);
+ FD_SET(listen_socket[i].udp, fs);
}
- }
+
+ FD_SET(device_fd, fs);
cp
}
/*
Terminate a connection:
- Close the socket
- - Remove associated edge and tell other connections about it if report = 1
+ - 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;
+ avl_node_t *node, *node2;
connection_t *other;
+ node_t *n;
cp
if(c->status.remove)
return;
c->name, c->hostname);
c->status.remove = 1;
+ c->status.active = 0;
- if(c->socket)
- close(c->socket);
-
- if(c->edge)
+ if(c->node)
{
- if(report)
+ if(report && c->node->connection)
{
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);
+ if(other == c)
+ continue;
+ for(node2 = node_tree->head; node2; node2 = node2->next)
+ {
+ n = (node_t *)node2->data;
+ if(n->nexthop == c->node)
+ {
+ send_del_node(other, n);
+ n->status.reachable = 0;
+ }
+ }
}
}
-
- edge_del(c->edge);
+ c->node->connection = NULL;
}
- /* Run MST and SSSP algorithms */
-
- graph();
+ if(c->socket)
+ close(c->socket);
/* Check if this was our outgoing connection */
retry_outgoing(c->outgoing);
c->outgoing = NULL;
}
-
- /* Deactivate */
-
- c->status.active = 0;
- if(c->node)
- c->node->connection = NULL;
- do_prune = 1;
cp
}
*/
void check_dead_connections(void)
{
- avl_node_t *node, *next;
+ avl_node_t *node;
connection_t *c;
cp
- for(node = connection_tree->head; node; node = next)
+ for(node = connection_tree->head; node; node = node->next)
{
- next = node->next;
c = (connection_t *)node->data;
- if(c->last_ping_time + pingtimeout < now)
+ if(c->last_ping_time + pingtimeout < now && !c->status.remove)
{
if(c->status.active)
{
route_outgoing(&packet);
}
- for(i = 0; i < listen_sockets; i++)
- {
- if(FD_ISSET(udp_socket[i], f))
- handle_incoming_vpn_data(udp_socket[i]);
- if(FD_ISSET(tcp_socket[i], f))
- handle_new_meta_connection(tcp_socket[i]);
- }
-
for(node = connection_tree->head; node; node = node->next)
{
c = (connection_t *)node->data;
if(c->status.remove)
- return;
+ continue;
if(FD_ISSET(c->socket, f))
{
if(receive_meta(c) < 0)
{
terminate_connection(c, c->status.active);
- return;
+ continue;
}
}
}
-cp
-}
-void prune_connections(void)
-{
- connection_t *c;
- avl_node_t *node, *next;
-cp
- for(node = connection_tree->head; node; node = next)
+ for(i = 0; i < listen_sockets; i++)
{
- next = node->next;
- c = (connection_t *)node->data;
-
- if(c->status.remove)
- connection_del(c);
+ if(FD_ISSET(listen_socket[i].udp, f))
+ handle_incoming_vpn_data(listen_socket[i].udp);
+ if(FD_ISSET(listen_socket[i].tcp, f))
+ handle_new_meta_connection(listen_socket[i].tcp);
}
-
- if(!connection_tree->head)
- purge();
cp
}
struct timeval tv;
int r;
time_t last_ping_check;
- int t;
event_t *event;
cp
last_ping_check = now;
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
{
- if(errno != EINTR) /* because of a signal */
+ if(errno != EINTR && errno != EAGAIN)
{
syslog(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno));
+ cp_trace();
+ dump_connections();
return;
}
- }
-
- if(r > 0)
- check_network_activity(&fset);
- if(do_prune)
- {
- prune_connections();
- do_prune = 0;
+ continue;
}
- if(do_purge)
+ check_network_activity(&fset);
+
+ if(do_purge)
{
purge();
do_purge = 0;
check_dead_connections();
last_ping_check = now;
- if(routing_mode != RMODE_ROUTER)
+ if(routing_mode== RMODE_SWITCH)
age_mac();
+ age_past_requests();
+
/* Should we regenerate our key? */
if(keyexpires < now)
close_network_connections();
exit_configuration(&config_tree);
- syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));
+ syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds..."));
sleep(5);
init_configuration(&config_tree);
if(read_server_config())
{
- syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
+ syslog(LOG_ERR, _("Unable to reread configuration file, exitting."));
exit(1);
}
projects / tinc / blobdiff