doc: remove trailing whitespace
Subsystems (2)
PATCH 1/2 doc: remove trailing whitespace
Run whitespace scrubbing script to remove unnecessary trailing blanks at end of line and end of file.
--- README.iproute2+tc | 2 +- README.lnstat | 15 +++--- doc/actions/actions-general | 99 ++++++++++++++++++------------------- doc/actions/gact-usage | 17 +++---- doc/actions/ifb-README | 62 +++++++++++------------ doc/actions/mirred-usage | 26 +++++----- netem/README.distribution | 2 +- 7 files changed, 110 insertions(+), 113 deletions(-)
README.iproute2+tc +1 -1
@@ -42,7 +42,7 @@ in rsvp/cbqinit.eth1. Terminology and advices about setting CBQ parameters may be found in Sally Floyd -papers. +papers. Pairs X:Y are class handles, X:0 are qdisc handles.
README.lnstat +7 -8
@@ -7,8 +7,8 @@ This tool is a generalized and more feature-complete replacement for the old In addition to routing cache statistics, it supports any kind of statistics the linux kernel exports via a file in /proc/net/stat. In a stock 2.6.9 -kernel, this is - per-protocol neighbour cache statistics +kernel, this is + per-protocol neighbour cache statistics (ipv4, ipv6, atm) routing cache statistics (ipv4)
@@ -29,7 +29,7 @@ In order to get a list of supported statistics files, you can run lnstat -d It will display something like - + /proc/net/stat/arp_cache: 1: entries 2: allocs
@@ -52,19 +52,19 @@ arp_cach|rt_cache|arp_cach| You can specify the interval (e.g. 10 seconds) by: - + lnstat -i 10 You can specify to only use one particular statistics file: lnstat -f ip_conntrack -You can specify individual field widths +You can specify individual field widths lnstat -k arp_cache:entries,rt_cache:entries -w 20,8 You can specify not to print a header at all - + lnstat -s 0 You can specify to print a header only at start of the program
@@ -76,6 +76,5 @@ You can specify to print a header at start and every 20 lines: lnstat -s 20 You can specify the number of samples you want to take (e.g. 5): - - lnstat -c 5 + lnstat -c 5
doc/actions/actions-general +49 -50
189 lines not on this page · raw message
doc/actions/gact-usage +8 -9
@@ -1,13 +1,13 @@ gact <ACTION> [RAND] [INDEX] -Where: - ACTION := reclassify | drop | continue | pass | ok +Where: + ACTION := reclassify | drop | continue | pass | ok RAND := random <RANDTYPE> <ACTION> <VAL> RANDTYPE := netrand | determ VAL : = value not exceeding 10000 INDEX := index value used - + ACTION semantics - pass and ok are equivalent to accept - continue allows to restart classification lookup
@@ -42,14 +42,14 @@ filter u32 fh 800::800 order 2048 key ht 800 bkt 0 flowid 1:16 (rule hit 32 suc random type none pass val 0 index 1 ref 1 bind 1 installed 59 sec used 35 sec Sent 1680 bytes 20 pkts (dropped 20, overlimits 0 ) - + ---- # example 2 #allow 1 out 10 randomly using the netrand generator tc filter add dev eth0 parent ffff: protocol ip prio 6 u32 match ip src \ 10.0.0.9/32 flowid 1:16 action drop random netrand ok 10 - + ping -c 20 10.0.0.9 ----
@@ -59,14 +59,14 @@ filter protocol ip pref 6 u32 filter protocol ip pref 6 u32 fh 800: ht divisor 1 random type netrand pass val 10 index 5 ref 1 bind 1 installed 49 sec used 25 sec Sent 1680 bytes 20 pkts (dropped 16, overlimits 0 ) - + -------- #alternative: deterministically accept every second packet tc filter add dev eth0 parent ffff: protocol ip prio 6 u32 match ip src \ 10.0.0.9/32 flowid 1:16 action drop random determ ok 2 - + ping -c 20 10.0.0.9 - + tc -s filter show parent ffff: dev eth0 ----- filter protocol ip pref 6 u32 filter protocol ip pref 6 u32 fh 800: ht divisor 1filter protocol ip pref 6 u32 fh 800::800 order 2048 key ht 800 bkt 0 flowid 1:16 (rule hit 20 success 20)
@@ -76,4 +76,3 @@ filter protocol ip pref 6 u32 filter protocol ip pref 6 u32 fh 800: ht divisor 1 index 4 ref 1 bind 1 installed 118 sec used 82 sec Sent 1680 bytes 20 pkts (dropped 10, overlimits 0 ) ----- -
doc/actions/ifb-README +31 -31
127 lines not on this page · raw message
doc/actions/mirred-usage +13 -13
@@ -7,10 +7,10 @@ flow to be mirrored. High end switches typically can select based on more than just a port (eg a 5 tuple classifier). They may also be capable of redirecting. -Usage: +Usage: -mirred <DIRECTION> <ACTION> [index INDEX] <dev DEVICENAME> -where: +mirred <DIRECTION> <ACTION> [index INDEX] <dev DEVICENAME> +where: DIRECTION := <ingress | egress> ACTION := <mirror | redirect> INDEX is the specific policy instance id
@@ -18,7 +18,7 @@ DEVICENAME is the devicename Direction: - Ingress is not supported at the moment. It will be in the -future as well as mirror/redirecting to a socket. +future as well as mirror/redirecting to a socket. Action: - Mirror takes a copy of the packet and sends it to specified
@@ -29,14 +29,14 @@ steals the packet and redirects to specified destination dev. What NOT to do if you don't want your machine to crash: ------------------------------------------------------ -Do not create loops! +Do not create loops! Loops are not hard to create in the egress qdiscs. Here are simple rules to follow if you don't want to get hurt: A) Do not have the same packet go to same netdevice twice in a single graph of policies. Your machine will just hang! -This is design intent _not a bug_ to teach you some lessons. +This is design intent _not a bug_ to teach you some lessons. In the future if there are easy ways to do this in the kernel without affecting other packets not interested in this feature
@@ -51,7 +51,7 @@ B) Do not redirect from one IFB device to another. Remember that IFB is a very specialized case of packet redirecting device. Instead of redirecting it puts packets at the exact spot on the stack it found them from. -Redirecting from ifbX->ifbY will actually not crash your machine but your +Redirecting from ifbX->ifbY will actually not crash your machine but your packets will all be dropped (this is much simpler to detect and resolve and is only affecting users of ifb as opposed to the whole stack).
@@ -64,7 +64,7 @@ Some examples: 1) Mirror all packets arriving on eth0 to be sent out on eth1. You may have a sniffer or some accounting box hooked up on eth1. - + --- tc qdisc add dev eth0 ingress tc filter add dev eth0 parent ffff: protocol ip prio 10 u32 \
@@ -100,7 +100,7 @@ stack (i.e ping would work). 3) Even more funky example: # -#allow 1 out 10 packets on ingress of lo to randomly make it to the +#allow 1 out 10 packets on ingress of lo to randomly make it to the # host A (Randomness uses the netrand generator) # ---
@@ -111,9 +111,9 @@ action mirred egress mirror dev eth0 --- 4) -# for packets from 10.0.0.9 going out on eth0 (could be local -# IP or something # we are forwarding) - -# if exceeding a 100Kbps rate, then redirect to eth1 +# for packets from 10.0.0.9 going out on eth0 (could be local +# IP or something # we are forwarding) - +# if exceeding a 100Kbps rate, then redirect to eth1 # ---
@@ -158,7 +158,7 @@ Essentially a good debugging/logging interface (sort of like BSDs speacialized log device does without needing one). If you replace mirror with redirect, those packets will be -blackholed and will never make it out. +blackholed and will never make it out. cheers, jamal
netem/README.distribution +1 -1
@@ -1,4 +1,4 @@ -Notes about distribution tables from Nistnet +Notes about distribution tables from Nistnet ------------------------------------------------------------------------------- I. About the distribution tables
Signature · 1 line
2.19.2
PATCH 2/2 testsuite: remove trailing blanks
Cleanup from scrub script.
--- testsuite/tests/ip/tunnel/add_tunnel.t | 1 - testsuite/tests/tc/cls-testbed.t | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)
testsuite/tests/ip/tunnel/add_tunnel.t +0 -1
@@ -11,4 +11,3 @@ ts_ip "$0" "Del GRE tunnel over IPv4" tunnel del $TUNNEL_NAME ts_ip "$0" "Add GRE tunnel over IPv6" tunnel add name $TUNNEL_NAME mode ip6gre local dead:beef::1 remote dead:beef::2 ts_ip "$0" "Del GRE tunnel over IPv6" tunnel del $TUNNEL_NAME -
testsuite/tests/tc/cls-testbed.t +1 -1
@@ -61,7 +61,7 @@ for q in ${QDISCS}; do ts_tc "cls-testbed" "tree listing" qdisc list dev eth0 ts_tc "cls-testbed" "tree class listing" class list dev eth0 ts_log "cls-testbed: starting classifier test $c" - $c + $c case "$q" in *)
Signature · 1 line
2.19.2
David Ahern
AppliedRe: [PATCH iproute2-next 2/2] testsuite: remove trailing blanks
Quoted 13 lines · Stephen Hemminger
Cleanup from scrub script.
Signed-off-by Stephen Hemminger <[email protected]>--- testsuite/tests/ip/tunnel/add_tunnel.t | 1 - testsuite/tests/tc/cls-testbed.t | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)testsuite/tests/ip/tunnel/add_tunnel.t +0
-0
testsuite/tests/ip/tunnel/add_tunnel.t ts_ip "$0" "Del GRE tunnel over IPv4" tunnel del $TUNNEL_NAME · line 14
Quoted 4 lines
testsuite/tests/ip/tunnel/add_tunnel.t +0
-1@@ -11,4 +11,3 @@ ts_ip "$0" "Del GRE tunnel over IPv4" tunnel del $TUNNEL_NAME ts_ip "$0" "Add GRE tunnel over IPv6" tunnel add name $TUNNEL_NAME mode ip6gre local dead:beef::1 remote dead:beef::2 ts_ip "$0" "Del GRE tunnel over IPv6" tunnel del $TUNNEL_NAME -
Dropped this part since it is no longer relevant after 85bcb524a2e38940a18fb934fd1e8d37c6496074.
Quoted 6 lines
testsuite/tests/tc/cls-testbed.t +0
-0
testsuite/tests/tc/cls-testbed.t for q in ${QDISCS}; do · line 67
Quoted 8 lines
testsuite/tests/tc/cls-testbed.t +1
-1@@ -61,7 +61,7 @@ for q in ${QDISCS}; do ts_tc "cls-testbed" "tree listing" qdisc list dev eth0 ts_tc "cls-testbed" "tree class listing" class list dev eth0 ts_log "cls-testbed: starting classifier test $c" - $c + $c case "$q" in *)
applied to iproute2-next. Thanks
Re: [PATCH iproute2-next 2/2] testsuite: remove trailing blanks
Quoted 34 lines · David Ahern
Quoted 13 lines · Stephen Hemminger
Cleanup from scrub script.
Signed-off-by Stephen Hemminger <[email protected]>--- testsuite/tests/ip/tunnel/add_tunnel.t | 1 - testsuite/tests/tc/cls-testbed.t | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-)testsuite/tests/ip/tunnel/add_tunnel.t +0
-0testsuite/tests/ip/tunnel/add_tunnel.t ts_ip "$0" "Del GRE tunnel over IPv4" tunnel del $TUNNEL_NAME · line 14
Quoted 4 lines
testsuite/tests/ip/tunnel/add_tunnel.t +0
-1@@ -11,4 +11,3 @@ ts_ip "$0" "Del GRE tunnel over IPv4" tunnel del $TUNNEL_NAME ts_ip "$0" "Add GRE tunnel over IPv6" tunnel add name $TUNNEL_NAME mode ip6gre local dead:beef::1 remote dead:beef::2 ts_ip "$0" "Del GRE tunnel over IPv6" tunnel del $TUNNEL_NAME -Dropped this part since it is no longer relevant after
85bcb524a2e38940a18fb934fd1e8d37c6496074.Quoted 11 lines
testsuite/tests/tc/cls-testbed.t +1
-1@@ -61,7 +61,7 @@ for q in ${QDISCS}; do ts_tc "cls-testbed" "tree listing" qdisc list dev eth0 ts_tc "cls-testbed" "tree class listing" class list dev eth0 ts_log "cls-testbed: starting classifier test $c" - $c + $c
Quoted 6 lines
testsuite/tests/tc/cls-testbed.t for q in ${QDISCS}; do · line 67
Quoted 3 lines
testsuite/tests/tc/cls-testbed.t +0
-0case "$q" in *)applied to iproute2-next. Thanks
I take that back. Not applied. your subsequent patch removes the file.
David Ahern
AppliedQuoted 4 lines · Stephen Hemminger
Run whitespace scrubbing script to remove unnecessary trailing blanks at end of line and end of file.
Signed-off-by Stephen Hemminger <[email protected]>
Quoted 10 lines
--- README.iproute2+tc | 2 +- README.lnstat | 15 +++--- doc/actions/actions-general | 99 ++++++++++++++++++------------------- doc/actions/gact-usage | 17 +++---- doc/actions/ifb-README | 62 +++++++++++------------ doc/actions/mirred-usage | 26 +++++----- netem/README.distribution | 2 +- 7 files changed, 110 insertions(+), 113 deletions(-)
applied to iproute2-next. Thanks