diff mbox

batman-adv: delete global entry in case of roaming

Message ID 1323034707-25325-1-git-send-email-ordex@autistici.org (mailing list archive)
State Accepted, archived
Headers

Commit Message

Antonio Quartulli Dec. 4, 2011, 9:38 p.m. UTC 
  When receiving a DEL change for a client due to a roaming event (change is
marked with TT_CLIENT_ROAM), each node  has to check if the client roamed
to itself or somewhere else.

In the latter case the global entry is kept to avoid having no route at all
otherwise we can safely delete the global entry

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
---
 translation-table.c |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

Comments

Marek Lindner Dec. 5, 2011, 6:41 p.m. UTC | #1 
On Monday, December 05, 2011 05:38:27 Antonio Quartulli wrote:
> diff --git a/translation-table.c b/translation-table.c
> index cf3e2c2..6e01079 100644
> --- a/translation-table.c
> +++ b/translation-table.c
> @@ -663,6 +663,7 @@ void tt_global_del(struct bat_priv *bat_priv,
>  		   const char *message, bool roaming)
>  {
>  	struct tt_global_entry *tt_global_entry = NULL;
> +	struct tt_local_entry *tt_local_entry = NULL

Please make sure that your patch at least(!) compiles before you send it to 
the list. It also would be nice if the patches destined for the maint branch 
were based on based on this very branch. Saves some time and (merge) hair ..
 
Applied in revision db10af5.

Thanks,
Marek
Antonio Quartulli Dec. 5, 2011, 11:33 p.m. UTC | #2 
On Tue, Dec 06, 2011 at 02:41:59AM +0800, Marek Lindner wrote:
> Please make sure that your patch at least(!) compiles before you send it to 
> the list. It also would be nice if the patches destined for the maint branch 
> were based on based on this very branch. Saves some time and (merge) hair ..

Woops, I overlooked too many stuff this time! Thank you for your patience!
Ehm..I'm sorry for your hair!

>  
> Applied in revision db10af5.
> 

Thanks.


Cheers,
diff mbox

Patch

diff --git a/translation-table.c b/translation-table.c
index cf3e2c2..6e01079 100644
--- a/translation-table.c
+++ b/translation-table.c
@@ -663,6 +663,7 @@  void tt_global_del(struct bat_priv *bat_priv,
 		   const char *message, bool roaming)
 {
 	struct tt_global_entry *tt_global_entry = NULL;
+	struct tt_local_entry *tt_local_entry = NULL
 
 	tt_global_entry = tt_global_hash_find(bat_priv, addr);
 	if (!tt_global_entry)
@@ -670,15 +671,29 @@  void tt_global_del(struct bat_priv *bat_priv,
 
 	if (tt_global_entry->orig_node == orig_node) {
 		if (roaming) {
-			tt_global_entry->common.flags |= TT_CLIENT_ROAM;
-			tt_global_entry->roam_at = jiffies;
-			goto out;
+			/* if we are deleting a global entry due to a roam
+			 * event, there are two possibilities:
+			 * 1) the client roamed from node A to node B => we mark
+			 *    it with TT_CLIENT_ROAM, we start a timer and we
+			 *    wait for node B to claim it. In case of timeout
+			 *    the entry is purged.
+			 * 2) the client roamed to us => we can directly delete
+			 *    the global entry, since it is useless now. */
+			tt_local_entry = tt_local_hash_find(bat_priv,
+							tt_global_entry->addr);
+			if (!tt_local_entry) {
+				tt_global_entry->common.flags |= TT_CLIENT_ROAM;
+				tt_global_entry->roam_at = jiffies;
+				goto out;
+			}
 		}
 		_tt_global_del(bat_priv, tt_global_entry, message);
 	}
 out:
 	if (tt_global_entry)
 		tt_global_entry_free_ref(tt_global_entry);
+	if (tt_local_entry)
+		tt_local_entry_free_ref(tt_local_entry);
 }
 
 void tt_global_del_orig(struct bat_priv *bat_priv,