swconfig: hide inactive vlans on "swconfig dev switch0 show" (backport of r28133)
authorFelix Fietkau <nbd@openwrt.org>
Tue, 30 Aug 2011 21:01:58 +0000 (21:01 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Tue, 30 Aug 2011 21:01:58 +0000 (21:01 +0000)
SVN-Revision: 28134

package/swconfig/src/cli.c

index eff34fb754fac7f6f2dfb5fab89183bf8fc475fe..9cd16abb5f5286b7630f1e8ae3874d3beaac972e 100644 (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;
 
-       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;
        }