/*
edge.c -- edge tree management
- Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.warande.net>,
- 2000-2002 Ivo Timmermans <itimmermans@bigfoot.com>
+ Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.eu.org>,
+ 2000-2002 Ivo Timmermans <ivo@o2w.nl>
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: edge.c,v 1.1.2.9 2002/03/22 13:31:18 guus Exp $
+ $Id: edge.c,v 1.1.2.14 2002/09/06 12:19:16 guus Exp $
*/
#include "config.h"
#include "conf.h"
#include <utils.h>
#include "subnet.h"
+#include "edge.h"
+#include "node.h"
#include "xalloc.h"
#include "system.h"
-avl_tree_t *edge_tree; /* Tree with all known edges (replaces active_tree) */
avl_tree_t *edge_weight_tree; /* Tree with all edges, sorted on weight */
int edge_compare(edge_t *a, edge_t *b)
{
- int result;
-
- result = strcmp(a->from.node->name, b->from.node->name);
-
- if(result)
- return result;
- else
- return strcmp(a->to.node->name, b->to.node->name);
+ return strcmp(a->to->name, b->to->name);
}
-/* Evil edge_compare() from a parallel universe ;)
-
-int edge_compare(edge_t *a, edge_t *b)
-{
- int result;
-
- return (result = strcmp(a->from.node->name, b->from.node->name)) || (result = strcmp(a->to.node->name, b->to.node->name)), result;
-}
-
-*/
-
-int edge_name_compare(edge_t *a, edge_t *b)
+int edge_weight_compare(edge_t *a, edge_t *b)
{
int result;
- char *name_a1, *name_a2, *name_b1, *name_b2;
-
- if(strcmp(a->from.node->name, a->to.node->name) < 0)
- name_a1 = a->from.node->name, name_a2 = a->to.node->name;
- else
- name_a1 = a->to.node->name, name_a2 = a->from.node->name;
-
- if(strcmp(b->from.node->name, b->to.node->name) < 0)
- name_b1 = b->from.node->name, name_b2 = b->to.node->name;
- else
- name_b1 = b->to.node->name, name_b2 = b->from.node->name;
- result = strcmp(name_a1, name_b1);
+ result = a->weight - b->weight;
if(result)
return result;
- else
- return strcmp(name_a2, name_b2);
-}
-
-int edge_weight_compare(edge_t *a, edge_t *b)
-{
- int result;
- result = a->weight - b->weight;
+ result = strcmp(a->from->name, b->from->name);
if(result)
return result;
- else
- return edge_name_compare(a, b);
+
+ return strcmp(a->to->name, b->to->name);
}
void init_edges(void)
{
cp
- edge_tree = avl_alloc_tree((avl_compare_t)edge_compare, NULL);
edge_weight_tree = avl_alloc_tree((avl_compare_t)edge_weight_compare, NULL);
cp
}
avl_tree_t *new_edge_tree(void)
{
cp
- return avl_alloc_tree((avl_compare_t)edge_name_compare, NULL);
+ return avl_alloc_tree((avl_compare_t)edge_compare, NULL);
cp
}
void exit_edges(void)
{
cp
- avl_delete_tree(edge_tree);
+ avl_delete_tree(edge_weight_tree);
cp
}
void edge_add(edge_t *e)
{
cp
- avl_insert(edge_tree, e);
avl_insert(edge_weight_tree, e);
- avl_insert(e->from.node->edge_tree, e);
- avl_insert(e->to.node->edge_tree, e);
+ avl_insert(e->from->edge_tree, e);
+cp
+ e->reverse = lookup_edge(e->to, e->from);
+ if(e->reverse)
+ e->reverse->reverse = e;
cp
}
void edge_del(edge_t *e)
{
cp
- avl_delete(edge_tree, e);
+ if(e->reverse)
+ e->reverse->reverse = NULL;
+cp
avl_delete(edge_weight_tree, e);
- avl_delete(e->from.node->edge_tree, e);
- avl_delete(e->to.node->edge_tree, e);
+ avl_delete(e->from->edge_tree, e);
cp
}
edge_t *lookup_edge(node_t *from, node_t *to)
{
- edge_t v, *result;
-cp
- v.from.node = from;
- v.to.node = to;
-
- result = avl_search(edge_tree, &v);
-
- if(result)
- return result;
+ edge_t v;
cp
- v.from.node = to;
- v.to.node = from;
+ v.from = from;
+ v.to = to;
- return avl_search(edge_tree, &v);
+ return avl_search(from->edge_tree, &v);
}
void dump_edges(void)
{
- avl_node_t *node;
+ avl_node_t *node, *node2;
+ node_t *n;
edge_t *e;
- char *from_tcp, *from_udp;
- char *to_tcp, *to_udp;
+ char *address;
cp
syslog(LOG_DEBUG, _("Edges:"));
- for(node = edge_tree->head; node; node = node->next)
+ for(node = node_tree->head; node; node = node->next)
{
- e = (edge_t *)node->data;
-// from_tcp = sockaddr2hostname(&e->from.tcpaddress);
- from_udp = sockaddr2hostname(&e->from.udpaddress);
-// to_tcp = sockaddr2hostname(&e->to.tcpaddress);
- to_udp = sockaddr2hostname(&e->to.udpaddress);
- syslog(LOG_DEBUG, _(" %s at %s - %s at %s options %lx weight %d"),
- e->from.node->name, from_udp,
- e->to.node->name, to_udp,
- e->options, e->weight);
-// free(from_tcp);
- free(from_udp);
-// free(to_tcp);
- free(to_udp);
+ n = (node_t *)node->data;
+ for(node2 = n->edge_tree->head; node2; node2 = node2->next)
+ {
+ e = (edge_t *)node2->data;
+ address = sockaddr2hostname(&e->address);
+ syslog(LOG_DEBUG, _(" %s to %s at %s options %lx weight %d"),
+ e->from->name, e->to->name, address,
+ e->options, e->weight);
+ free(address);
+ }
}
syslog(LOG_DEBUG, _("End of edges."));
projects / tinc / blobdiff