From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Sven Eckelmann Date: Tue, 10 May 2011 11:22:37 +0200 Message-Id: <1305019357-27050-3-git-send-email-sven@narfation.org> In-Reply-To: <1305019357-27050-1-git-send-email-sven@narfation.org> References: <1305019357-27050-1-git-send-email-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCH 2/2] batman-adv: Ensure that we really have route changes in update_route Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: b.a.t.m.a.n@lists.open-mesh.org 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 --- routing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/routing.c b/routing.c index 8c403ce..3f8355c 100644 --- a/routing.c +++ b/routing.c @@ -109,7 +109,7 @@ static void update_route(struct bat_priv *bat_priv, 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", -- 1.7.5.1