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

Merge branch 'thkr-1.1-ponyhof' of github.com:thorkill/tinc into thkr-1.1-ponyhof

Browse source
This commit is contained in:
thorkill 2015-07-21 10:11:36 +02:00
commit 512c64980a
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/graph.c
View file

@ -149,6 +149,7 @@ static void sssp_bfs(void) {
myself->status.visited = true;
myself->status.indirect = false;
myself->status.reachable = true;
myself->nexthop = myself;
myself->prevedge = NULL;
myself->via = myself;
@ -205,7 +206,7 @@ static void sssp_bfs(void) {
e->to->options = e->options;
e->to->distance = n->distance + 1;
if(!e->to->status.reachable || (e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN))
if(!e->to->status.reachable || (e->to != myself && e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN))
update_node_udp(e->to, &e->address);
list_insert_tail(todo_list, e->to);

3
src/net_setup.c
View file

@ -329,14 +329,13 @@ void regenerate_key(void) {
}
void update_edge_weight(void) {
logger(DEBUG_STATUS, LOG_INFO, "Update edge weight");
for list_each(connection_t, c, connection_list) {
if (c->status.control || !c->edge)
continue;
if (c->edge->avg_rtt && (c->edge->weight != c->edge->avg_rtt*10)) {
logger(DEBUG_STATUS, LOG_INFO, "update_edge_weight(): %s -> %s (%d -> %d)", c->edge->from->name,
logger(DEBUG_STATUS, LOG_INFO, "%s: %s -> %s (%d -> %d)", __FUNCTION__, c->edge->from->name,
c->edge->to->name,
c->edge->weight,
c->edge->avg_rtt*10);