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

merged with thkr-1.1-fix-0004

Browse source
This commit is contained in:
thorkill 2015-07-08 00:44:08 +02:00
commit 1f2e14df8c
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/edge.c
View file

@ -86,20 +86,16 @@ void edge_add(edge_t *e) {
if (splay_insert(e->from->edge_tree, e)) { if (splay_insert(e->from->edge_tree, e)) {
e->reverse = lookup_edge(e->to, e->from); e->reverse = lookup_edge(e->to, e->from);
if(e->reverse) { if(e->reverse)
if (e->reverse->reverse) {
logger(DEBUG_ALWAYS, LOG_ERR, "edge_add(): e->reverse->reverse should be NULL!");
abort();
}
e->reverse->reverse = e; e->reverse->reverse = e;
}
if (!splay_insert(edge_weight_tree, e)) if (!splay_insert(edge_weight_tree, e))
logger(DEBUG_ALWAYS, LOG_ERR, logger(DEBUG_ALWAYS, LOG_ERR,
"%s:%d: edge from: %s to: %s exists in edge_weight_tree", "%s:%d: edge from: %s to: %s exists in edge_weight_tree",
__FUNCTION__, __LINE__, e->from->name, e->to->name); __FUNCTION__, __LINE__, e->from->name, e->to->name);
} else { } else {
logger(DEBUG_ALWAYS, LOG_ERR, logger(DEBUG_ALWAYS, LOG_ERR,
"%s:%d: edge from: %s to: %s exists in from->edge_tree", "%s:%d: edge from: %s to: %s exists in e->from->edge_tree",
__FUNCTION__, __LINE__, e->from->name, e->to->name); __FUNCTION__, __LINE__, e->from->name, e->to->name);
} }
} }