| Message ID | 20180606224624.10141-1-linus.luessing@c0d3.blue |
|---|---|
| State | Accepted, archived |
| Commit | beb6246b2339852b6a429ae9259a8eb30a685041 |
| Delegated to: | Simon Wunderlich |
| Headers | show |
| Series | [maint,1/2] batman-adv: Avoid storing non-TT-sync flags on singular entries too | expand |
On Donnerstag, 7. Juni 2018 00:46:23 CEST Linus Lüssing wrote: > Since commit 382d020fe3fa ("batman-adv: fix TT sync flag inconsistencies") > TT sync flags and TT non-sync'd flags are supposed to be stored > separately. > > The previous patch missed to apply this separation on a TT entry with > only a single TT orig entry. > > This is a minor fix because with only a single TT orig entry the DDoS > issue the former patch solves does not apply. > > Fixes: 382d020fe3fa ("batman-adv: fix TT sync flag inconsistencies") > Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue> > --- > net/batman-adv/translation-table.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Added as beb6246b2339 [1] Thanks, Sven [1] https://git.open-mesh.org/batman-adv.git/commit/beb6246b2339852b6a429ae9259a8eb30a685041
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 39865513..61ce3000 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -1705,7 +1705,8 @@ static bool batadv_tt_global_add(struct batadv_priv *bat_priv, ether_addr_copy(common->addr, tt_addr); common->vid = vid; - common->flags = flags; + common->flags = flags & (~BATADV_TT_SYNC_MASK); + tt_global_entry->roam_at = 0; /* node must store current time in case of roaming. This is * needed to purge this entry out on timeout (if nobody claims
Since commit 382d020fe3fa ("batman-adv: fix TT sync flag inconsistencies") TT sync flags and TT non-sync'd flags are supposed to be stored separately. The previous patch missed to apply this separation on a TT entry with only a single TT orig entry. This is a minor fix because with only a single TT orig entry the DDoS issue the former patch solves does not apply. Fixes: 382d020fe3fa ("batman-adv: fix TT sync flag inconsistencies") Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue> --- net/batman-adv/translation-table.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)