aboutsummaryrefslogtreecommitdiffstats
path: root/package/swconfig
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-02-15 17:29:00 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-02-15 17:29:00 +0000
commit643c4e1303436f248fa6564674a5474ff7c15859 (patch)
tree9672a50f6984955c19bcb7f42ccf31f4ddcef166 /package/swconfig
parentf5d08467e2f10d26d26e5a58ac4f52e450cd2779 (diff)
downloadmaster-187ad058-643c4e1303436f248fa6564674a5474ff7c15859.tar.gz
master-187ad058-643c4e1303436f248fa6564674a5474ff7c15859.tar.bz2
master-187ad058-643c4e1303436f248fa6564674a5474ff7c15859.zip
swconfig: add show command
Add a "show" command, which displays all attributes of the selected port, VLAN, or of the whole switch. Signed-off-by: Martin Mares <mj@ucw.cz> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19640 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/swconfig')
-rw-r--r--package/swconfig/src/cli.c89
1 files changed, 88 insertions, 1 deletions
diff --git a/package/swconfig/src/cli.c b/package/swconfig/src/cli.c
index 64d67b2e27..d8d8e512b2 100644
--- a/package/swconfig/src/cli.c
+++ b/package/swconfig/src/cli.c
@@ -39,6 +39,7 @@ enum {
CMD_SET,
CMD_LOAD,
CMD_HELP,
+ CMD_SHOW,
};
static void
@@ -82,9 +83,79 @@ list_attributes(struct switch_dev *dev)
}
static void
+print_attr_val(const struct switch_attr *attr, const struct switch_val *val)
+{
+ int i;
+
+ switch (attr->type) {
+ case SWITCH_TYPE_INT:
+ printf("%d", val->value.i);
+ break;
+ case SWITCH_TYPE_STRING:
+ printf("%s", val->value.s);
+ break;
+ case SWITCH_TYPE_PORTS:
+ for(i = 0; i < val->len; i++) {
+ printf("%d%s ",
+ val->value.ports[i].id,
+ (val->value.ports[i].flags &
+ SWLIB_PORT_FLAG_TAGGED) ? "t" : "");
+ }
+ break;
+ default:
+ printf("?unknown-type?");
+ }
+}
+
+static void
+show_attrs(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *val)
+{
+ while (attr) {
+ if (attr->type != SWITCH_TYPE_NOVAL) {
+ printf("\t%s: ", attr->name);
+ if (swlib_get_attr(dev, attr, val) < 0)
+ printf("???");
+ else
+ print_attr_val(attr, val);
+ putchar('\n');
+ }
+ attr = attr->next;
+ }
+}
+
+static void
+show_global(struct switch_dev *dev)
+{
+ struct switch_val val;
+
+ printf("Global attributes:\n");
+ show_attrs(dev, dev->ops, &val);
+}
+
+static void
+show_port(struct switch_dev *dev, int port)
+{
+ struct switch_val val;
+
+ printf("Port %d:\n", port);
+ val.port_vlan = port;
+ show_attrs(dev, dev->port_ops, &val);
+}
+
+static void
+show_vlan(struct switch_dev *dev, int vlan)
+{
+ struct switch_val val;
+
+ printf("VLAN %d:\n", vlan);
+ val.port_vlan = vlan;
+ show_attrs(dev, dev->vlan_ops, &val);
+}
+
+static void
print_usage(void)
{
- printf("swconfig dev <dev> [port <port>|vlan <vlan>] (help|set <key> <value>|get <key>|load <config>)\n");
+ printf("swconfig dev <dev> [port <port>|vlan <vlan>] (help|set <key> <value>|get <key>|load <config>|show)\n");
exit(1);
}
@@ -165,6 +236,8 @@ int main(int argc, char **argv)
print_usage();
cmd = CMD_LOAD;
ckey = argv[++i];
+ } else if (!strcmp(arg, "show")) {
+ cmd = CMD_SHOW;
} else {
print_usage();
}
@@ -252,6 +325,20 @@ int main(int argc, char **argv)
case CMD_HELP:
list_attributes(dev);
break;
+ case CMD_SHOW:
+ if (cport >= 0 || cvlan >= 0) {
+ if (cport >= 0)
+ show_port(dev, cport);
+ else
+ show_vlan(dev, cvlan);
+ } 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);
+ }
+ break;
}
out: