diff options
| -rw-r--r-- | include/netlink/cli/class.h | 5 | ||||
| -rw-r--r-- | src/.gitignore | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/lib/class.c | 14 | ||||
| -rw-r--r-- | src/nl-class-delete.c | 134 |
5 files changed, 153 insertions, 5 deletions
diff --git a/include/netlink/cli/class.h b/include/netlink/cli/class.h index 9c17761..e73cd46 100644 --- a/include/netlink/cli/class.h +++ b/include/netlink/cli/class.h @@ -15,11 +15,8 @@ #include <netlink/route/class.h> #include <netlink/route/class-modules.h> -#define nl_cli_class_alloc_cache(sk) \ - nl_cli_alloc_cache((sk), "traffic classes", \ - rtnl_class_alloc_cache) - extern struct rtnl_class *nl_cli_class_alloc(void); +extern struct nl_cache *nl_cli_class_alloc_cache(struct nl_sock *, int); extern void nl_cli_class_parse_dev(struct rtnl_class *, struct nl_cache *, char *); extern void nl_cli_class_parse_parent(struct rtnl_class *, char *); diff --git a/src/.gitignore b/src/.gitignore index cacaa3c..d5fdaa8 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -22,6 +22,7 @@ nl-qdisc-add nl-qdisc-delete nl-qdisc-list nl-class-add +nl-class-delete nl-route-add nl-route-delete nl-route-list diff --git a/src/Makefile.am b/src/Makefile.am index 1c0bcc4..5cd10af 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,7 @@ AM_LDFLAGS = -L${top_builddir}/lib -L${top_builddir}/src/lib -lnl-cli sbin_PROGRAMS = \ nl-qdisc-add nl-qdisc-list nl-qdisc-delete \ - nl-class-add \ + nl-class-add nl-class-delete \ nl-classid-lookup noinst_PROGRAMS = \ @@ -79,6 +79,8 @@ nl_qdisc_list_LDADD = -lnl-route nl_class_add_SOURCES = nl-class-add.c nl_class_add_LDADD = -lnl-route +nl_class_delete_SOURCES = nl-class-delete.c +nl_class_delete_LDADD = -lnl-route nl_route_add_SOURCES = nl-route-add.c nl_route_add_LDADD = -lnl-route diff --git a/src/lib/class.c b/src/lib/class.c index 93346d5..4f6ba30 100644 --- a/src/lib/class.c +++ b/src/lib/class.c @@ -29,6 +29,20 @@ struct rtnl_class *nl_cli_class_alloc(void) return class; } +struct nl_cache *nl_cli_class_alloc_cache(struct nl_sock *sock, int ifindex) +{ + struct nl_cache *cache; + int err; + + if ((err = rtnl_class_alloc_cache(sock, ifindex, &cache)) < 0) + nl_cli_fatal(err, "Unable to allocate class cache: %s", + nl_geterror(err)); + + nl_cache_mngt_provide(cache); + + return cache; +} + void nl_cli_class_parse_dev(struct rtnl_class *class, struct nl_cache *link_cache, char *arg) { int ival; diff --git a/src/nl-class-delete.c b/src/nl-class-delete.c new file mode 100644 index 0000000..94b11d0 --- /dev/null +++ b/src/nl-class-delete.c @@ -0,0 +1,134 @@ +/* + * src/nl-class-delete.c Delete Traffic Classes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * Copyright (c) 2010 Thomas Graf <tgraf@suug.ch> + */ + +#include <netlink/cli/utils.h> +#include <netlink/cli/class.h> +#include <netlink/cli/link.h> + +static int quiet = 0, default_yes = 0, deleted = 0, interactive = 0; +struct nl_sock *sock; + +static void print_usage(void) +{ + printf( + "Usage: nl-class-delete [OPTION]... [class]\n" + "\n" + "OPTIONS\n" + " --interactive Run interactively.\n" + " --yes Set default answer to yes.\n" + " -q, --quiet Do not print informal notifications.\n" + " -h, --help Show this help text and exit.\n" + " -v, --version Show versioning information and exit.\n" + "\n" + " -d, --dev=DEV Device the class is attached to.\n" + " -p, --parent=ID Identifier of parent qdisc/class.\n" + " -i, --id=ID Identifier\n" + " -k, --kind=NAME Kind of class (e.g. pfifo_fast)\n" + "\n" + "EXAMPLE\n" + " # Delete all classes on eth0 attached to parent 1:\n" + " $ nl-class-delete --dev eth0 --parent 1:\n" + "\n" + ); + + exit(0); +} + +static void delete_cb(struct nl_object *obj, void *arg) +{ + struct rtnl_class *class = nl_object_priv(obj); + struct nl_dump_params params = { + .dp_type = NL_DUMP_LINE, + .dp_fd = stdout, + }; + int err; + + if (interactive && !nl_cli_confirm(obj, ¶ms, default_yes)) + return; + + if ((err = rtnl_class_delete(sock, class)) < 0) + nl_cli_fatal(err, "Unable to delete class: %s\n", nl_geterror(err)); + + if (!quiet) { + printf("Deleted "); + nl_object_dump(obj, ¶ms); + } + + deleted++; +} + +int main(int argc, char *argv[]) +{ + struct rtnl_class *class; + struct nl_cache *link_cache, *class_cache; + + sock = nl_cli_alloc_socket(); + nl_cli_connect(sock, NETLINK_ROUTE); + link_cache = nl_cli_link_alloc_cache(sock); + class = nl_cli_class_alloc(); + + for (;;) { + int c, optidx = 0; + enum { + ARG_YES = 257, + ARG_INTERACTIVE = 258, + }; + static struct option long_opts[] = { + { "interactive", 0, 0, ARG_INTERACTIVE }, + { "yes", 0, 0, ARG_YES }, + { "quiet", 0, 0, 'q' }, + { "help", 0, 0, 'h' }, + { "version", 0, 0, 'v' }, + { "dev", 1, 0, 'd' }, + { "parent", 1, 0, 'p' }, + { "id", 1, 0, 'i' }, + { "kind", 1, 0, 'k' }, + { 0, 0, 0, 0 } + }; + + c = getopt_long(argc, argv, "qhvd:p:i:k:", long_opts, &optidx); + if (c == -1) + break; + + switch (c) { + case '?': nl_cli_fatal(EINVAL, "Invalid options"); + case ARG_INTERACTIVE: interactive = 1; break; + case ARG_YES: default_yes = 1; break; + case 'q': quiet = 1; break; + case 'h': print_usage(); break; + case 'v': nl_cli_print_version(); break; + case 'd': + nl_cli_class_parse_dev(class, link_cache, optarg); + break; + case 'p': + nl_cli_class_parse_parent(class, optarg); + break; + case 'i': + nl_cli_class_parse_handle(class, optarg); + break; + case 'k': + nl_cli_class_parse_kind(class, optarg); + break; + } + } + + if (!rtnl_class_get_ifindex(class)) + nl_cli_fatal(EINVAL, "You must specify a network device (--dev=XXX)"); + + class_cache = nl_cli_class_alloc_cache(sock, rtnl_class_get_ifindex(class)); + + nl_cache_foreach_filter(class_cache, OBJ_CAST(class), delete_cb, NULL); + + if (!quiet) + printf("Deleted %d classs\n", deleted); + + return 0; +} |