|
 |
049c96 |
From edb4ae8d586a471c389d0a5e6a4b42cb5ce2f1a9 Mon Sep 17 00:00:00 2001
|
|
|
049c96 |
From: Phil Sutter <psutter@redhat.com>
|
|
|
049c96 |
Date: Wed, 30 Mar 2016 16:43:20 +0200
|
|
|
049c96 |
Subject: [PATCH] tc: connmark, pedit: Rename BRANCH to CONTROL
|
|
|
049c96 |
|
|
|
049c96 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1275426
|
|
|
049c96 |
Upstream Status: iproute2.git commit 1672f42195406
|
|
|
049c96 |
Conflicts:
|
|
|
049c96 |
- Connmark action does not exist in RHEL7.
|
|
|
049c96 |
- Missing commit 32a121cba2579 ("tc: code cleanup") which itself causes
|
|
|
049c96 |
many conflicts.
|
|
|
049c96 |
|
|
|
049c96 |
commit 1672f42195406d2d4d8fb014b8ea2a59e59f2d6a
|
|
|
049c96 |
Author: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
Date: Tue Mar 22 15:48:33 2016 +0100
|
|
|
049c96 |
|
|
|
049c96 |
tc: connmark, pedit: Rename BRANCH to CONTROL
|
|
|
049c96 |
|
|
|
049c96 |
As Jamal suggested, BRANCH is the wrong name, as these keywords go
|
|
|
049c96 |
beyond simple branch control - e.g. loops are possible, too. Therefore
|
|
|
049c96 |
rename the non-terminal to CONTROL instead which should be more
|
|
|
049c96 |
appropriate.
|
|
|
049c96 |
|
|
|
049c96 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
049c96 |
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
|
049c96 |
---
|
|
|
049c96 |
man/man8/tc-pedit.8 | 6 +++---
|
|
|
049c96 |
tc/m_pedit.c | 4 ++--
|
|
|
049c96 |
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
049c96 |
|
|
|
049c96 |
diff --git a/man/man8/tc-pedit.8 b/man/man8/tc-pedit.8
|
|
|
049c96 |
index c30927e..c34520c 100644
|
|
|
049c96 |
--- a/man/man8/tc-pedit.8
|
|
|
049c96 |
+++ b/man/man8/tc-pedit.8
|
|
|
049c96 |
@@ -6,7 +6,7 @@ pedit - generic packet editor action
|
|
|
049c96 |
.in +8
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
.BR tc " ... " "action pedit munge " {
|
|
|
049c96 |
-.IR RAW_OP " | " LAYERED_OP " } [ " BRANCH " ]"
|
|
|
049c96 |
+.IR RAW_OP " | " LAYERED_OP " } [ " CONTROL " ]"
|
|
|
049c96 |
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
.IR RAW_OP " := "
|
|
|
049c96 |
@@ -45,7 +45,7 @@ pedit - generic packet editor action
|
|
|
049c96 |
.IR RVAL " ]"
|
|
|
049c96 |
|
|
|
049c96 |
.ti -8
|
|
|
049c96 |
-.IR BRANCH " := {"
|
|
|
049c96 |
+.IR CONTROL " := {"
|
|
|
049c96 |
.BR reclassify " | " pipe " | " drop " | " shot " | " continue " | " pass " }"
|
|
|
049c96 |
.SH DESCRIPTION
|
|
|
049c96 |
The
|
|
|
049c96 |
@@ -165,7 +165,7 @@ This optional extra part of
|
|
|
049c96 |
.I CMD_SPEC
|
|
|
049c96 |
allows to exclude bits from being changed.
|
|
|
049c96 |
.TP
|
|
|
049c96 |
-.I BRANCH
|
|
|
049c96 |
+.I CONTROL
|
|
|
049c96 |
The following keywords allow to control how the tree of qdisc, classes,
|
|
|
049c96 |
filters and actions is further traversed after this action.
|
|
|
049c96 |
.RS
|
|
|
049c96 |
diff --git a/tc/m_pedit.c b/tc/m_pedit.c
|
|
|
049c96 |
index 64a3eae..c8c0264 100644
|
|
|
049c96 |
--- a/tc/m_pedit.c
|
|
|
049c96 |
+++ b/tc/m_pedit.c
|
|
|
049c96 |
@@ -35,7 +35,7 @@ int pedit_debug = 1;
|
|
|
049c96 |
static void
|
|
|
049c96 |
explain(void)
|
|
|
049c96 |
{
|
|
|
049c96 |
- fprintf(stderr, "Usage: ... pedit munge <MUNGE> [<BRANCH>]\n");
|
|
|
049c96 |
+ fprintf(stderr, "Usage: ... pedit munge <MUNGE> [CONTROL]\n");
|
|
|
049c96 |
fprintf(stderr,
|
|
|
049c96 |
"Where: MUNGE := <RAW>|<LAYERED>\n"
|
|
|
049c96 |
"\t<RAW>:= <OFFSETC>[ATC]<CMD>\n "
|
|
|
049c96 |
@@ -47,7 +47,7 @@ explain(void)
|
|
|
049c96 |
"\t\tCMD:= clear | invert | set <setval>| retain\n "
|
|
|
049c96 |
"\t<LAYERED>:= ip <ipdata> | ip6 <ip6data> \n "
|
|
|
049c96 |
" \t\t| udp <udpdata> | tcp <tcpdata> | icmp <icmpdata> \n"
|
|
|
049c96 |
- "\t<BRANCH>:= reclassify | pipe | drop | continue | pass\n"
|
|
|
049c96 |
+ "\tCONTROL:= reclassify | pipe | drop | continue | pass\n"
|
|
|
049c96 |
"For Example usage look at the examples directory\n");
|
|
|
049c96 |
|
|
|
049c96 |
}
|
|
|
049c96 |
--
|
|
|
049c96 |
1.8.3.1
|
|
|
049c96 |
|