From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 30 Aug 2011 21:01:58 +0000 (+0000)
Subject: swconfig: hide inactive vlans on "swconfig dev switch0 show" (backport of r28133)
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=8489699eb6a4dc57ea8fd437b5154d8fcb9f8e53

swconfig: hide inactive vlans on "swconfig dev switch0 show" (backport of r28133)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28134 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/swconfig/src/cli.c b/package/swconfig/src/cli.c
index eff34fb75..9cd16abb5 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;
 	}