Commit 17071578888c7c18709e48e74fae228c04581b9a
Committed by
Marek Lindner
Marek Lindner
1 parent
dcd6c92267
batman-adv: add tt_initialised flag to the orig_node struct
(ttvn == 0) is currently used as initial condition. However this is not a good idea because ttvn gets the vale zero each time after reaching the maximum value (wrap around). For this reason a new flag is added in order to define whether a node has an initialised table or not. Moreover, after invoking tt_global_del_orig(), tt_initialised has to be set to false Reported-by: Alexey Fisher <bug-track@fisher-privat.net> Signed-off-by: Antonio Quartulli <ordex@autistici.org> Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de> Tested-by: Alexey Fisher <bug-track@fisher-privat.net> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Showing 3 changed files with 10 additions and 3 deletions Side-by-side Diff
net/batman-adv/originator.c
net/batman-adv/translation-table.c
| ... | ... | @@ -733,6 +733,7 @@ |
| 733 | 733 | spin_unlock_bh(list_lock); |
| 734 | 734 | } |
| 735 | 735 | atomic_set(&orig_node->tt_size, 0); |
| 736 | + orig_node->tt_initialised = false; | |
| 736 | 737 | } |
| 737 | 738 | |
| 738 | 739 | static void tt_global_roam_purge(struct bat_priv *bat_priv) |
| ... | ... | @@ -1450,6 +1451,7 @@ |
| 1450 | 1451 | */ |
| 1451 | 1452 | return; |
| 1452 | 1453 | } |
| 1454 | + orig_node->tt_initialised = true; | |
| 1453 | 1455 | } |
| 1454 | 1456 | |
| 1455 | 1457 | static void tt_fill_gtable(struct bat_priv *bat_priv, |
| ... | ... | @@ -1854,8 +1856,10 @@ |
| 1854 | 1856 | uint8_t orig_ttvn = (uint8_t)atomic_read(&orig_node->last_ttvn); |
| 1855 | 1857 | bool full_table = true; |
| 1856 | 1858 | |
| 1857 | - /* the ttvn increased by one -> we can apply the attached changes */ | |
| 1858 | - if (ttvn - orig_ttvn == 1) { | |
| 1859 | + /* orig table not initialised AND first diff is in the OGM OR the ttvn | |
| 1860 | + * increased by one -> we can apply the attached changes */ | |
| 1861 | + if ((!orig_node->tt_initialised && ttvn == 1) || | |
| 1862 | + ttvn - orig_ttvn == 1) { | |
| 1859 | 1863 | /* the OGM could not contain the changes due to their size or |
| 1860 | 1864 | * because they have already been sent TT_OGM_APPEND_MAX times. |
| 1861 | 1865 | * In this case send a tt request */ |
| ... | ... | @@ -1889,7 +1893,8 @@ |
| 1889 | 1893 | } else { |
| 1890 | 1894 | /* if we missed more than one change or our tables are not |
| 1891 | 1895 | * in sync anymore -> request fresh tt data */ |
| 1892 | - if (ttvn != orig_ttvn || orig_node->tt_crc != tt_crc) { | |
| 1896 | + if (!orig_node->tt_initialised || ttvn != orig_ttvn || | |
| 1897 | + orig_node->tt_crc != tt_crc) { | |
| 1893 | 1898 | request_table: |
| 1894 | 1899 | bat_dbg(DBG_TT, bat_priv, "TT inconsistency for %pM. " |
| 1895 | 1900 | "Need to retrieve the correct information " |
net/batman-adv/types.h
| ... | ... | @@ -81,6 +81,7 @@ |
| 81 | 81 | int16_t tt_buff_len; |
| 82 | 82 | spinlock_t tt_buff_lock; /* protects tt_buff */ |
| 83 | 83 | atomic_t tt_size; |
| 84 | + bool tt_initialised; | |
| 84 | 85 | /* The tt_poss_change flag is used to detect an ongoing roaming phase. |
| 85 | 86 | * If true, then I sent a Roaming_adv to this orig_node and I have to |
| 86 | 87 | * inspect every packet directed to it to check whether it is still |