/*
net.c -- most of the network code
- Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>,
- 2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
+ 2000-2005 Guus Sliepen <guus@tinc-vpn.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.193 2003/07/23 22:17:31 guus Exp $
+ $Id$
*/
#include "system.h"
#include "protocol.h"
#include "route.h"
#include "subnet.h"
+#include "xalloc.h"
bool do_purge = false;
+volatile bool running = false;
time_t now = 0;
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 = (node_t *) nnode->data;
+ n = nnode->data;
if(!n->status.reachable) {
ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name,
for(snode = n->subnet_tree->head; snode; snode = snext) {
snext = snode->next;
- s = (subnet_t *) snode->data;
- send_del_subnet(broadcast, s);
+ s = snode->data;
+ if(!tunnelserver)
+ send_del_subnet(broadcast, s);
subnet_del(n, s);
}
for(enode = n->edge_tree->head; enode; enode = enext) {
enext = enode->next;
- e = (edge_t *) enode->data;
- send_del_edge(broadcast, e);
+ e = enode->data;
+ if(!tunnelserver)
+ send_del_edge(broadcast, e);
edge_del(e);
}
+ }
+ }
- node_del(n);
+ /* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */
+
+ for(nnode = node_tree->head; nnode; nnode = nnext) {
+ nnext = nnode->next;
+ n = nnode->data;
+
+ if(!n->status.reachable) {
+ for(enode = edge_weight_tree->head; enode; enode = enext) {
+ enext = enode->next;
+ e = enode->data;
+
+ if(e->to == n)
+ break;
+ }
+
+ if(!enode)
+ node_del(n);
}
}
}
put all file descriptors in an fd_set array
While we're at it, purge stuff that needs to be removed.
*/
-static int build_fdset(fd_set * fs)
+static int build_fdset(fd_set *readset, fd_set *writeset)
{
avl_node_t *node, *next;
connection_t *c;
cp();
- FD_ZERO(fs);
+ FD_ZERO(readset);
+ FD_ZERO(writeset);
for(node = connection_tree->head; node; node = next) {
next = node->next;
- c = (connection_t *) node->data;
+ c = node->data;
if(c->status.remove) {
connection_del(c);
if(!connection_tree->head)
purge();
} else {
- FD_SET(c->socket, fs);
+ FD_SET(c->socket, readset);
+ if(c->outbuflen > 0)
+ FD_SET(c->socket, writeset);
if(c->socket > max)
max = c->socket;
}
}
for(i = 0; i < listen_sockets; i++) {
- FD_SET(listen_socket[i].tcp, fs);
+ FD_SET(listen_socket[i].tcp, readset);
if(listen_socket[i].tcp > max)
max = listen_socket[i].tcp;
- FD_SET(listen_socket[i].udp, fs);
+ FD_SET(listen_socket[i].udp, readset);
if(listen_socket[i].udp > max)
max = listen_socket[i].udp;
}
- FD_SET(device_fd, fs);
+ FD_SET(device_fd, readset);
if(device_fd > max)
max = device_fd;
c->node->connection = NULL;
if(c->socket)
- close(c->socket);
+ closesocket(c->socket);
if(c->edge) {
- if(report)
+ if(report && !tunnelserver)
send_del_edge(broadcast, c->edge);
edge_del(c->edge);
/* Run MST and SSSP algorithms */
graph();
+
+ /* If the node is not reachable anymore but we remember it had an edge to us, clean it up */
+
+ if(report && !c->node->status.reachable) {
+ edge_t *e;
+ e = lookup_edge(c->node, myself);
+ if(e) {
+ if(!tunnelserver)
+ send_del_edge(broadcast, e);
+ edge_del(e);
+ }
+ }
}
/* Check if this was our outgoing connection */
retry_outgoing(c->outgoing);
c->outgoing = NULL;
}
+
+ free(c->outbuf);
+ c->outbuf = NULL;
+ c->outbuflen = 0;
+ c->outbufsize = 0;
+ c->outbufstart = 0;
}
/*
for(node = connection_tree->head; node; node = next) {
next = node->next;
- c = (connection_t *) node->data;
+ 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"),
- c->name, c->hostname);
+ ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING in %d seconds"),
+ c->name, c->hostname, now - c->last_ping_time);
c->status.timeout = true;
terminate_connection(c, true);
- } else {
+ } 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, c->status);
+ c->name, c->hostname, *(uint32_t *)&c->status);
connection_del(c);
continue;
}
ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
c->name, c->hostname);
- terminate_connection(c, false);
+ 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 %d seconds (%d bytes remaining)"),
+ c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
+ c->status.timeout = true;
+ terminate_connection(c, true);
}
}
}
check all connections to see if anything
happened on their sockets
*/
-static void check_network_activity(fd_set * f)
+static void check_network_activity(fd_set * readset, fd_set * writeset)
{
connection_t *c;
avl_node_t *node;
int result, i;
- int len = sizeof(result);
+ socklen_t len = sizeof(result);
vpn_packet_t packet;
cp();
- if(FD_ISSET(device_fd, f)) {
+ /* check input from kernel */
+ if(FD_ISSET(device_fd, readset)) {
if(read_packet(&packet))
- route_outgoing(&packet);
+ route(myself, &packet);
}
+ /* check meta connections */
for(node = connection_tree->head; node; node = node->next) {
- c = (connection_t *) node->data;
+ c = node->data;
if(c->status.remove)
continue;
- if(FD_ISSET(c->socket, f)) {
+ if(FD_ISSET(c->socket, readset)) {
if(c->status.connecting) {
c->status.connecting = false;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
ifdebug(CONNECTIONS) logger(LOG_DEBUG,
_("Error while connecting to %s (%s): %s"),
c->name, c->hostname, strerror(result));
- close(c->socket);
+ closesocket(c->socket);
do_outgoing_connection(c);
continue;
}
continue;
}
}
+
+ if(FD_ISSET(c->socket, writeset)) {
+ if(!flush_meta(c)) {
+ terminate_connection(c, c->status.active);
+ continue;
+ }
+ }
}
for(i = 0; i < listen_sockets; i++) {
- if(FD_ISSET(listen_socket[i].udp, f))
+ if(FD_ISSET(listen_socket[i].udp, readset))
handle_incoming_vpn_data(listen_socket[i].udp);
- if(FD_ISSET(listen_socket[i].tcp, f))
+ if(FD_ISSET(listen_socket[i].tcp, readset))
handle_new_meta_connection(listen_socket[i].tcp);
}
}
/*
this is where it all happens...
*/
-void main_loop(void)
+int main_loop(void)
{
- fd_set fset;
+ fd_set readset, writeset;
struct timeval tv;
int r, maxfd;
time_t last_ping_check, last_config_check;
last_config_check = now;
srand(now);
- for(;;) {
+ running = true;
+
+ while(running) {
now = time(NULL);
- tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
+ // tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
+ tv.tv_sec = 1;
tv.tv_usec = 0;
- maxfd = build_fdset(&fset);
+ maxfd = build_fdset(&readset, &writeset);
- r = select(maxfd + 1, &fset, NULL, NULL, &tv);
+ r = select(maxfd + 1, &readset, &writeset, NULL, &tv);
if(r < 0) {
if(errno != EINTR && errno != EAGAIN) {
strerror(errno));
cp_trace();
dump_connections();
- return;
+ return 1;
}
continue;
}
- check_network_activity(&fset);
+ check_network_activity(&readset, &writeset);
if(do_purge) {
purge();
last_ping_check = now;
if(routing_mode == RMODE_SWITCH)
- age_mac();
+ age_subnets();
age_past_requests();
if(keyexpires < now) {
ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
- RAND_pseudo_bytes(myself->key, myself->keylength);
+ RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
if(myself->cipher)
- EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+ EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, (unsigned char *)myself->key, (unsigned char *)myself->key + myself->cipher->key_len);
send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}
logger(LOG_INFO, _("Flushing event queue"));
while(event_tree->head) {
- event = (event_t *) event_tree->head->data;
+ event = event_tree->head->data;
event->handler(event->data);
event_del(event);
}
if(!read_server_config()) {
logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
- exit(1);
+ return 1;
}
/* Close connections to hosts that have a changed or deleted host config file */
for(node = connection_tree->head; node; node = node->next) {
- c = (connection_t *) node->data;
+ c = node->data;
if(c->outgoing) {
free(c->outgoing->name);
/* Try to make outgoing connections */
try_outgoing_connections();
-
- continue;
}
}
+
+ return 0;
}
projects / tinc / blobdiff