From: "Linus Lüssing" <linus.luessing@ascom.ch>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: "Linus Lüssing" <linus.luessing@ascom.ch>
Subject: [B.A.T.M.A.N.] [PATCH 05/11] batman-adv: Purge outdated ndp neighbours
Date: Fri, 14 Jan 2011 01:59:48 +0100 [thread overview]
Message-ID: <1294966794-17780-6-git-send-email-linus.luessing@ascom.ch> (raw)
In-Reply-To: <1294966794-17780-1-git-send-email-linus.luessing@ascom.ch>
If no new packet has been received from a neighbour for a while, then
delete it from memory.
Signed-off-by: Linus Lüssing <linus.luessing@ascom.ch>
---
ndp.c | 28 ++++++++++++++++++++++++++++
ndp.h | 1 +
originator.c | 2 ++
3 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/batman-adv/ndp.c b/batman-adv/ndp.c
index 90712b6..5be2639 100644
--- a/batman-adv/ndp.c
+++ b/batman-adv/ndp.c
@@ -22,6 +22,7 @@
#include "main.h"
#include "send.h"
#include "ndp.h"
+#include "hard-interface.h"
#include "originator.h"
/* when do we schedule our own neighbor discovery packet to be sent */
@@ -221,6 +222,33 @@ static struct neigh_node *ndp_create_neighbor(uint8_t my_tq, uint32_t seqno,
return neigh_node;
}
+void ndp_purge_neighbors(void)
+{
+ struct neigh_node *neigh_node;
+ struct hlist_node *node, *node_tmp;
+ struct batman_if *batman_if;
+
+ rcu_read_lock();
+ list_for_each_entry_rcu(batman_if, &if_list, list) {
+ if (batman_if->if_status != IF_ACTIVE)
+ continue;
+
+ spin_lock_bh(&batman_if->neigh_list_lock);
+ hlist_for_each_entry_safe(neigh_node, node, node_tmp,
+ &batman_if->neigh_list, list) {
+ if (time_before(jiffies, neigh_node->last_valid +
+ msecs_to_jiffies(PURGE_TIMEOUT *
+ 1000)))
+ continue;
+
+ hlist_del(&neigh_node->list);
+ kfree(neigh_node);
+ }
+ spin_unlock_bh(&batman_if->neigh_list_lock);
+ }
+ rcu_read_unlock();
+}
+
int ndp_update_neighbor(uint8_t my_tq, uint32_t seqno,
struct batman_if *batman_if, uint8_t *neigh_addr)
{
diff --git a/batman-adv/ndp.h b/batman-adv/ndp.h
index 2496c3f..a828362 100644
--- a/batman-adv/ndp.h
+++ b/batman-adv/ndp.h
@@ -29,6 +29,7 @@ int ndp_init(struct batman_if *batman_if);
void ndp_free(struct batman_if *batman_if);
uint8_t ndp_fetch_tq(struct batman_packet_ndp *packet,
uint8_t *my_if_addr);
+void ndp_purge_neighbors(void);
int ndp_update_neighbor(uint8_t my_tq, uint32_t seqno,
struct batman_if *batman_if, uint8_t *neigh_addr);
diff --git a/batman-adv/originator.c b/batman-adv/originator.c
index c043bf8..e98add5 100644
--- a/batman-adv/originator.c
+++ b/batman-adv/originator.c
@@ -22,6 +22,7 @@
/* increase the reference counter for this originator */
#include "main.h"
+#include "ndp.h"
#include "originator.h"
#include "hash.h"
#include "translation-table.h"
@@ -334,6 +335,7 @@ static void purge_orig(struct work_struct *work)
container_of(delayed_work, struct bat_priv, orig_work);
_purge_orig(bat_priv);
+ ndp_purge_neighbors();
start_purge_timer(bat_priv);
}
--
1.7.1
next prev parent reply other threads:[~2011-01-14 0:59 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-14 0:59 [B.A.T.M.A.N.] NDP patches v5 Linus Lüssing
2011-01-14 0:59 ` [B.A.T.M.A.N.] [PATCH 01/11] batman-adv: Rename packet type / structure / functions for OGMs Linus Lüssing
2011-01-14 0:59 ` [B.A.T.M.A.N.] [PATCH 02/11] batman-adv: Adding workqueue for new ndp packets Linus Lüssing
2011-01-14 0:59 ` [B.A.T.M.A.N.] [PATCH 03/11] batman-adv: Send neighbor discovery packets Linus Lüssing
2011-01-15 13:53 ` Andrew Lunn
2011-01-14 0:59 ` [B.A.T.M.A.N.] [PATCH 04/11] batman-adv: Creating neighbor structures, updating LQs Linus Lüssing
2011-01-15 14:14 ` Andrew Lunn
2011-01-14 0:59 ` Linus Lüssing [this message]
2011-01-14 0:59 ` [B.A.T.M.A.N.] [PATCH 06/11] batman-adv: Adding ndp debugfs output Linus Lüssing
2011-01-14 0:59 ` [B.A.T.M.A.N.] [PATCH 07/11] batman-adv: Adding batman_if specific sysfs wrapper macros for UINT Linus Lüssing
2011-01-14 0:59 ` [B.A.T.M.A.N.] [PATCH 08/11] batman-adv: Adding sysfs parameter for ndp interval Linus Lüssing
2011-01-14 0:59 ` [B.A.T.M.A.N.] [PATCH 09/11] batman-adv: Use local tq values determined by NDP on OGMs Linus Lüssing
2011-01-14 0:59 ` [B.A.T.M.A.N.] [PATCH 10/11] batman-adv: Use rcu locking + ref-counting for neigh_list Linus Lüssing
2011-01-14 0:59 ` [B.A.T.M.A.N.] [PATCH 11/11] batman-adv: Adding sysfs ABI documentation for ndp_interval Linus Lüssing
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1294966794-17780-6-git-send-email-linus.luessing@ascom.ch \
--to=linus.luessing@ascom.ch \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).