mac80211: rename a misnamed patch

[openwrt.git] / package / swconfig / src / cli.c

diff --git a/package/swconfig/src/cli.c b/package/swconfig/src/cli.c
index 64d67b2..eea88d8 100644 (file)
--- 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
@@ -39,6 +40,7 @@ enum {
        CMD_SET,
        CMD_LOAD,
        CMD_HELP,
+       CMD_SHOW,
 };
 
 static void
@@ -72,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("Switch %d: %s(%s), ports: %d (cpu @ %d), vlans: %d\n", dev->id, dev->dev_name, dev->name, dev->ports, dev->cpu_port, dev->vlans);
        printf("     --switch\n");
        print_attrs(dev->ops);
        printf("     --vlan\n");
@@ -81,10 +83,80 @@ list_attributes(struct switch_dev *dev)
        print_attrs(dev->port_ops);
 }
 
+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);
 }
 
@@ -124,8 +196,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;
@@ -165,6 +235,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();
                }
@@ -181,8 +253,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) {
@@ -228,23 +298,8 @@ int main(int argc, char **argv)
                        retval = -1;
                        goto out;
                }
-               switch(a->type) {
-               case SWITCH_TYPE_INT:
-                       printf("%d\n", val.value.i);
-                       break;
-               case SWITCH_TYPE_STRING:
-                       printf("%s\n", 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" : "");
-                       }
-                       printf("\n");
-                       break;
-               }
+               print_attr_val(a, &val);
+               putchar('\n');
                break;
        case CMD_LOAD:
                swconfig_load_uci(dev, ckey);
@@ -252,11 +307,23 @@ 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:
        swlib_free_all(dev);
-       free(ports);
-
        return 0;
 }