batman-adv: TT_RESPONSE with full table must contain only announced clients
Commit Message
In case of TT_RESPONSE containing a full table, only clients already
announced can be sent. Therefore, clients added after the last OGM
sending must not be sent.
Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
translation-table.c | 12 +++++++++++-
types.h | 1 +
2 files changed, 12 insertions(+), 1 deletions(-)
@@ -211,6 +211,7 @@ void tt_local_add(struct net_device *soft_iface, const uint8_t *addr)
memcpy(tt_local_entry->addr, addr, ETH_ALEN);
tt_local_entry->last_seen = jiffies;
+ tt_local_entry->ttvn = (uint8_t)(atomic_read(&bat_priv->ttvn) + 1);
tt_local_entry->flags = NO_FLAGS;
atomic_set(&tt_local_entry->refcount, 2);
@@ -936,6 +937,14 @@ unlock:
return tt_req_node;
}
+static int tt_local_valid_entry(const void *entry_ptr, const void *data_ptr)
+{
+ const struct tt_local_entry *tt_local_entry = entry_ptr;
+ const struct bat_priv *bat_priv = data_ptr;
+
+ return (tt_local_entry->ttvn <= (uint8_t)atomic_read(&bat_priv->ttvn));
+}
+
static int tt_global_valid_entry(const void *entry_ptr, const void *data_ptr)
{
const struct tt_global_entry *tt_global_entry = entry_ptr;
@@ -1276,7 +1285,8 @@ static bool send_my_tt_response(struct bat_priv *bat_priv,
skb = tt_response_fill_table(tt_len, ttvn,
bat_priv->tt_local_hash,
- primary_if, NULL, NULL);
+ primary_if, tt_local_valid_entry,
+ bat_priv);
if (!skb)
goto out;
@@ -224,6 +224,7 @@ struct socket_packet {
struct tt_local_entry {
uint8_t addr[ETH_ALEN];
unsigned long last_seen;
+ uint8_t ttvn;
uint8_t flags;
atomic_t refcount;
struct rcu_head rcu;