mirror of
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git
synced 2024-11-16 14:35:34 +08:00
3bed7bb7e7
Clearer error messages for fifo and tbf qdiscs: - Say who is complaining - Don't just say a parameter is bad, show the offending parameter - Be clearer about duplicate parameters vs illegal pairs of parameters - Try to give multiple error messages rather than let the user discover the errors one by one - When there are parameter aliases, try to use the variant that was used, or at least mention them all Note that in the old version an empty parameter list to tbf would just cause an explain() message without a specific error message. By simply removing the relevant error check, the code now handles this error more gracefully by printing an error message for all mandatory parameters. It still prints the explain() message. Signed-off-by: Kees van Reeuwijk <reeuwijk@few.vu.nl>
103 lines
2.3 KiB
C
103 lines
2.3 KiB
C
/*
|
|
* q_fifo.c FIFO.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*
|
|
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
|
|
*
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <syslog.h>
|
|
#include <fcntl.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <string.h>
|
|
|
|
#include "utils.h"
|
|
#include "tc_util.h"
|
|
|
|
static void explain(void)
|
|
{
|
|
fprintf(stderr, "Usage: ... <[p|b]fifo | pfifo_head_drop> [ limit NUMBER ]\n");
|
|
}
|
|
|
|
static int fifo_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n)
|
|
{
|
|
int ok=0;
|
|
struct tc_fifo_qopt opt;
|
|
memset(&opt, 0, sizeof(opt));
|
|
|
|
while (argc > 0) {
|
|
if (strcmp(*argv, "limit") == 0) {
|
|
NEXT_ARG();
|
|
if (get_size(&opt.limit, *argv)) {
|
|
fprintf(stderr, "%s: Illegal value for \"limit\": \"%s\"\n", qu->id, *argv);
|
|
return -1;
|
|
}
|
|
ok++;
|
|
} else if (strcmp(*argv, "help") == 0) {
|
|
explain();
|
|
return -1;
|
|
} else {
|
|
fprintf(stderr, "%s: unknown parameter \"%s\"\n", qu->id, *argv);
|
|
explain();
|
|
return -1;
|
|
}
|
|
argc--; argv++;
|
|
}
|
|
|
|
if (ok)
|
|
addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt));
|
|
return 0;
|
|
}
|
|
|
|
static int fifo_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
|
|
{
|
|
struct tc_fifo_qopt *qopt;
|
|
|
|
if (opt == NULL)
|
|
return 0;
|
|
|
|
if (RTA_PAYLOAD(opt) < sizeof(*qopt))
|
|
return -1;
|
|
qopt = RTA_DATA(opt);
|
|
if (strcmp(qu->id, "bfifo") == 0) {
|
|
SPRINT_BUF(b1);
|
|
fprintf(f, "limit %s", sprint_size(qopt->limit, b1));
|
|
} else
|
|
fprintf(f, "limit %up", qopt->limit);
|
|
return 0;
|
|
}
|
|
|
|
|
|
struct qdisc_util bfifo_qdisc_util = {
|
|
.id = "bfifo",
|
|
.parse_qopt = fifo_parse_opt,
|
|
.print_qopt = fifo_print_opt,
|
|
};
|
|
|
|
struct qdisc_util pfifo_qdisc_util = {
|
|
.id = "pfifo",
|
|
.parse_qopt = fifo_parse_opt,
|
|
.print_qopt = fifo_print_opt,
|
|
};
|
|
|
|
struct qdisc_util pfifo_head_drop_qdisc_util = {
|
|
.id = "pfifo_head_drop",
|
|
.parse_qopt = fifo_parse_opt,
|
|
.print_qopt = fifo_print_opt,
|
|
};
|
|
|
|
extern int prio_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt);
|
|
struct qdisc_util pfifo_fast_qdisc_util = {
|
|
.id = "pfifo_fast",
|
|
.print_qopt = prio_print_opt,
|
|
};
|