[B.A.T.M.A.N.] [PATCHv4] batman-adv: pass the WIFI flag from the local to global entry

[B.A.T.M.A.N.] [PATCHv4] batman-adv: pass the WIFI flag from the local to global entry

[Antonio Quartulli]

in case of client roaming a new global entry is added while a corresponding
local one is still present. In this case the node can safely pass the WIFI flag
from the local to the global entry.

This change is required to let the AP-isolation correctly working in case of
roaming: if a generic WIFI client C roams from node A to B, A adds a global
entry for C without adding any WIFI flag. The latter will be set only later,
once A has received C's advertisement from B. In this time period the
AP-Isolation (if enabled) would not correctly work since C is not marked as
WIFI, so allowing it to communicate with other WIFI clients.

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---

v4:
- rebased on top of the latest master
- added kernel doc for __batadv_tt_local_remove

 translation-table.c |   43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/translation-table.c b/translation-table.c
index 42a74e3..cacf7b7 100644
--- a/translation-table.c
+++ b/translation-table.c
@@ -489,21 +489,37 @@ batadv_tt_local_set_pending(struct batadv_priv *bat_priv,
 		   tt_local_entry->common.addr, message);
 }
 
+/**
+ * __batadv_tt_local_remove - logically deletes an entry from the local table
+ * @bat_priv: the bat priv with all the soft interface information
+ * @tt_local: the local entry to delete
+ * @message: the message to append to the log on deletion
+ * @roaming: true if the deletion is due to a roaming event
+ */
+static void __batadv_tt_local_remove(struct batadv_priv *bat_priv,
+				     struct batadv_tt_local_entry *tt_local,
+				     const char *message, bool roaming)
+{
+	uint16_t flags;
+
+	flags = BATADV_TT_CLIENT_DEL;
+	if (roaming)
+		flags |= BATADV_TT_CLIENT_ROAM;
+
+	batadv_tt_local_set_pending(bat_priv, tt_local, flags, message);
+}
+
 void batadv_tt_local_remove(struct batadv_priv *bat_priv, const uint8_t *addr,
 			    const char *message, bool roaming)
 {
 	struct batadv_tt_local_entry *tt_local_entry = NULL;
-	uint16_t flags;
 
 	tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr);
 	if (!tt_local_entry)
 		goto out;
 
-	flags = BATADV_TT_CLIENT_DEL;
-	if (roaming)
-		flags |= BATADV_TT_CLIENT_ROAM;
+	__batadv_tt_local_remove(bat_priv, tt_local_entry, message, roaming);
 
-	batadv_tt_local_set_pending(bat_priv, tt_local_entry, flags, message);
 out:
 	if (tt_local_entry)
 		batadv_tt_local_entry_free_ref(tt_local_entry);
@@ -710,9 +726,11 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv,
 			 uint8_t ttvn)
 {
 	struct batadv_tt_global_entry *tt_global_entry = NULL;
+	struct batadv_tt_local_entry *tt_local_entry = NULL;
 	int ret = 0;
 	int hash_added;
 	struct batadv_tt_common_entry *common;
+	uint16_t wifi_flag;
 
 	tt_global_entry = batadv_tt_global_hash_find(bat_priv, tt_addr);
 
@@ -779,13 +797,22 @@ int batadv_tt_global_add(struct batadv_priv *bat_priv,
 	ret = 1;
 
 out_remove:
+	tt_local_entry = batadv_tt_local_hash_find(bat_priv, tt_addr);
+	if (!tt_local_entry)
+		goto out;
+
+	wifi_flag = tt_local_entry->common.flags & BATADV_TT_CLIENT_WIFI;
+	tt_global_entry->common.flags |= wifi_flag;
+
 	/* remove address from local hash if present */
-	batadv_tt_local_remove(bat_priv, tt_global_entry->common.addr,
-			       "global tt received",
-			       flags & BATADV_TT_CLIENT_ROAM);
+	__batadv_tt_local_remove(bat_priv, tt_local_entry, "global tt received",
+				 flags & BATADV_TT_CLIENT_ROAM);
+
 out:
 	if (tt_global_entry)
 		batadv_tt_global_entry_free_ref(tt_global_entry);
+	if (tt_local_entry)
+		batadv_tt_local_entry_free_ref(tt_local_entry);
 	return ret;
 }
 
-- 
1.7.9.4

Re: [B.A.T.M.A.N.] [PATCHv4] batman-adv: pass the WIFI flag from the local to global entry

[Marek Lindner]

On Friday, August 24, 2012 17:43:06 Antonio Quartulli wrote:
> @@ -779,13 +797,22 @@ int batadv_tt_global_add(struct batadv_priv
> *bat_priv, ret = 1;
>  
>  out_remove:
> +       tt_local_entry = batadv_tt_local_hash_find(bat_priv, tt_addr);
> +       if (!tt_local_entry)
> +               goto out;
> +
> +       wifi_flag = tt_local_entry->common.flags & BATADV_TT_CLIENT_WIFI;
> +       tt_global_entry->common.flags |= wifi_flag;
> +
>         /* remove address from local hash if present */
> -       batadv_tt_local_remove(bat_priv, tt_global_entry->common.addr,
> -                              "global tt received",
> -                              flags & BATADV_TT_CLIENT_ROAM);
> +       __batadv_tt_local_remove(bat_priv, tt_local_entry, "global tt
> received", +                                flags &
> BATADV_TT_CLIENT_ROAM);
> +
>  out:
>         if (tt_global_entry)
>                 batadv_tt_global_entry_free_ref(tt_global_entry);
> +       if (tt_local_entry)
> +               batadv_tt_local_entry_free_ref(tt_local_entry);
>         return ret;
>  }

Wouldn't it be much simplier if batadv_tt_local_remove() returned the tt_local 
flags somehow ?

Cheers,
Marek