[package] ppp: use service_kill()

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

diff --git a/package/swconfig/src/cli.c b/package/swconfig/src/cli.c
index d8d8e51..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>
  * 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
  *
  * 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)
 {
 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");
        printf("     --switch\n");
        print_attrs(dev->ops);
        printf("     --vlan\n");


@@ -195,8 +196,6 @@ int main(int argc, char **argv)
        int err;
        int i;
 
        int err;
        int i;
 

-       struct switch_port *ports;
-

        int cmd = CMD_NONE;
        char *cdev = NULL;
        int cport = -1;
        int cmd = CMD_NONE;
        char *cdev = NULL;
        int cport = -1;


@@ -254,8 +253,6 @@ int main(int argc, char **argv)
                return 1;
        }
 
                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) {
        swlib_scan(dev);
 
        if (cmd == CMD_GET || cmd == CMD_SET) {


@@ -301,23 +298,8 @@ int main(int argc, char **argv)
                        retval = -1;
                        goto out;
                }
                        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);
                break;
        case CMD_LOAD:
                swconfig_load_uci(dev, ckey);


@@ -343,7 +325,5 @@ int main(int argc, char **argv)
 
 out:
        swlib_free_all(dev);
 
 out:
        swlib_free_all(dev);

-       free(ports);
-

        return 0;
 }
        return 0;
 }