The following commit has been merged in the maint branch: commit 03a0e3d6098b1bb3b2f43aaf0249a2e471dace61 Author: Marek Lindner lindner_marek@yahoo.de Date: Wed Jun 20 17:16:05 2012 +0200

batman-adv: only drop packets of known wifi clients

If the source or destination mac address of an ethernet packet could not be found in the translation table the packet was dropped if AP isolation was turned on. This behavior would make it impossible to send broadcast packets over the mesh as the broadcast address will never enter the translation table.

Signed-off-by: Marek Lindner lindner_marek@yahoo.de Acked-by: Antonio Quartulli ordex@autistici.org

diff --git a/translation-table.c b/translation-table.c index a66c2dc..660c40f 100644 --- a/translation-table.c +++ b/translation-table.c @@ -2031,10 +2031,10 @@ bool is_ap_isolated(struct bat_priv *bat_priv, uint8_t *src, uint8_t *dst) { struct tt_local_entry *tt_local_entry = NULL; struct tt_global_entry *tt_global_entry = NULL; - bool ret = true; + bool ret = false;

if (!atomic_read(&bat_priv->ap_isolation)) - return false; + goto out;

tt_local_entry = tt_local_hash_find(bat_priv, dst); if (!tt_local_entry) @@ -2044,10 +2044,10 @@ bool is_ap_isolated(struct bat_priv *bat_priv, uint8_t *src, uint8_t *dst) if (!tt_global_entry) goto out;

- if (_is_ap_isolated(tt_local_entry, tt_global_entry)) + if (!_is_ap_isolated(tt_local_entry, tt_global_entry)) goto out;

- ret = false; + ret = true;

out: if (tt_global_entry)