tipc: fix bug during lookup of multicast destination nodes

In commit 232d07b74a33 ("tipc: improve groupcast scope handling") we
inadvertently broke non-group multicast transmission when changing the
parameter 'domain' to 'scope' in the function
tipc_nametbl_lookup_dst_nodes(). We missed to make the corresponding
change in the calling function, with the result that the lookup always
fails.

A closer anaysis reveals that this parameter is not needed at all.
Non-group multicast is hard coded to use CLUSTER_SCOPE, and in the
current implementation this will be delivered to all matching
destinations except those which are published with NODE_SCOPE on other
nodes. Since such publications never will be visible on the sending node
anyway, it makes no sense to discriminate by scope at all.

We now remove this parameter altogether.

Signed-off-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/tipc/name_table.c b/net/tipc/name_table.c
index 64cdd3c302b0d3cac18ac623dc4c6e879a8df575..ed0457cc99d68184cd066353f3a22eaafbb6fbcc 100644 (file)
--- a/net/tipc/name_table.c
+++ b/net/tipc/name_table.c
@@ -680,8 +680,7 @@ int tipc_nametbl_mc_lookup(struct net *net, u32 type, u32 lower, u32 upper,
  * - Determines if any node local ports overlap
  */
 void tipc_nametbl_lookup_dst_nodes(struct net *net, u32 type, u32 lower,
-                                  u32 upper, u32 scope,
-                                  struct tipc_nlist *nodes)
+                                  u32 upper, struct tipc_nlist *nodes)
 {
        struct sub_seq *sseq, *stop;
        struct publication *publ;
@@ -699,8 +698,7 @@ void tipc_nametbl_lookup_dst_nodes(struct net *net, u32 type, u32 lower,
        for (; sseq != stop && sseq->lower <= upper; sseq++) {
                info = sseq->info;
                list_for_each_entry(publ, &info->zone_list, zone_list) {
-                       if (publ->scope == scope)
-                               tipc_nlist_add(nodes, publ->node);
+                       tipc_nlist_add(nodes, publ->node);
                }
        }
        spin_unlock_bh(&seq->lock);

diff --git a/net/tipc/name_table.h b/net/tipc/name_table.h
index b595d8aa00f0a3f47c95ff862499655b88cff7c4..f56e7cb3d4363f4ee3089f9300903ed4a112684a 100644 (file)
--- a/net/tipc/name_table.h
+++ b/net/tipc/name_table.h
@@ -105,8 +105,7 @@ int tipc_nametbl_mc_lookup(struct net *net, u32 type, u32 lower, u32 upper,
 void tipc_nametbl_build_group(struct net *net, struct tipc_group *grp,
                              u32 type, u32 domain);
 void tipc_nametbl_lookup_dst_nodes(struct net *net, u32 type, u32 lower,
-                                  u32 upper, u32 domain,
-                                  struct tipc_nlist *nodes);
+                                  u32 upper, struct tipc_nlist *nodes);
 bool tipc_nametbl_lookup(struct net *net, u32 type, u32 instance, u32 domain,
                         struct list_head *dsts, int *dstcnt, u32 exclude,
                         bool all);

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index f38264db45ae058645bad642d07dc36245f77f51..d799e50ff7222f4cb3fb4215a5d19dca313a44b1 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -772,7 +772,6 @@ static int tipc_sendmcast(struct  socket *sock, struct tipc_name_seq *seq,
        struct net *net = sock_net(sk);
        int mtu = tipc_bcast_get_mtu(net);
        struct tipc_mc_method *method = &tsk->mc_method;
-       u32 domain = addr_domain(net, TIPC_CLUSTER_SCOPE);
        struct sk_buff_head pkts;
        struct tipc_nlist dsts;
        int rc;
@@ -788,7 +787,7 @@ static int tipc_sendmcast(struct  socket *sock, struct tipc_name_seq *seq,
        /* Lookup destination nodes */
        tipc_nlist_init(&dsts, tipc_own_addr(net));
        tipc_nametbl_lookup_dst_nodes(net, seq->type, seq->lower,
-                                     seq->upper, domain, &dsts);
+                                     seq->upper, &dsts);
        if (!dsts.local && !dsts.remote)
                return -EHOSTUNREACH;