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.159 2002/03/01 13:18:54 guus Exp $
+ $Id: net.c,v 1.35.4.169 2002/04/01 21:28:05 guus Exp $
*/
#include "config.h"
#include "system.h"
-int do_prune = 0;
int do_purge = 0;
int sighup = 0;
int sigalrm = 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
-}
+time_t now = 0;
/* Purge edges and subnets of unreachable nodes. Use carefully. */
cp
}
+/*
+ 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)
+ connection_del(c);
+ else
+ FD_SET(c->socket, fs);
+ }
+
+ if(!connection_tree->head)
+ purge();
+
+ 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
c->name, c->hostname);
c->status.remove = 1;
+ c->status.active = 0;
+
+ if(c->node)
+ c->node->connection = NULL;
if(c->socket)
close(c->socket);
}
edge_del(c->edge);
- }
- /* Run MST and SSSP algorithms */
+ /* Run MST and SSSP algorithms */
- graph();
+ graph();
+ }
/* 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)
{
- 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;
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 = time(NULL);
+ last_ping_check = now;
- srand(time(NULL));
+ srand(now);
for(;;)
{
+ now = time(NULL);
+
tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
tv.tv_usec = 0;
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;
}
- t = time(NULL);
-
/* Let's check if everybody is still alive */
- if(last_ping_check + pingtimeout < t)
+ if(last_ping_check + pingtimeout < now)
{
check_dead_connections();
- last_ping_check = time(NULL);
+ last_ping_check = now;
+
+ if(routing_mode== RMODE_SWITCH)
+ age_mac();
+
+ age_past_requests();
/* Should we regenerate our key? */
- if(keyexpires < t)
+ if(keyexpires < now)
{
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;
+ keyexpires = now + keylifetime;
}
}
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