X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/8fdfe51f296c8854915b2fbd08f06de62bffe5b6..a24e101ea6b4676daf405968265d8c1aac3215c0:/package/swconfig/src/cli.c

diff --git a/package/swconfig/src/cli.c b/package/swconfig/src/cli.c
index d99eda91d..9cd16abb5 100644
--- a/package/swconfig/src/cli.c
+++ b/package/swconfig/src/cli.c
@@ -2,6 +2,7 @@
  * swconfig.c: Switch configuration utility
  *
  * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2010 Martin Mares <mj@ucw.cz>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -73,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");
@@ -143,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);
 }
 
@@ -195,8 +207,6 @@ int main(int argc, char **argv)
 	int err;
 	int i;
 
-	struct switch_port *ports;
-
 	int cmd = CMD_NONE;
 	char *cdev = NULL;
 	int cport = -1;
@@ -254,8 +264,6 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-	ports = malloc(sizeof(struct switch_port) * dev->ports);
-	memset(ports, 0, sizeof(struct switch_port) * dev->ports);
 	swlib_scan(dev);
 
 	if (cmd == CMD_GET || cmd == CMD_SET) {
@@ -315,20 +323,18 @@ 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;
 	}
 
 out:
 	swlib_free_all(dev);
-	free(ports);
-
 	return 0;
 }