From aa9994e49ef932219e7402809324052fb8fc502d Mon Sep 17 00:00:00 2001
From: thorkill <thkr@hannover.ccc.de>
Date: Sat, 4 Jul 2015 18:52:16 +0200
Subject: [PATCH] Cleanup after merge
---
src/net_setup.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/net_setup.c b/src/net_setup.c
index 1b0177ba..83d41cd7 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -334,8 +334,11 @@ void update_edge_weight(void) {
if (c->status.control || !c->edge)
continue;
- if (c->edge->avg_rtt) {
-
+ 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,
+ c->edge->to->name,
+ c->edge->weight,
+ c->edge->avg_rtt*10);
t = clone_edge(c->edge);
send_del_edge(c, c->edge);
edge_del(c->edge);
@@ -1002,8 +1005,6 @@ static bool setup_myself(void) {
#endif
free(type);
}
- if (type)
- free(type);
get_config_bool(lookup_config(config_tree, "DeviceStandby"), &device_standby);