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

iproute2: bridge: support vlan range adds 

This patch adds vlan range support to bridge add command
using the newly added vinfo flags BRIDGE_VLAN_INFO_RANGE_BEGIN and
BRIDGE_VLAN_INFO_RANGE_END.

$bridge vlan show
port    vlan ids
br0      1 PVID Egress Untagged

dummy0   1 PVID Egress Untagged

$bridge vlan add vid 10-15 dev dummy0
port    vlan ids
br0      1 PVID Egress Untagged

dummy0   1 PVID Egress Untagged
         10
         11
         12
         13
         14
         15

$bridge vlan del vid 14 dev dummy0

$bridge vlan show
port    vlan ids
br0      1 PVID Egress Untagged

dummy0   1 PVID Egress Untagged
         10
         11
         12
         13
         15

$bridge vlan del vid 10-15 dev dummy0

$bridge vlan show
port    vlan ids
br0      1 PVID Egress Untagged

dummy0   1 PVID Egress Untagged

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: Wilson Kok <wkok@cumulusnetworks.com>
This commit is contained in:
Roopa Prabhu 2015-01-25 18:26:24 -08:00 committed by Stephen Hemminger
parent 86ab59a666
commit 3ac0d36ddd
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
bridge/vlan.c
View File

@ -32,6 +32,7 @@ static int vlan_modify(int cmd, int argc, char **argv)
} req; } req;
char *d = NULL; char *d = NULL;
short vid = -1; short vid = -1;
short vid_end = -1;
struct rtattr *afspec; struct rtattr *afspec;
struct bridge_vlan_info vinfo; struct bridge_vlan_info vinfo;
unsigned short flags = 0; unsigned short flags = 0;
@ -49,8 +50,18 @@ static int vlan_modify(int cmd, int argc, char **argv)
NEXT_ARG(); NEXT_ARG();
d = *argv; d = *argv;
} else if (strcmp(*argv, "vid") == 0) { } else if (strcmp(*argv, "vid") == 0) {
char *p;
NEXT_ARG(); NEXT_ARG();
vid = atoi(*argv); p = strchr(*argv, '-');
if (p) {
*p = '\0';
p++;
vid = atoi(*argv);
vid_end = atoi(p);
vinfo.flags |= BRIDGE_VLAN_INFO_RANGE_BEGIN;
} else {
vid = atoi(*argv);
}
} else if (strcmp(*argv, "self") == 0) { } else if (strcmp(*argv, "self") == 0) {
flags |= BRIDGE_FLAGS_SELF; flags |= BRIDGE_FLAGS_SELF;
} else if (strcmp(*argv, "master") == 0) { } else if (strcmp(*argv, "master") == 0) {
@ -83,15 +94,40 @@ static int vlan_modify(int cmd, int argc, char **argv)
return -1; return -1;
} }
vinfo.vid = vid; if (vinfo.flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
if (vid_end == -1 || vid_end >= 4096 || vid >= vid_end) {
fprintf(stderr, "Invalid VLAN range \"%hu-%hu\"\n",
vid, vid_end);
return -1;
}
if (vinfo.flags & BRIDGE_VLAN_INFO_PVID) {
fprintf(stderr,
"pvid cannot be configured for a vlan range\n");
return -1;
}
}
afspec = addattr_nest(&req.n, sizeof(req), IFLA_AF_SPEC); afspec = addattr_nest(&req.n, sizeof(req), IFLA_AF_SPEC);
if (flags) if (flags)
addattr16(&req.n, sizeof(req), IFLA_BRIDGE_FLAGS, flags); addattr16(&req.n, sizeof(req), IFLA_BRIDGE_FLAGS, flags);
addattr_l(&req.n, sizeof(req), IFLA_BRIDGE_VLAN_INFO, &vinfo, vinfo.vid = vid;
sizeof(vinfo)); if (vid_end != -1) {
/* send vlan range start */
addattr_l(&req.n, sizeof(req), IFLA_BRIDGE_VLAN_INFO, &vinfo,
sizeof(vinfo));
vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN;
/* Now send the vlan range end */
vinfo.flags |= BRIDGE_VLAN_INFO_RANGE_END;
vinfo.vid = vid_end;
addattr_l(&req.n, sizeof(req), IFLA_BRIDGE_VLAN_INFO, &vinfo,
sizeof(vinfo));
} else {
addattr_l(&req.n, sizeof(req), IFLA_BRIDGE_VLAN_INFO, &vinfo,
sizeof(vinfo));
}
addattr_nest_end(&req.n, afspec); addattr_nest_end(&req.n, afspec);