X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4a1626377145dfc5e9107a5d3a5bc67f15888f7a..6f77ae2ecd4cae9aa7e6a84b5874884c04e8ce74:/package/swconfig/src/cli.c

diff --git a/package/swconfig/src/cli.c b/package/swconfig/src/cli.c
index 76593ba14..9cd16abb5 100644
--- a/package/swconfig/src/cli.c
+++ b/package/swconfig/src/cli.c
@@ -74,7 +74,7 @@ print_attrs(const struct switch_attr *attr)
 static void
 list_attributes(struct switch_dev *dev)
 {
-	printf("Switch %d: %s(%s), ports: %d, vlans: %d\n", dev->id, dev->dev_name, dev->name, dev->ports, dev->vlans);
+	printf("%s: %s(%s), ports: %d (cpu @ %d), vlans: %d\n", dev->dev_name, dev->alias, dev->name, dev->ports, dev->cpu_port, dev->vlans);
 	printf("     --switch\n");
 	print_attrs(dev->ops);
 	printf("     --vlan\n");
@@ -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;
 	}