mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
batman-adv: tt: ignore ROAM flag of received ADD changes
A received TT change (OGM diff or full table response) with the ROAM flag
but without DEL is handled by batadv_tt_global_add() like a ROAMING_ADV:
* a newly created global entry gets BATADV_TT_CLIENT_ROAM and is
therefore excluded from the global CRC. The sender has it in its local
CRC and the receiver has to request the full table again
* batadv_tt_global_purge_local() removes the local entry of the
receiver. The receiver's own client is considered as roamed to the sender
and frames for it are rerouted
The ROAM flag only has a meaning together with DEL. Drop it on reception to
keep it from populating the global table with a temporary ROAMING entry
which is not part of the CRC - and therefore causing a CRC mismatch.
Cc: stable@vger.kernel.org
Fixes: 068ee6e204 ("batman-adv: roaming handling mechanism redesign")
Signed-off-by: Sven Eckelmann <sven@narfation.org>
This commit is contained in:
parent
aff4d5d10f
commit
c5d68abe6e
|
|
@ -3941,21 +3941,30 @@ static void _batadv_tt_update_changes(struct batadv_priv *bat_priv,
|
|||
u16 tt_num_changes, u8 ttvn)
|
||||
{
|
||||
int roams;
|
||||
u8 flags;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < tt_num_changes; i++) {
|
||||
if ((tt_change + i)->flags & BATADV_TT_CLIENT_DEL) {
|
||||
roams = (tt_change + i)->flags & BATADV_TT_CLIENT_ROAM;
|
||||
flags = (tt_change + i)->flags;
|
||||
|
||||
if (flags & BATADV_TT_CLIENT_DEL) {
|
||||
roams = flags & BATADV_TT_CLIENT_ROAM;
|
||||
batadv_tt_global_del(bat_priv, orig_node,
|
||||
(tt_change + i)->addr,
|
||||
ntohs((tt_change + i)->vid),
|
||||
"tt removed by changes",
|
||||
roams);
|
||||
} else {
|
||||
/* an announced client cannot have roamed away from
|
||||
* orig_node. Only a ROAMING_ADV is allowed to add a
|
||||
* global entry with the ROAM flag
|
||||
*/
|
||||
flags &= ~BATADV_TT_CLIENT_ROAM;
|
||||
|
||||
if (!batadv_tt_global_add(bat_priv, orig_node,
|
||||
(tt_change + i)->addr,
|
||||
ntohs((tt_change + i)->vid),
|
||||
(tt_change + i)->flags, ttvn))
|
||||
flags, ttvn))
|
||||
/* In case of problem while storing a
|
||||
* global_entry, we stop the updating
|
||||
* procedure without committing the
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user