aboutsummaryrefslogtreecommitdiff
path: root/net/tipc
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2008-07-14 22:44:32 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-14 22:44:32 -0700
commit08d2cf0f74b3ee5e773bb906043a0efe96ded229 (patch)
treec89d7c7a596e0e836109ba0758712642df7649a3 /net/tipc
parent0e35fd5e5264bb46d1febbe9cd9aa08421c21a96 (diff)
downloadlinux-2.6.34-ux500-08d2cf0f74b3ee5e773bb906043a0efe96ded229.tar.gz
tipc: Fix bug in scope checking for multicast messages
This patch ensures that TIPC's multicast message name lookup algorithm does individualized scope checking for each published name it examines. Previously, scope checking was only done for the first name in a name table publication list, which could result in incoming multicast messages being delivered to ports publishing names with "node" scope, or not being delivered to ports publishing names with "cluster" or "zone" scope. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
-rw-r--r--net/tipc/name_table.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 096f7bd240a..1e53b0c8e73 100644
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -710,9 +710,11 @@ int tipc_nametbl_mc_translate(u32 type, u32 lower, u32 upper, u32 limit,
if (sseq->lower > upper)
break;
publ = sseq->cluster_list;
- if (publ && (publ->scope <= limit))
+ if (publ)
do {
- if (publ->node == tipc_own_addr)
+ if (publ->scope > limit)
+ /* ignore out-of-scope publication */ ;
+ else if (publ->node == tipc_own_addr)
tipc_port_list_add(dports, publ->ref);
else
res = 1;