Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 15727323d9f8864b2d41930940acc38de987045a Author: Antonio Quartulli ordex@autistici.org Date: Thu Nov 29 04:54:45 2012 +0100

batman-adv: don't print the last_seen time for bat0 TT local entry

bat0 MAC address will never deleted from the local translation table, therefore printing its last_Seen time is useless and will also produce ugly output and eventually a variable overflow.

This was introduced by 59cb0861498776c62bd17584c31f34477fa301a0 ("batman-adv: improve local translation table output")

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

15727323d9f8864b2d41930940acc38de987045a translation-table.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/translation-table.c b/translation-table.c index 9d6aa9d..d4b27b6 100644 --- a/translation-table.c +++ b/translation-table.c @@ -483,6 +483,8 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) int last_seen_secs; int last_seen_msecs; unsigned long last_seen_jiffies; + bool no_purge; + uint16_t np_flag = BATADV_TT_CLIENT_NOPURGE;

primary_if = batadv_seq_print_text_primary_if_get(seq); if (!primary_if) @@ -509,19 +511,21 @@ int batadv_tt_local_seq_print_text(struct seq_file *seq, void *offset) last_seen_secs = last_seen_msecs / 1000; last_seen_msecs = last_seen_msecs % 1000;

+ no_purge = tt_common_entry->flags & np_flag; + seq_printf(seq, " * %pM [%c%c%c%c%c] %3u.%03u\n", tt_common_entry->addr, (tt_common_entry->flags & BATADV_TT_CLIENT_ROAM ? 'R' : '.'), - (tt_common_entry->flags & - BATADV_TT_CLIENT_NOPURGE ? 'P' : '.'), + no_purge ? 'P' : '.', (tt_common_entry->flags & BATADV_TT_CLIENT_NEW ? 'N' : '.'), (tt_common_entry->flags & BATADV_TT_CLIENT_PENDING ? 'X' : '.'), (tt_common_entry->flags & BATADV_TT_CLIENT_WIFI ? 'W' : '.'), - last_seen_secs, last_seen_msecs); + no_purge ? last_seen_secs : 0, + no_purge ? last_seen_msecs : 0); } rcu_read_unlock(); }