The following commit has been merged in the master branch: commit 3e7fe2ecb85e6f1f94b6fdf9d344931c267898f1 Author: Sven Eckelmann sven@narfation.org Date: Tue May 10 11:22:37 2011 +0200
batman-adv: Ensure that we really have route changes in update_route
The debug output of update_route has tests for "route deleted" and "route added". All other situations are handled as "route changed". This is not true because neigh_node and curr_router could be both NULL.
The function is not called in this situation, but the code might be interpreted wrong when reading it without this test.
Signed-off-by: Sven Eckelmann sven@narfation.org
diff --git a/routing.c b/routing.c index 90ae6f0..368ceeb 100644 --- a/routing.c +++ b/routing.c @@ -108,7 +108,7 @@ static void update_route(struct bat_priv *bat_priv, struct orig_node *orig_node, tt_buff, tt_buff_len);
/* route changed */ - } else { + } else if (neigh_node && curr_router) { bat_dbg(DBG_ROUTES, bat_priv, "Changing route towards: %pM " "(now via %pM - was via %pM)\n",