tipc: make tipc node address support net namespace
If net namespace is supported in tipc, each namespace will be treated as a separate tipc node. Therefore, every namespace must own its private tipc node address. This means the "tipc_own_addr" global variable of node address must be moved to tipc_net structure to satisfy the requirement. It's turned out that users also can assign node address for every namespace. Signed-off-by: Ying Xue <ying.xue@windriver.com> Tested-by: Tero Aho <Tero.Aho@coriant.com> Reviewed-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
4ac1c8d0ee
commit
3474753954
@@ -36,6 +36,49 @@
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include "addr.h"
|
||||
#include "core.h"
|
||||
|
||||
/**
|
||||
* in_own_cluster - test for cluster inclusion; <0.0.0> always matches
|
||||
*/
|
||||
int in_own_cluster(struct net *net, u32 addr)
|
||||
{
|
||||
return in_own_cluster_exact(net, addr) || !addr;
|
||||
}
|
||||
|
||||
int in_own_cluster_exact(struct net *net, u32 addr)
|
||||
{
|
||||
struct tipc_net *tn = net_generic(net, tipc_net_id);
|
||||
|
||||
return !((addr ^ tn->own_addr) >> 12);
|
||||
}
|
||||
|
||||
/**
|
||||
* in_own_node - test for node inclusion; <0.0.0> always matches
|
||||
*/
|
||||
int in_own_node(struct net *net, u32 addr)
|
||||
{
|
||||
struct tipc_net *tn = net_generic(net, tipc_net_id);
|
||||
|
||||
return (addr == tn->own_addr) || !addr;
|
||||
}
|
||||
|
||||
/**
|
||||
* addr_domain - convert 2-bit scope value to equivalent message lookup domain
|
||||
*
|
||||
* Needed when address of a named message must be looked up a second time
|
||||
* after a network hop.
|
||||
*/
|
||||
u32 addr_domain(struct net *net, u32 sc)
|
||||
{
|
||||
struct tipc_net *tn = net_generic(net, tipc_net_id);
|
||||
|
||||
if (likely(sc == TIPC_NODE_SCOPE))
|
||||
return tn->own_addr;
|
||||
if (sc == TIPC_CLUSTER_SCOPE)
|
||||
return tipc_cluster_mask(tn->own_addr);
|
||||
return tipc_zone_mask(tn->own_addr);
|
||||
}
|
||||
|
||||
/**
|
||||
* tipc_addr_domain_valid - validates a network domain address
|
||||
|
Reference in New Issue
Block a user