/*
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.170 2002/04/18 20:09:05 zarq Exp $
+ $Id: net.c,v 1.35.4.179 2002/09/09 19:39:58 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>
void purge(void)
{
- avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext, *cnode;
+ avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
node_t *n;
edge_t *e;
subnet_t *s;
- connection_t *c;
-cp
+ cp();
if(debug_lvl >= DEBUG_PROTOCOL)
syslog(LOG_DEBUG, _("Purging unreachable nodes"));
{
snext = snode->next;
s = (subnet_t *)snode->data;
-
- for(cnode = connection_tree->head; cnode; cnode = cnode->next)
- {
- c = (connection_t *)cnode->data;
- if(c->status.active)
- send_del_subnet(c, s);
- }
-
+ send_del_subnet(broadcast, s);
subnet_del(n, s);
}
{
enext = enode->next;
e = (edge_t *)enode->data;
-
- for(cnode = connection_tree->head; cnode; cnode = cnode->next)
- {
- c = (connection_t *)cnode->data;
- if(c->status.active)
- send_del_edge(c, e);
- }
-
+ send_del_edge(broadcast, e);
edge_del(e);
}
node_del(n);
}
}
-cp
+ cp();
}
/*
avl_node_t *node, *next;
connection_t *c;
int i;
-cp
+ cp();
FD_ZERO(fs);
for(node = connection_tree->head; node; node = next)
c = (connection_t *)node->data;
if(c->status.remove)
- connection_del(c);
+ {
+ connection_del(c);
+ if(!connection_tree->head)
+ purge();
+ }
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(device_fd, fs);
-cp
+ cp();
}
/*
*/
void terminate_connection(connection_t *c, int report)
{
- avl_node_t *node;
- connection_t *other;
-cp
+ cp();
if(c->status.remove)
return;
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);
- }
- }
+ send_del_edge(broadcast, c->edge);
edge_del(c->edge);
retry_outgoing(c->outgoing);
c->outgoing = NULL;
}
-cp
+ cp();
}
/*
{
avl_node_t *node, *next;
connection_t *c;
-cp
+ cp();
for(node = connection_tree->head; node; node = next)
{
next = node->next;
}
else
{
+ if(c->status.remove)
+ {
+ syslog(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."), c->name, c->hostname, c->status);
+ connection_del(c);
+ continue;
+ }
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
c->name, c->hostname);
}
}
}
-cp
+ cp();
}
/*
int result, i;
int len = sizeof(result);
vpn_packet_t packet;
-cp
+ cp();
if(FD_ISSET(device_fd, f))
{
if(!read_packet(&packet))
if(FD_ISSET(listen_socket[i].tcp, f))
handle_new_meta_connection(listen_socket[i].tcp);
}
-cp
+ cp();
}
/*
int r;
time_t last_ping_check;
event_t *event;
-cp
+ cp();
last_ping_check = now;
srand(now);
build_fdset(&fset);
- if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
+ r = select(FD_SETSIZE, &fset, NULL, NULL, &tv);
+
+ if(r < 0)
{
if(errno != EINTR && errno != EAGAIN)
{
syslog(LOG_INFO, _("Regenerating symmetric key"));
RAND_pseudo_bytes(myself->key, myself->keylength);
- send_key_changed(myself->connection, myself);
+ send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}
}
continue;
}
}
-cp
+ cp();
}