diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-08-30 21:00:01 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-08-30 21:00:01 +0000 |
| commit | 2c5f8a59db59c4b6a2c40817321e8686ea361cfd (patch) | |
| tree | 85b50f321d1746b6aada5e1b83e83abe95a71bdd /package | |
| parent | 2897d25f7002378a6df5c651d3c8334fbfae49fb (diff) | |
| download | upstream-2c5f8a59db59c4b6a2c40817321e8686ea361cfd.tar.gz upstream-2c5f8a59db59c4b6a2c40817321e8686ea361cfd.tar.bz2 upstream-2c5f8a59db59c4b6a2c40817321e8686ea361cfd.zip | |
swconfig: hide inactive vlans on "swconfig dev switch0 show"
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28133 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/swconfig/src/cli.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/package/swconfig/src/cli.c b/package/swconfig/src/cli.c index eff34fb754..9cd16abb5f 100644 --- a/package/swconfig/src/cli.c +++ b/package/swconfig/src/cli.c @@ -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; - printf("VLAN %d:\n", vlan); 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); 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; } |