Commit 27c21416 authored by Richard Alpe's avatar Richard Alpe Committed by David S. Miller

tipc: add net set to new netlink api

Add TIPC_NL_NET_SET command to the new tipc netlink API.

This command can set the network id and network (tipc) address.

Netlink logical layout of network set message:
-> net
     [ -> id ]
     [ -> address ]
Signed-off-by: default avatarRichard Alpe <richard.alpe@ericsson.com>
Reviewed-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Acked-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fd3cf2ad
...@@ -54,6 +54,7 @@ enum { ...@@ -54,6 +54,7 @@ enum {
TIPC_NL_MEDIA_SET, TIPC_NL_MEDIA_SET,
TIPC_NL_NODE_GET, TIPC_NL_NODE_GET,
TIPC_NL_NET_GET, TIPC_NL_NET_GET,
TIPC_NL_NET_SET,
__TIPC_NL_CMD_MAX, __TIPC_NL_CMD_MAX,
TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1 TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1
...@@ -139,6 +140,7 @@ enum { ...@@ -139,6 +140,7 @@ enum {
enum { enum {
TIPC_NLA_NET_UNSPEC, TIPC_NLA_NET_UNSPEC,
TIPC_NLA_NET_ID, /* u32 */ TIPC_NLA_NET_ID, /* u32 */
TIPC_NLA_NET_ADDR, /* u32 */
__TIPC_NLA_NET_MAX, __TIPC_NLA_NET_MAX,
TIPC_NLA_NET_MAX = __TIPC_NLA_NET_MAX - 1 TIPC_NLA_NET_MAX = __TIPC_NLA_NET_MAX - 1
......
...@@ -197,3 +197,50 @@ int tipc_nl_net_dump(struct sk_buff *skb, struct netlink_callback *cb) ...@@ -197,3 +197,50 @@ int tipc_nl_net_dump(struct sk_buff *skb, struct netlink_callback *cb)
return skb->len; return skb->len;
} }
int tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info)
{
int err;
struct nlattr *attrs[TIPC_NLA_NET_MAX + 1];
if (!info->attrs[TIPC_NLA_NET])
return -EINVAL;
err = nla_parse_nested(attrs, TIPC_NLA_NET_MAX,
info->attrs[TIPC_NLA_NET],
tipc_nl_net_policy);
if (err)
return err;
if (attrs[TIPC_NLA_NET_ID]) {
u32 val;
/* Can't change net id once TIPC has joined a network */
if (tipc_own_addr)
return -EPERM;
val = nla_get_u32(attrs[TIPC_NLA_NET_ID]);
if (val < 1 || val > 9999)
return -EINVAL;
tipc_net_id = val;
}
if (attrs[TIPC_NLA_NET_ADDR]) {
u32 addr;
/* Can't change net addr once TIPC has joined a network */
if (tipc_own_addr)
return -EPERM;
addr = nla_get_u32(attrs[TIPC_NLA_NET_ADDR]);
if (!tipc_addr_node_valid(addr))
return -EINVAL;
rtnl_lock();
tipc_net_start(addr);
rtnl_unlock();
}
return 0;
}
...@@ -44,5 +44,6 @@ int tipc_net_start(u32 addr); ...@@ -44,5 +44,6 @@ int tipc_net_start(u32 addr);
void tipc_net_stop(void); void tipc_net_stop(void);
int tipc_nl_net_dump(struct sk_buff *skb, struct netlink_callback *cb); int tipc_nl_net_dump(struct sk_buff *skb, struct netlink_callback *cb);
int tipc_nl_net_set(struct sk_buff *skb, struct genl_info *info);
#endif #endif
...@@ -180,6 +180,11 @@ static const struct genl_ops tipc_genl_v2_ops[] = { ...@@ -180,6 +180,11 @@ static const struct genl_ops tipc_genl_v2_ops[] = {
.cmd = TIPC_NL_NET_GET, .cmd = TIPC_NL_NET_GET,
.dumpit = tipc_nl_net_dump, .dumpit = tipc_nl_net_dump,
.policy = tipc_nl_policy, .policy = tipc_nl_policy,
},
{
.cmd = TIPC_NL_NET_SET,
.doit = tipc_nl_net_set,
.policy = tipc_nl_policy,
} }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment