projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup local_address in protocol_edge.c
[tinc]
/
src
/
edge.c
diff --git
a/src/edge.c
b/src/edge.c
index
be1a6f3
..
6539630
100644
(file)
--- a/
src/edge.c
+++ b/
src/edge.c
@@
-1,6
+1,6
@@
/*
edge.c -- edge tree management
/*
edge.c -- edge tree management
- Copyright (C) 2000-20
06
Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-20
13
Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
2000-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
@@
-29,7
+29,7
@@
#include "utils.h"
#include "xalloc.h"
#include "utils.h"
#include "xalloc.h"
-splay_tree_t *edge_weight_tree;
/* Tree with all edges, sorted on weight */
+splay_tree_t *edge_weight_tree;
static int edge_compare(const edge_t *a, const edge_t *b) {
return strcmp(a->to->name, b->to->name);
static int edge_compare(const edge_t *a, const edge_t *b) {
return strcmp(a->to->name, b->to->name);
@@
-64,13
+64,19
@@
void free_edge_tree(splay_tree_t *edge_tree) {
}
void exit_edges(void) {
}
void exit_edges(void) {
+ // since edge_weight_tree does not have delete action defined
+ // we have to cleanup it on exit
+ for splay_each(edge_t, e, edge_weight_tree) {
+ sockaddrfree(&e->address);
+ sockaddrfree(&e->local_address);
+ }
splay_delete_tree(edge_weight_tree);
}
/* Creation and deletion of connection elements */
edge_t *new_edge(void) {
splay_delete_tree(edge_weight_tree);
}
/* Creation and deletion of connection elements */
edge_t *new_edge(void) {
- return x
malloc_and_zero
(sizeof(edge_t));
+ return x
zalloc
(sizeof(edge_t));
}
void free_edge(edge_t *e) {
}
void free_edge(edge_t *e) {
@@
-99,7
+105,7
@@
void edge_del(edge_t *e) {
edge_t *lookup_edge(node_t *from, node_t *to) {
edge_t v;
edge_t *lookup_edge(node_t *from, node_t *to) {
edge_t v;
-
+
v.from = from;
v.to = to;
v.from = from;
v.to = to;
@@
-110,11
+116,13
@@
bool dump_edges(connection_t *c) {
for splay_each(node_t, n, node_tree) {
for splay_each(edge_t, e, n->edge_tree) {
char *address = sockaddr2hostname(&e->address);
for splay_each(node_t, n, node_tree) {
for splay_each(edge_t, e, n->edge_tree) {
char *address = sockaddr2hostname(&e->address);
- send_request(c, "%d %d %s %s %s %x %d",
+ char* local_address = sockaddr2hostname(&e->local_address);
+ send_request(c, "%d %d %s %s %s %s %x %d",
CONTROL, REQ_DUMP_EDGES,
e->from->name, e->to->name, address,
CONTROL, REQ_DUMP_EDGES,
e->from->name, e->to->name, address,
- e->options, e->weight);
+
local_address,
e->options, e->weight);
free(address);
free(address);
+ free(local_address);
}
}
}
}