swconfig: remove obsolete portmapping feature

[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 d472086781365b1d441cea18a4bc2c9932557cc9..28b7ed8625cb77fc633daeb2139ff8b23bb52698 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,7 +41,6 @@ enum {
        CMD_LOAD,
        CMD_HELP,
        CMD_SHOW,
-       CMD_PORTMAP,
 };
 
 static void
@@ -84,9 +83,27 @@ 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
 print_attr_val(const struct switch_attr *attr, const struct switch_val *val)
 {
+       struct switch_port_link *link;
        int i;
 
        switch (attr->type) {
@@ -104,6 +121,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?");
        }
@@ -252,10 +284,6 @@ 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 {
@@ -302,10 +330,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;
@@ -314,10 +342,10 @@ 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);
@@ -329,9 +357,6 @@ 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)