j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Do not delete edges which differ only by weight

Browse source 
Added special case where we get weight update from other node.
Previous version called edge_del() which caused segmentation
faults in mst_kruskal.
This commit is contained in:
thorkill 2015-07-06 01:52:40 +02:00
parent 38c42fb973
commit 8dcd2a9995
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/protocol_edge.c
View file

@ -135,7 +135,7 @@ bool add_edge_h(connection_t *c, const char *request) {
e = lookup_edge(from, to);
if(e) {
if(e->weight != weight || e->options != options || sockaddrcmp(&e->address, &address)) {
if(e->options != options || sockaddrcmp(&e->address, &address)) {
if(from == myself) {
logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry",
"ADD_EDGE", c->name, c->hostname);
@ -172,7 +172,14 @@ bool add_edge_h(connection_t *c, const char *request) {
return true;
}
} else if(e->weight != weight){
logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) with new weight %d -> %d",
"ADD_EDGE", c->name, c->hostname, e->weight, weight);
edge_update_weigth(e, weight);
graph();
return true;
} else {
sockaddrfree(&local_address);
return true;
}