qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-10-01 10:58:12 +03:00
Code

swconfig: hide inactive vlans on "swconfig dev switch0 show"

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28133 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2011-08-30 21:00:01 +00:00
parent 22d1073f1c
commit 54bc65b843
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
package/swconfig/src/cli.c
View File

@ -144,12 +144,23 @@ show_port(struct switch_dev *dev, int port)
}
static void
show_vlan(struct switch_dev *dev, int vlan)
show_vlan(struct switch_dev *dev, int vlan, bool all)
{
struct switch_val val;
struct switch_attr *attr;
val.port_vlan = vlan;
if (all) {
attr = swlib_lookup_attr(dev, SWLIB_ATTR_GROUP_VLAN, "ports");
if (swlib_get_attr(dev, attr, &val) < 0)
return;
if (!val.len)
return;
}
printf("VLAN %d:\n", vlan);
val.port_vlan = vlan;
show_attrs(dev, dev->vlan_ops, &val);
}
@ -312,13 +323,13 @@ int main(int argc, char **argv)
if (cport >= 0)
show_port(dev, cport);
else
show_vlan(dev, cvlan);
show_vlan(dev, cvlan, false);
} else {
show_global(dev);
for (i=0; i < dev->ports; i++)
show_port(dev, i);
for (i=0; i < dev->vlans; i++)
show_vlan(dev, i);
show_vlan(dev, i, true);
}
break;
}