matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tipc: TIPC_NLA_LINK_NAME value pass on nesting entry TIPC_NLA_LINK 

In the commit 94f6a80 on next-net, TIPC_NLA_LINK_NAME attribute should be
retrieved and validated via TIPC_NLA_LINK nesting entry in
tipc_nl_node_get_link().
According to that commit, TIPC_NLA_LINK_NAME value passing via
tipc link get command must follow above hierachy.

Acked-by: Ying Xue <ying.xue@windriver.com>
Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Hoang Le 2018-06-08 09:19:28 +07:00 committed by Stephen Hemminger
parent 974ef93bf1
commit 313ce6949c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tipc/link.c
View File

@ -97,6 +97,7 @@ static int cmd_link_get_prop(struct nlmsghdr *nlh, const struct cmd *cmd,
{ {
int prop; int prop;
char buf[MNL_SOCKET_BUFFER_SIZE]; char buf[MNL_SOCKET_BUFFER_SIZE];
struct nlattr *attrs;
struct opt *opt; struct opt *opt;
struct opt opts[] = { struct opt opts[] = {
{ "link", OPT_KEYVAL, NULL }, { "link", OPT_KEYVAL, NULL },
@ -131,7 +132,9 @@ static int cmd_link_get_prop(struct nlmsghdr *nlh, const struct cmd *cmd,
fprintf(stderr, "error, missing link\n"); fprintf(stderr, "error, missing link\n");
return -EINVAL; return -EINVAL;
} }
attrs = mnl_attr_nest_start(nlh, TIPC_NLA_LINK);
mnl_attr_put_strz(nlh, TIPC_NLA_LINK_NAME, opt->val); mnl_attr_put_strz(nlh, TIPC_NLA_LINK_NAME, opt->val);
mnl_attr_nest_end(nlh, attrs);
return msg_doit(nlh, link_get_cb, &prop); return msg_doit(nlh, link_get_cb, &prop);
} }