mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-05 11:20:56 +00:00
Revert "Remove bogus reference to tc-filters(8) from tc(8) manpage."
This reverts commit 1bacc7ce75
.
This commit is contained in:
parent
fd3877feed
commit
59cc4f73f2
@ -1019,7 +1019,7 @@ int do_ipaddr(int argc, char **argv)
|
||||
return ipaddr_list_or_flush(argc-1, argv+1, 1);
|
||||
if (matches(*argv, "help") == 0)
|
||||
usage();
|
||||
fprintf(stderr, "Command \"%s\" is unknown, try \"ip addr help\".\n", *argv);
|
||||
fprintf(stderr, "Command \"%s\" is unknown, try \"ip address help\".\n", *argv);
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
|
@ -337,7 +337,7 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
|
||||
if (name) {
|
||||
len = strlen(name) + 1;
|
||||
if (len == 1)
|
||||
invarg("null string is not valid name\n", *argv);
|
||||
invarg("null string is not valid name\n");
|
||||
if (len > IFNAMSIZ)
|
||||
invarg("\"name\" too long\n", *argv);
|
||||
addattr_l(&req.n, sizeof(req), IFLA_IFNAME, name, len);
|
||||
|
@ -72,7 +72,7 @@ static void usage(void)
|
||||
fprintf(stderr, "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ]\n");
|
||||
fprintf(stderr, " [ rtt TIME ] [ rttvar TIME ]\n");
|
||||
fprintf(stderr, " [ window NUMBER] [ cwnd NUMBER ] [ initcwnd NUMBER ]\n");
|
||||
fprintf(stderr, " [ ssthresh NUMBER ] [ realms REALM ] [ src ADDRESS ]\n");
|
||||
fprintf(stderr, " [ ssthresh NUMBER ] [ realms REALM ]\n");
|
||||
fprintf(stderr, " [ rto_min TIME ]\n");
|
||||
fprintf(stderr, "TYPE := [ unicast | local | broadcast | multicast | throw |\n");
|
||||
fprintf(stderr, " unreachable | prohibit | blackhole | nat ]\n");
|
||||
|
@ -38,7 +38,7 @@ static void usage(void)
|
||||
{
|
||||
fprintf(stderr, "Usage: ip rule [ list | add | del | flush ] SELECTOR ACTION\n");
|
||||
fprintf(stderr, "SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n");
|
||||
fprintf(stderr, " [ dev STRING ] [ pref NUMBER ] [ prio NUMBER ]\n");
|
||||
fprintf(stderr, " [ dev STRING ] [ pref NUMBER ]\n");
|
||||
fprintf(stderr, "ACTION := [ table TABLE_ID ]\n");
|
||||
fprintf(stderr, " [ prohibit | reject | unreachable ]\n");
|
||||
fprintf(stderr, " [ realms [SRCREALM/]DSTREALM ]\n");
|
||||
|
@ -113,7 +113,7 @@ static int parse_args(int argc, char **argv, int cmd, struct ip_tunnel_parm *p)
|
||||
NEXT_ARG();
|
||||
p->i_flags |= GRE_KEY;
|
||||
if (strchr(*argv, '.'))
|
||||
p->i_key = get_addr32(*argv);
|
||||
p->o_key = get_addr32(*argv);
|
||||
else {
|
||||
if (get_unsigned(&uval, *argv, 0)<0) {
|
||||
fprintf(stderr, "invalid value of \"ikey\"\n");
|
||||
|
@ -187,7 +187,7 @@ The functions sometimes use fprintf and exit when a fatal error occurs.
|
||||
This library should be named librtnetlink.
|
||||
|
||||
.SH AUTHORS
|
||||
netlink/rtnetlink was designed and written by Alexey Kuznetsov.
|
||||
netlink/rtnetlink was designed and writen by Alexey Kuznetsov.
|
||||
Andi Kleen wrote the man page.
|
||||
|
||||
.SH SEE ALSO
|
||||
|
@ -379,7 +379,7 @@ shortcut for
|
||||
.BR "\-o" , " \-oneline"
|
||||
output each record on a single line, replacing line feeds
|
||||
with the
|
||||
.B '\e\'
|
||||
.B '\'
|
||||
character. This is convenient when you want to count records
|
||||
with
|
||||
.BR wc (1)
|
||||
|
@ -9,7 +9,7 @@ ss \- another utility to investigate sockets
|
||||
is used to dump socket statistics. It allows showing information similar
|
||||
to
|
||||
.IR netstat .
|
||||
It can display more TCP and state informations than other tools.
|
||||
It can display more TCP information than state than other tools.
|
||||
|
||||
.SH OPTIONS
|
||||
These programs follow the usual GNU command line syntax, with long
|
||||
|
@ -210,7 +210,7 @@ Consult the map for a class for the
|
||||
priority. If found, choose it, and terminate.
|
||||
.TP
|
||||
(iii)
|
||||
Choose the class at which break out to the fallback algorithm occurred. Terminate.
|
||||
Choose the class at which break out to the fallback algorithm occured. Terminate.
|
||||
.P
|
||||
The packet is enqueued to the class which was chosen when either algorithm
|
||||
terminated. It is therefore possible for a packet to be enqueued *not* at a
|
||||
|
@ -137,7 +137,7 @@ packet. Should be at least as high as the highest cburst of all children.
|
||||
.SH NOTES
|
||||
Due to Unix timing constraints, the maximum ceil rate is not infinite and may in fact be quite low. On Intel,
|
||||
there are 100 timer events per second, the maximum rate is that rate at which 'burst' bytes are sent each timer tick.
|
||||
From this, the minimum burst size for a specified rate can be calculated. For i386, a 10mbit rate requires a 12 kilobyte
|
||||
From this, the mininum burst size for a specified rate can be calculated. For i386, a 10mbit rate requires a 12 kilobyte
|
||||
burst as 100*12kb*8 equals 10mbit.
|
||||
|
||||
.SH SEE ALSO
|
||||
|
@ -30,7 +30,7 @@ traffic.
|
||||
On creation with 'tc qdisc add', a fixed number of bands is created. Each
|
||||
band is a class, although is not possible to add classes with 'tc qdisc
|
||||
add', the number of bands to be created must instead be specified on the
|
||||
command line attaching PRIO to its root.
|
||||
commandline attaching PRIO to its root.
|
||||
|
||||
When dequeueing, band 0 is tried first and only if it did not deliver a
|
||||
packet does PRIO try band 1, and so onwards. Maximum reliability packets
|
||||
@ -88,7 +88,7 @@ this:
|
||||
The four TOS bits (the 'TOS field') are defined as:
|
||||
|
||||
.nf
|
||||
Binary Decimal Meaning
|
||||
Binary Decimcal Meaning
|
||||
-----------------------------------------
|
||||
1000 8 Minimize delay (md)
|
||||
0100 4 Maximize throughput (mt)
|
||||
@ -125,13 +125,13 @@ TOS Bits Means Linux Priority Band
|
||||
|
||||
The second column contains the value of the relevant
|
||||
four TOS bits, followed by their translated meaning. For example, 15 stands
|
||||
for a packet wanting Minimal Monetary Cost, Maximum Reliability, Maximum
|
||||
for a packet wanting Minimal Montetary Cost, Maximum Reliability, Maximum
|
||||
Throughput AND Minimum Delay.
|
||||
|
||||
The fourth column lists the way the Linux kernel interprets the TOS bits, by
|
||||
showing to which Priority they are mapped.
|
||||
|
||||
The last column shows the result of the default priomap. On the command line,
|
||||
The last column shows the result of the default priomap. On the commandline,
|
||||
the default priomap looks like this:
|
||||
|
||||
1, 2, 2, 2, 1, 2, 0, 0 , 1, 1, 1, 1, 1, 1, 1, 1
|
||||
|
@ -202,7 +202,8 @@ qdiscs will use all three:
|
||||
tc filters
|
||||
If tc filters are attached to a class, they are consulted first
|
||||
for relevant instructions. Filters can match on all fields of a packet header,
|
||||
as well as on the firewall mark applied by ipchains or iptables.
|
||||
as well as on the firewall mark applied by ipchains or iptables. See
|
||||
.BR tc-filters (8).
|
||||
.TP
|
||||
Type of Service
|
||||
Some qdiscs have built in rules for classifying packets based on the TOS field.
|
||||
@ -241,7 +242,8 @@ qdiscs applies.
|
||||
.TP
|
||||
FILTERS
|
||||
Filters have a three part ID, which is only needed when using a hashed
|
||||
filter hierarchy.
|
||||
filter hierarchy, for which see
|
||||
.BR tc-filters (8).
|
||||
.SH UNITS
|
||||
All parameters accept a floating point number, possibly followed by a unit.
|
||||
.P
|
||||
|
Loading…
Reference in New Issue
Block a user