Hi Antonio,
On 04/18/2012 12:27 AM, Antonio Quartulli wrote:
During an OGM-interval (time between two different OGM sendings) the same client could roam away and then roam back to us. In this case the node would add two events to the events list (that is going to be sent appended to the next OGM). A DEL one and an ADD one. Obviously they will only increase the overhead (either in the air and on the receiver side) and eventually trigger wrong states/events without producing any real effect.
For this reason we can safely delete any ADD event with its related DEL one.
Signed-off-by: Antonio Quartulliordex@autistici.org
translation-table.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/translation-table.c b/translation-table.c index 88e4c8e..e02fa90 100644 --- a/translation-table.c +++ b/translation-table.c @@ -154,23 +154,48 @@ static void tt_orig_list_entry_free_ref(struct tt_orig_list_entry *orig_entry) static void tt_local_event(struct bat_priv *bat_priv, const uint8_t *addr, uint8_t flags) {
- struct tt_change_node *tt_change_node;
struct tt_change_node *tt_change_node, *entry, *safe;
bool event_removed = false;
tt_change_node = kmalloc(sizeof(*tt_change_node), GFP_ATOMIC);
- if (!tt_change_node) return;
- tt_change_node->change.flags = flags; memcpy(tt_change_node->change.addr, addr, ETH_ALEN);
- /* check for ADD+DEL or DEL+ADD events */ spin_lock_bh(&bat_priv->tt_changes_list_lock);
- list_for_each_entry_safe(entry, safe,&bat_priv->tt_changes_list,
list) {if (!compare_eth(entry->change.addr, addr))continue;
Please add an empty line here.
if (!(!(flags& TT_CLIENT_DEL)&& /* ADD op */entry->change.flags& TT_CLIENT_DEL)&&!(flags& TT_CLIENT_DEL&&!(entry->change.flags& TT_CLIENT_DEL))) /* ADD op */continue;
This is messy and hard to unerstand. Couldn't you use some tmp vars like this:
int local_del = (flags & TT_CLIENT_DEL) == TT_CLIENT_DEL; int change_del = (entry->change.flags & TT_CLIENT_DEL) == TT_CLIENT_DEL;
if (local_del == change_del) continue;
I'm not 100% sure I understood the original if correctly, but that just proofs the need to rework it :)
/* DEL+ADD in the same orig interval have no effect and can be* removed to avoid silly behaviour on the receiver side. The* other way around (ADD+DEL) can happen in case of roaming of* a client still in the NEW state. Roaming of NEW clients is* now possible due to automatically recognition of "temporary"* clients */
Remember newline for */ :)