|
 |
4aca6e |
From c525e2783db452f86787f420e171c89502c9b1de Mon Sep 17 00:00:00 2001
|
|
|
4aca6e |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4aca6e |
Date: Fri, 17 Mar 2017 13:17:53 +0100
|
|
|
4aca6e |
Subject: [PATCH] tc: improve filter help texts a bit
|
|
|
4aca6e |
|
|
|
4aca6e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1422629
|
|
|
4aca6e |
Upstream Status: iproute2.git commit 0a83e1eaf7b3c
|
|
|
4aca6e |
Conflicts: Context changes due to missing commits 863ecb04b4f7b
|
|
|
4aca6e |
("discourage use of direct policer interface") and
|
|
|
4aca6e |
287bf3a9900d1 ("route classifier support for multiple
|
|
|
4aca6e |
actions")
|
|
|
4aca6e |
|
|
|
4aca6e |
commit 0a83e1eaf7b3c2ed9e6d809bd7aac7946f9d8d87
|
|
|
4aca6e |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
4aca6e |
Date: Fri Oct 23 19:21:17 2015 +0200
|
|
|
4aca6e |
|
|
|
4aca6e |
tc: improve filter help texts a bit
|
|
|
4aca6e |
|
|
|
4aca6e |
This fixes a few syntax errors and changes route filter help text to use
|
|
|
4aca6e |
classid instead of flowid to be consistent with other filters' help
|
|
|
4aca6e |
texts.
|
|
|
4aca6e |
|
|
|
4aca6e |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
4aca6e |
---
|
|
|
4aca6e |
tc/f_flower.c | 4 ++--
|
|
|
4aca6e |
tc/f_route.c | 2 +-
|
|
|
4aca6e |
tc/f_rsvp.c | 2 +-
|
|
|
4aca6e |
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/tc/f_flower.c b/tc/f_flower.c
|
|
|
4aca6e |
index 9a5ea06..a9b2c4d 100644
|
|
|
4aca6e |
--- a/tc/f_flower.c
|
|
|
4aca6e |
+++ b/tc/f_flower.c
|
|
|
4aca6e |
@@ -28,7 +28,7 @@ static void explain(void)
|
|
|
4aca6e |
fprintf(stderr, " [ action ACTION-SPEC ] [ classid CLASSID ]\n");
|
|
|
4aca6e |
fprintf(stderr, "\n");
|
|
|
4aca6e |
fprintf(stderr, "Where: MATCH-LIST := [ MATCH-LIST ] MATCH\n");
|
|
|
4aca6e |
- fprintf(stderr, " MATCH := [ indev DEV-NAME | \n");
|
|
|
4aca6e |
+ fprintf(stderr, " MATCH := { indev DEV-NAME | \n");
|
|
|
4aca6e |
fprintf(stderr, " dst_mac MAC-ADDR | \n");
|
|
|
4aca6e |
fprintf(stderr, " src_mac MAC-ADDR | \n");
|
|
|
4aca6e |
fprintf(stderr, " eth_type [ipv4 | ipv6 | ETH-TYPE ] | \n");
|
|
|
4aca6e |
@@ -36,7 +36,7 @@ static void explain(void)
|
|
|
4aca6e |
fprintf(stderr, " dst_ip [ IPV4-ADDR | IPV6-ADDR ] | \n");
|
|
|
4aca6e |
fprintf(stderr, " src_ip [ IPV4-ADDR | IPV6-ADDR ] | \n");
|
|
|
4aca6e |
fprintf(stderr, " dst_port PORT-NUMBER | \n");
|
|
|
4aca6e |
- fprintf(stderr, " src_port PORT-NUMBER | \n");
|
|
|
4aca6e |
+ fprintf(stderr, " src_port PORT-NUMBER }\n");
|
|
|
4aca6e |
fprintf(stderr, " FILTERID := X:Y:Z\n");
|
|
|
4aca6e |
fprintf(stderr, " ACTION-SPEC := ... look at individual actions\n");
|
|
|
4aca6e |
fprintf(stderr, "\n");
|
|
|
4aca6e |
diff --git a/tc/f_route.c b/tc/f_route.c
|
|
|
4aca6e |
index 649e0ec..44361eb 100644
|
|
|
4aca6e |
--- a/tc/f_route.c
|
|
|
4aca6e |
+++ b/tc/f_route.c
|
|
|
4aca6e |
@@ -28,7 +28,7 @@
|
|
|
4aca6e |
static void explain(void)
|
|
|
4aca6e |
{
|
|
|
4aca6e |
fprintf(stderr, "Usage: ... route [ from REALM | fromif TAG ] [ to REALM ]\n");
|
|
|
4aca6e |
- fprintf(stderr, " [ flowid CLASSID ] [ police POLICE_SPEC ]\n");
|
|
|
4aca6e |
+ fprintf(stderr, " [ classid CLASSID ] [ police POLICE_SPEC ]\n");
|
|
|
4aca6e |
fprintf(stderr, " POLICE_SPEC := ... look at TBF\n");
|
|
|
4aca6e |
fprintf(stderr, " CLASSID := X:Y\n");
|
|
|
4aca6e |
fprintf(stderr, "\nNOTE: CLASSID is parsed as hexadecimal input.\n");
|
|
|
4aca6e |
diff --git a/tc/f_rsvp.c b/tc/f_rsvp.c
|
|
|
4aca6e |
index 44d3bdf..71508e1 100644
|
|
|
4aca6e |
--- a/tc/f_rsvp.c
|
|
|
4aca6e |
+++ b/tc/f_rsvp.c
|
|
|
4aca6e |
@@ -27,7 +27,7 @@
|
|
|
4aca6e |
static void explain(void)
|
|
|
4aca6e |
{
|
|
|
4aca6e |
fprintf(stderr, "Usage: ... rsvp ipproto PROTOCOL session DST[/PORT | GPI ]\n");
|
|
|
4aca6e |
- fprintf(stderr, " [ sender SRC[/PORT | GPI ]\n");
|
|
|
4aca6e |
+ fprintf(stderr, " [ sender SRC[/PORT | GPI ] ]\n");
|
|
|
4aca6e |
fprintf(stderr, " [ classid CLASSID ] [ police POLICE_SPEC ]\n");
|
|
|
4aca6e |
fprintf(stderr, " [ tunnelid ID ] [ tunnel ID skip NUMBER ]\n");
|
|
|
4aca6e |
fprintf(stderr, "Where: GPI := { flowlabel NUMBER | spi/ah SPI | spi/esp SPI |\n");
|
|
|
4aca6e |
--
|
|
|
4aca6e |
1.8.3.1
|
|
|
4aca6e |
|