New set of libnl tools

Converts all tools to the API changes and improves the useability by
introducing regular options and long options.

1 files changed, 88 insertions, 50 deletions

diff --git a/src/nl-qdisc-delete.c b/src/nl-qdisc-delete.c
index b8a17ca..32523b7 100644
--- a/src/nl-qdisc-delete.c
+++ b/src/nl-qdisc-delete.c
@@ -1,76 +1,114 @@
 /*
- * src/nl-qdisc-delete.c     Delete Qdiscs
+ * src/nl-qdisc-delete.c     Delete Queuing Disciplines
  *
  *	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) 2003-2006 Thomas Graf <tgraf@suug.ch>
+ * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch>
  */
 
-#include "utils.h"
+#include "qdisc-utils.h"
+
+static int quiet = 0, default_yes = 0, deleted = 0, interactive = 0;
+struct nl_sock *sock;
 
 static void print_usage(void)
 {
-	printf("Usage: nl-qdisc-delete <ifindex> <parent> <handle>\n");
-	exit(1);
+	printf(
+	"Usage: nl-qdisc-delete [OPTION]... [QDISC]\n"
+	"\n"
+	"Options\n"
+	" -i, --interactive     Run interactively\n"
+	"     --yes             Set default answer to yes\n"
+	" -q, --quiet           Do not print informal notifications\n"
+	" -h, --help            Show this help\n"
+	" -v, --version         Show versioning information\n"
+	"\n"
+	"QDisc Options\n"
+	" -d, --dev=DEV         Device the qdisc is attached to\n"
+	" -p, --parent=HANDLE   Identifier of parent qdisc\n"
+	" -H, --handle=HANDLE   Identifier\n"
+	" -k, --kind=NAME       Kind of qdisc (e.g. pfifo_fast)\n"
+	);
+
+	exit(0);
 }
 
-int main(int argc, char *argv[])
+static void delete_cb(struct nl_object *obj, void *arg)
 {
-	struct nl_handle *nlh;
-	struct rtnl_qdisc *qdisc;
-	uint32_t handle, parent;
-	int err = 1;
+	struct rtnl_qdisc *qdisc = nl_object_priv(obj);
+	struct nl_dump_params params = {
+		.dp_type = NL_DUMP_ONELINE,
+		.dp_fd = stdout,
+	};
+	int err;
 
-	if (nltool_init(argc, argv) < 0)
-		return -1;
+	if (interactive && !nlt_confirm(obj, &params, default_yes))
+		return;
 
-	if (argc < 3 || !strcmp(argv[1], "-h"))
-		print_usage();
+	if ((err = rtnl_qdisc_delete(sock, qdisc)) < 0)
+		fatal(err, "Unable to delete qdisc: %s\n", nl_geterror(err));
 
-	nlh = nltool_alloc_handle();
-	if (!nlh)
-		goto errout;
-
-	qdisc = rtnl_qdisc_alloc();
-	if (!qdisc)
-		goto errout_free_handle;
-
-	rtnl_qdisc_set_ifindex(qdisc, strtoul(argv[1], NULL, 0));
-
-	if (rtnl_tc_str2handle(argv[2], &parent) < 0) {
-		fprintf(stderr, "%s\n", nl_geterror());
-		goto errout_free_qdisc;
+	if (!quiet) {
+		printf("Deleted ");
+		nl_object_dump(obj, &params);
 	}
 
-	if (argc > 3) {
-		if (rtnl_tc_str2handle(argv[3], &handle) < 0) {
-			fprintf(stderr, "%s\n", nl_geterror());
-			goto errout_free_qdisc;
-		}
+	deleted++;
+}
 
-		rtnl_qdisc_set_handle(qdisc, handle);
-	}
+int main(int argc, char *argv[])
+{
+	struct rtnl_qdisc *qdisc;
+	struct nl_cache *link_cache, *qdisc_cache;
+ 
+	sock = nlt_alloc_socket();
+	nlt_connect(sock, NETLINK_ROUTE);
+	link_cache = nlt_alloc_link_cache(sock);
+	qdisc_cache = nlt_alloc_qdisc_cache(sock);
+ 	qdisc = nlt_alloc_qdisc();
+ 
+	for (;;) {
+		int c, optidx = 0;
+		enum {
+			ARG_YES = 257,
+		};
+		static struct option long_opts[] = {
+			{ "interactive", 0, 0, 'i' },
+			{ "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' },
+			{ "handle", 1, 0, 'H' },
+			{ "kind", 1, 0, 'k' },
+			{ 0, 0, 0, 0 }
+		};
+	
+		c = getopt_long(argc, argv, "iqhvd:p:H:k:", long_opts, &optidx);
+		if (c == -1)
+			break;
 
-	rtnl_qdisc_set_parent(qdisc, parent);
+		switch (c) {
+		case 'i': interactive = 1; break;
+		case ARG_YES: default_yes = 1; break;
+		case 'q': quiet = 1; break;
+		case 'h': print_usage(); break;
+		case 'v': nlt_print_version(); break;
+		case 'd': parse_dev(qdisc, link_cache, optarg); break;
+		case 'p': parse_parent(qdisc, optarg); break;
+		case 'H': parse_handle(qdisc, optarg); break;
+		case 'k': parse_kind(qdisc, optarg); break;
+		}
+ 	}
 
-	if (nltool_connect(nlh, NETLINK_ROUTE) < 0)
-		goto errout_free_qdisc;
+	nl_cache_foreach_filter(qdisc_cache, OBJ_CAST(qdisc), delete_cb, NULL);
 
-	if (rtnl_qdisc_delete(nlh, qdisc) < 0) {
-		fprintf(stderr, "Unable to delete Qdisc: %s\n", nl_geterror());
-		goto errout_close;
-	}
+	if (!quiet)
+		printf("Deleted %d qdiscs\n", deleted);
 
-	err = 0;
-errout_close:
-	nl_close(nlh);
-errout_free_qdisc:
-	rtnl_qdisc_put(qdisc);
-errout_free_handle:
-	nl_handle_destroy(nlh);
-errout:
-	return err;
+	return 0;
 }