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

vxlan: Make id optional when modifying a link 

Specifying the IFLA_VXLAN_LINK attribute on a vxlan link modify is
optional in the kernel, so make the id argument optional for "ip link
set ..." to avoid a user needing to specify it when changing another
attribute.

Signed-off-by: Robert Shearman <rs823p@att.com>
This commit is contained in:
Robert Shearman 2017-11-28 11:16:50 +00:00 committed by Stephen Hemminger
parent 079e67816e
commit b6fae7887f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ip/iplink_vxlan.c
View File

@ -345,7 +345,7 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
return -1; return -1;
} }
if (!metadata && !VXLAN_ATTRSET(attrs, IFLA_VXLAN_ID)) { if (!metadata && !VXLAN_ATTRSET(attrs, IFLA_VXLAN_ID) && !set_op) {
fprintf(stderr, "vxlan: missing virtual network identifier\n"); fprintf(stderr, "vxlan: missing virtual network identifier\n");
return -1; return -1;
} }
@ -367,7 +367,8 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
"Use 'dstport 0' to get default and quiet this message\n"); "Use 'dstport 0' to get default and quiet this message\n");
} }
addattr32(n, 1024, IFLA_VXLAN_ID, vni); if (VXLAN_ATTRSET(attrs, IFLA_VXLAN_ID))
addattr32(n, 1024, IFLA_VXLAN_ID, vni);
if (gaddr) if (gaddr)
addattr_l(n, 1024, IFLA_VXLAN_GROUP, &gaddr, 4); addattr_l(n, 1024, IFLA_VXLAN_GROUP, &gaddr, 4);
else if (daddr) else if (daddr)