summaryrefslogtreecommitdiffstats
path: root/net/tipc/msg.c
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2015-01-09 02:27:09 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-12 16:24:33 -0500
commit4ac1c8d0ee9faf3a4be185cc4db1381fa0d81280 (patch)
tree361ea817ed30f0dd959ea2d87d658c8d85feebb2 /net/tipc/msg.c
parente05b31f4bf8994d49322e9afb004ad479a129db0 (diff)
tipc: name tipc name table support net namespace
TIPC name table is used to store the mapping relationship between TIPC service name and socket port ID. When tipc supports namespace, it allows users to publish service names only owned by a certain namespace. Therefore, every namespace must have its private name table to prevent service names published to one namespace from being contaminated by other service names in another namespace. Therefore, The name table global variable (ie, nametbl) and its lock must be moved to tipc_net structure, and a parameter of namespace must be added for necessary functions so that they can obtain name table variable defined in tipc_net structure. 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>
Diffstat (limited to 'net/tipc/msg.c')
-rw-r--r--net/tipc/msg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index a38f6a680df1..642fb137463c 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -426,7 +426,7 @@ exit:
426 * Returns 0 (TIPC_OK) if message ok and we can try again, -TIPC error 426 * Returns 0 (TIPC_OK) if message ok and we can try again, -TIPC error
427 * code if message to be rejected 427 * code if message to be rejected
428 */ 428 */
429int tipc_msg_eval(struct sk_buff *buf, u32 *dnode) 429int tipc_msg_eval(struct net *net, struct sk_buff *buf, u32 *dnode)
430{ 430{
431 struct tipc_msg *msg = buf_msg(buf); 431 struct tipc_msg *msg = buf_msg(buf);
432 u32 dport; 432 u32 dport;
@@ -441,7 +441,7 @@ int tipc_msg_eval(struct sk_buff *buf, u32 *dnode)
441 return -TIPC_ERR_NO_NAME; 441 return -TIPC_ERR_NO_NAME;
442 442
443 *dnode = addr_domain(msg_lookup_scope(msg)); 443 *dnode = addr_domain(msg_lookup_scope(msg));
444 dport = tipc_nametbl_translate(msg_nametype(msg), 444 dport = tipc_nametbl_translate(net, msg_nametype(msg),
445 msg_nameinst(msg), 445 msg_nameinst(msg),
446 dnode); 446 dnode);
447 if (!dport) 447 if (!dport)