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] batman-adv: Disallow originator addressing within mesh layer
Date: Thu, 3 Feb 2011 15:41:03 +0100 [thread overview]
Message-ID: <1296744063-11440-1-git-send-email-linus.luessing@ascom.ch> (raw)
For a host in the mesh network, the batman layer should be transparent.
However, we had one exception, data packets within the mesh network
which have the same destination as a originator are being routed to
that node, although there is no host that node's bat0 interface and
therefore gets dropped anyway. This commit removes this exception.
Signed-off-by: Linus Lüssing <linus.luessing@ascom.ch>
---
unicast.c | 22 +++-------------------
1 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/batman-adv/unicast.c b/batman-adv/unicast.c
index 6a9ab61..9b13565 100644
--- a/batman-adv/unicast.c
+++ b/batman-adv/unicast.c
@@ -295,28 +295,12 @@ int unicast_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv)
/* get routing information */
if (is_multicast_ether_addr(ethhdr->h_dest)) {
orig_node = (struct orig_node *)gw_get_selected(bat_priv);
- if (!orig_node)
- goto trans_search;
-
- kref_get(&orig_node->refcount);
- goto find_router;
- } else {
- rcu_read_lock();
- orig_node = ((struct orig_node *)hash_find(bat_priv->orig_hash,
- compare_orig,
- choose_orig,
- ethhdr->h_dest));
- if (!orig_node) {
- rcu_read_unlock();
- goto trans_search;
+ if (orig_node) {
+ kref_get(&orig_node->refcount);
+ goto find_router;
}
-
- kref_get(&orig_node->refcount);
- rcu_read_unlock();
- goto find_router;
}
-trans_search:
/* check for hna host - increases orig_node refcount */
orig_node = transtable_search(bat_priv, ethhdr->h_dest);
--
1.7.2.3
next reply other threads:[~2011-02-03 14:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-03 14:41 Linus Lüssing [this message]
2011-02-07 0:11 ` [B.A.T.M.A.N.] [PATCH] batman-adv: Disallow originator addressing within mesh layer Marek Lindner
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=1296744063-11440-1-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