package/network/utils/iptables: fix PKG_CPE_ID

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

diff --git a/package/network/config/swconfig/src/cli.c b/package/network/config/swconfig/src/cli.c
index 9cd16abb5f5286b7630f1e8ae3874d3beaac972e..2601f346db1301e39b27152923e6bcacf0b50c28 100644 (file)
--- a/package/network/config/swconfig/src/cli.c
+++ b/package/network/config/swconfig/src/cli.c
@@ -1,7 +1,7 @@
 /*
  * swconfig.c: Switch configuration utility
  *
- * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ * Copyright (C) 2008 Felix Fietkau <nbd@nbd.name>
  * Copyright (C) 2010 Martin Mares <mj@ucw.cz>
  *
  * This program is free software; you can redistribute it and/or
@@ -41,6 +41,7 @@ enum {
        CMD_LOAD,
        CMD_HELP,
        CMD_SHOW,
+       CMD_PORTMAP,
 };
 
 static void
@@ -83,9 +84,45 @@ list_attributes(struct switch_dev *dev)
        print_attrs(dev->port_ops);
 }
 
+static const char *
+speed_str(int speed)
+{
+       switch (speed) {
+       case 10:
+               return "10baseT";
+       case 100:
+               return "100baseT";
+       case 1000:
+               return "1000baseT";
+       default:
+               break;
+       }
+
+       return "unknown";
+}
+
+static void
+free_attr_val(const struct switch_attr *attr, const struct switch_val *val)
+{
+       switch (attr->type) {
+       case SWITCH_TYPE_STRING:
+               free(val->value.s);
+               break;
+       case SWITCH_TYPE_PORTS:
+               free(val->value.ports);
+               break;
+       case SWITCH_TYPE_LINK:
+               free(val->value.link);
+               break;
+       default:
+               break;
+       }
+}
+
 static void
 print_attr_val(const struct switch_attr *attr, const struct switch_val *val)
 {
+       struct switch_port_link *link;
        int i;
 
        switch (attr->type) {
@@ -103,6 +140,21 @@ print_attr_val(const struct switch_attr *attr, const struct switch_val *val)
                                 SWLIB_PORT_FLAG_TAGGED) ? "t" : "");
                }
                break;
+       case SWITCH_TYPE_LINK:
+               link = val->value.link;
+               if (link->link)
+                       printf("port:%d link:up speed:%s %s-duplex %s%s%s%s%s",
+                               val->port_vlan,
+                               speed_str(link->speed),
+                               link->duplex ? "full" : "half",
+                               link->tx_flow ? "txflow " : "",
+                               link->rx_flow ? "rxflow " : "",
+                               link->eee & SWLIB_LINK_FLAG_EEE_100BASET ? "eee100 " : "",
+                               link->eee & SWLIB_LINK_FLAG_EEE_1000BASET ? "eee1000 " : "",
+                               link->aneg ? "auto" : "");
+               else
+                       printf("port:%d link:down", val->port_vlan);
+               break;
        default:
                printf("?unknown-type?");
        }
@@ -116,8 +168,10 @@ show_attrs(struct switch_dev *dev, struct switch_attr *attr, struct switch_val *
                        printf("\t%s: ", attr->name);
                        if (swlib_get_attr(dev, attr, val) < 0)
                                printf("???");
-                       else
+                       else {
                                print_attr_val(attr, val);
+                               free_attr_val(attr, val);
+                       }
                        putchar('\n');
                }
                attr = attr->next;
@@ -167,6 +221,7 @@ show_vlan(struct switch_dev *dev, int vlan, bool all)
 static void
 print_usage(void)
 {
+       printf("swconfig list\n");
        printf("swconfig dev <dev> [port <port>|vlan <vlan>] (help|set <key> <value>|get <key>|load <config>|show)\n");
        exit(1);
 }
@@ -176,7 +231,6 @@ swconfig_load_uci(struct switch_dev *dev, const char *name)
 {
        struct uci_context *ctx;
        struct uci_package *p = NULL;
-       struct uci_element *e;
        int ret = -1;
 
        ctx = uci_alloc_context();
@@ -204,7 +258,6 @@ int main(int argc, char **argv)
        struct switch_dev *dev;
        struct switch_attr *a;
        struct switch_val val;
-       int err;
        int i;
 
        int cmd = CMD_NONE;
@@ -213,6 +266,12 @@ int main(int argc, char **argv)
        int cvlan = -1;
        char *ckey = NULL;
        char *cvalue = NULL;
+       char *csegment = NULL;
+
+       if((argc == 2) && !strcmp(argv[1], "list")) {
+               swlib_list();
+               return 0;
+       }
 
        if(argc < 4)
                print_usage();
@@ -246,6 +305,10 @@ int main(int argc, char **argv)
                                print_usage();
                        cmd = CMD_LOAD;
                        ckey = argv[++i];
+               } else if (!strcmp(arg, "portmap")) {
+                       if (i + 1 < argc)
+                               csegment = argv[++i];
+                       cmd = CMD_PORTMAP;
                } else if (!strcmp(arg, "show")) {
                        cmd = CMD_SHOW;
                } else {
@@ -260,7 +323,7 @@ int main(int argc, char **argv)
 
        dev = swlib_connect(cdev);
        if (!dev) {
-               fprintf(stderr, "Failed to connect to the switch\n");
+               fprintf(stderr, "Failed to connect to the switch. Use the \"list\" command to see which switches are available.\n");
                return 1;
        }
 
@@ -277,6 +340,7 @@ int main(int argc, char **argv)
                if(!a)
                {
                        fprintf(stderr, "Unknown attribute \"%s\"\n", ckey);
+                       retval = -1;
                        goto out;
                }
        }
@@ -291,10 +355,10 @@ int main(int argc, char **argv)
                if(cvlan > -1)
                        cport = cvlan;
 
-               if(swlib_set_attr_string(dev, a, cport, cvalue) < 0)
+               retval = swlib_set_attr_string(dev, a, cport, cvalue);
+               if (retval < 0)
                {
-                       fprintf(stderr, "failed\n");
-                       retval = -1;
+                       nl_perror(-retval, "Failed to set attribute");
                        goto out;
                }
                break;
@@ -303,13 +367,14 @@ int main(int argc, char **argv)
                        val.port_vlan = cvlan;
                if(cport > -1)
                        val.port_vlan = cport;
-               if(swlib_get_attr(dev, a, &val) < 0)
+               retval = swlib_get_attr(dev, a, &val);
+               if (retval < 0)
                {
-                       fprintf(stderr, "failed\n");
-                       retval = -1;
+                       nl_perror(-retval, "Failed to get attribute");
                        goto out;
                }
                print_attr_val(a, &val);
+               free_attr_val(a, &val);
                putchar('\n');
                break;
        case CMD_LOAD:
@@ -318,6 +383,9 @@ int main(int argc, char **argv)
        case CMD_HELP:
                list_attributes(dev);
                break;
+       case CMD_PORTMAP:
+               swlib_print_portmap(dev, csegment);
+               break;
        case CMD_SHOW:
                if (cport >= 0 || cvlan >= 0) {
                        if (cport >= 0)
@@ -336,5 +404,5 @@ int main(int argc, char **argv)
 
 out:
        swlib_free_all(dev);
-       return 0;
+       return retval;
 }