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

Update weight if needed at the beginning

Browse source
This commit is contained in:
thorkill 2015-07-07 20:50:53 +02:00
parent 78d0342a12
commit 80ccfb2894
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/protocol_edge.c
View file

@ -135,6 +135,16 @@ bool add_edge_h(connection_t *c, const char *request) {
e = lookup_edge(from, to); e = lookup_edge(from, to);
if(e) { if(e) {
/* Update weight first */
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);
if (e->reverse)
edge_update_weigth(e->reverse, weight);
graph();
}
if(e->options != options || sockaddrcmp(&e->address, &address)) { if(e->options != options || sockaddrcmp(&e->address, &address)) {
if(from == myself) { if(from == myself) {
logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry", logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) for ourself which does not match existing entry",
@ -172,15 +182,6 @@ bool add_edge_h(connection_t *c, const char *request) {
return true; 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);
if (e->reverse)
edge_update_weigth(e->reverse, weight);
graph();
return true;
} else { } else {
sockaddrfree(&local_address); sockaddrfree(&local_address);