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.195 2003/07/29 22:59:00 guus Exp $
+ $Id: net.c,v 1.35.4.200 2003/08/28 21:05:10 guus Exp $
*/
#include "system.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;
+ s = snode->data;
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;
+ e = enode->data;
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);
}
}
}
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);
/* 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) {
+ send_del_edge(broadcast, e);
+ edge_del(e);
+ }
+ }
}
/* Check if this was our outgoing connection */
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) {
}
for(node = connection_tree->head; node; node = node->next) {
- c = (connection_t *) node->data;
+ c = node->data;
if(c->status.remove)
continue;
/*
this is where it all happens...
*/
-void main_loop(void)
+int main_loop(void)
{
fd_set fset;
struct timeval tv;
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 */
strerror(errno));
cp_trace();
dump_connections();
- return;
+ return 1;
}
continue;
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;
}