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

Prefer routes with lower weight as long as they do not increase the number of hops.

Browse source 
This should improve traffic to nodes that are not directly reachable somewhat.
This commit is contained in:
Guus Sliepen 2012-07-20 20:35:07 +02:00
parent 4c8ead9874
commit 1d4590ca5c
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/graph.c
View file

@ -232,6 +232,7 @@ static void sssp_bfs(void) {
n = node->data; n = node->data;
n->status.visited = false; n->status.visited = false;
n->status.indirect = true; n->status.indirect = true;
n->distance = -1;
} }
/* Begin with myself */ /* Begin with myself */
@ -241,12 +242,15 @@ static void sssp_bfs(void) {
myself->nexthop = myself; myself->nexthop = myself;
myself->prevedge = NULL; myself->prevedge = NULL;
myself->via = myself; myself->via = myself;
myself->distance = 0;
list_insert_head(todo_list, myself); list_insert_head(todo_list, myself);
/* Loop while todo_list is filled */ /* Loop while todo_list is filled */
for(from = todo_list->head; from; from = todonext) { /* "from" is the node from which we start */ for(from = todo_list->head; from; from = todonext) { /* "from" is the node from which we start */
n = from->data; n = from->data;
if(n->distance < 0)
abort();
for(to = n->edge_tree->head; to; to = to->next) { /* "to" is the edge connected to "from" */ for(to = n->edge_tree->head; to; to = to->next) { /* "to" is the edge connected to "from" */
e = to->data; e = to->data;
@ -274,7 +278,8 @@ static void sssp_bfs(void) {
indirect = n->status.indirect || e->options & OPTION_INDIRECT; indirect = n->status.indirect || e->options & OPTION_INDIRECT;
if(e->to->status.visited if(e->to->status.visited
&& (!e->to->status.indirect || indirect)) && (!e->to->status.indirect || indirect)
&& (e->to->distance != n->distance + 1 || e->weight >= e->to->prevedge->weight))
continue; continue;
e->to->status.visited = true; e->to->status.visited = true;
@ -283,6 +288,7 @@ static void sssp_bfs(void) {
e->to->prevedge = e; e->to->prevedge = e;
e->to->via = indirect ? n->via : e->to; e->to->via = indirect ? n->via : e->to;
e->to->options = e->options; e->to->options = e->options;
e->to->distance = n->distance + 1;
if(e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN) if(e->to->address.sa.sa_family == AF_UNSPEC && e->address.sa.sa_family != AF_UNKNOWN)
update_node_udp(e->to, &e->address); update_node_udp(e->to, &e->address);