projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- More changes needed for Kruskal's algorithm
[tinc]
/
src
/
node.c
diff --git
a/src/node.c
b/src/node.c
index
53e520e
..
f50d365
100644
(file)
--- a/
src/node.c
+++ b/
src/node.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: node.c,v 1.1.2.
2 2001/10/27 12:13:17
guus Exp $
+ $Id: node.c,v 1.1.2.
4 2001/10/28 22:42:49
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-36,6
+36,8
@@
avl_tree_t *node_tree; /* Known nodes, sorted by name */
avl_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */
avl_tree_t *node_tree; /* Known nodes, sorted by name */
avl_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */
+node_t *myself;
+
int node_compare(node_t *a, node_t *b)
{
return strcmp(a->name, b->name);
int node_compare(node_t *a, node_t *b)
{
return strcmp(a->name, b->name);
@@
-71,7
+73,8
@@
node_t *new_node(void)
{
node_t *n = (node_t *)xmalloc_and_zero(sizeof(*n));
cp
{
node_t *n = (node_t *)xmalloc_and_zero(sizeof(*n));
cp
- n->subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, NULL);
+ n->subnet_tree = new_subnet_tree();
+ n->edge_tree = new_edge_tree();
n->queue = list_alloc((list_action_t)free);
cp
return n;
n->queue = list_alloc((list_action_t)free);
cp
return n;
@@
-88,6
+91,10
@@
cp
free(n->hostname);
if(n->key)
free(n->key);
free(n->hostname);
if(n->key)
free(n->key);
+ if(n->subnet_tree)
+ free_subnet_tree(n->subnet_tree);
+ if(n->edge_tree)
+ free_edge_tree(n->edge_tree);
free(n);
cp
}
free(n);
cp
}