summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonio Quartulli <ordex@autistici.org>2011-07-07 14:24:34 +0200
committerMarek Lindner <lindner_marek@yahoo.de>2011-07-07 18:49:26 +0200
commita7f9becb7d27008af0f72f8449c110276b0df37d (patch)
tree37adcfef1cde149943e7412e983ac5eb5e7aeb97
parent980d55b20a730cbabc74cdc57be9c47713dba57b (diff)
downloadlinux-stable-a7f9becb7d27008af0f72f8449c110276b0df37d.tar.gz
linux-stable-a7f9becb7d27008af0f72f8449c110276b0df37d.tar.bz2
linux-stable-a7f9becb7d27008af0f72f8449c110276b0df37d.zip
batman-adv: request the full table if tt_crc doesn't match
In case of tt_crc mismatching for a certain orig_node after applying the changes, the node must request the full table immediately. Signed-off-by: Antonio Quartulli <ordex@autistici.org> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
-rw-r--r--net/batman-adv/routing.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c
index 2cb98bed1586..0f32c818874d 100644
--- a/net/batman-adv/routing.c
+++ b/net/batman-adv/routing.c
@@ -91,6 +91,18 @@ static void update_transtable(struct bat_priv *bat_priv,
* to recompute it to spot any possible inconsistency
* in the global table */
orig_node->tt_crc = tt_global_crc(bat_priv, orig_node);
+
+ /* The ttvn alone is not enough to guarantee consistency
+ * because a single value could repesent different states
+ * (due to the wrap around). Thus a node has to check whether
+ * the resulting table (after applying the changes) is still
+ * consistent or not. E.g. a node could disconnect while its
+ * ttvn is X and reconnect on ttvn = X + TTVN_MAX: in this case
+ * checking the CRC value is mandatory to detect the
+ * inconsistency */
+ if (orig_node->tt_crc != tt_crc)
+ goto request_table;
+
/* Roaming phase is over: tables are in sync again. I can
* unset the flag */
orig_node->tt_poss_change = false;