KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 28133
This commit is contained in:
Felix Fietkau 2011-08-30 21:00:01 +00:00
parent a4ad239191
commit 7f9ad157b9
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 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_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); printf("VLAN %d:\n", vlan);
val.port_vlan = vlan;
show_attrs(dev, dev->vlan_ops, &val); show_attrs(dev, dev->vlan_ops, &val);
} }
@ -312,13 +323,13 @@ int main(int argc, char **argv)
if (cport >= 0) if (cport >= 0)
show_port(dev, cport); show_port(dev, cport);
else else
show_vlan(dev, cvlan); show_vlan(dev, cvlan, false);
} else { } else {
show_global(dev); show_global(dev);
for (i=0; i < dev->ports; i++) for (i=0; i < dev->ports; i++)
show_port(dev, i); show_port(dev, i);
for (i=0; i < dev->vlans; i++) for (i=0; i < dev->vlans; i++)
show_vlan(dev, i); show_vlan(dev, i, true);
} }
break; break;
} }