matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "tc: flower: document that *_ip parameters take a PREFIX as an argument." 

This reverts commit a8a1dccd2a.
This commit is contained in:
Stephen Hemminger 2016-12-21 16:06:35 -08:00
parent 176b6b7329
commit 10da552800
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
man/man8/tc-flower.8
View File

@ -31,8 +31,8 @@ flower \- flow based traffic control filter
.IR ETH_TYPE " } | " .IR ETH_TYPE " } | "
.BR ip_proto " { " tcp " | " udp " | " sctp " | " icmp " | " icmpv6 " | " .BR ip_proto " { " tcp " | " udp " | " sctp " | " icmp " | " icmpv6 " | "
.IR IP_PROTO " } | { " .IR IP_PROTO " } | { "
.BR dst_ip " | " src_ip " } " .BR dst_ip " | " src_ip " } { "
.IR PREFIX " | { " .IR ipv4_address " | " ipv6_address " } | { "
.BR dst_port " | " src_port " } " .BR dst_port " | " src_port " } "
.IR port_number " } | " .IR port_number " } | "
.B enc_key_id .B enc_key_id
@ -108,14 +108,14 @@ may be
.BR tcp ", " udp ", " sctp ", " icmp ", " icmpv6 .BR tcp ", " udp ", " sctp ", " icmp ", " icmpv6
or an unsigned 8bit value in hexadecimal format. or an unsigned 8bit value in hexadecimal format.
.TP .TP
.BI dst_ip " PREFIX" .BI dst_ip " ADDRESS"
.TQ .TQ
.BI src_ip " PREFIX" .BI src_ip " ADDRESS"
Match on source or destination IP address. Match on source or destination IP address.
.I PREFIX .I ADDRESS
must be a valid IPv4 or IPv6 address, depending on the \fBprotocol\fR must be a valid IPv4 or IPv6 address, depending on
option to tc filter, optionally followed by a slash and the prefix length. .BR protocol
If the prefix is missing, \fBtc\fR assumes a full-length host match. option of tc filter.
.TP .TP
.BI dst_port " NUMBER" .BI dst_port " NUMBER"
.TQ .TQ
@ -133,16 +133,16 @@ which have to be specified in beforehand.
.TP .TP
.BI enc_key_id " NUMBER" .BI enc_key_id " NUMBER"
.TQ .TQ
.BI enc_dst_ip " PREFIX" .BI enc_dst_ip " ADDRESS"
.TQ .TQ
.BI enc_src_ip " PREFIX" .BI enc_src_ip " ADDRESS"
.TQ
.BI enc_dst_port " NUMBER"
Match on IP tunnel metadata. Key id Match on IP tunnel metadata. Key id
.I NUMBER .I NUMBER
is a 32 bit tunnel key id (e.g. VNI for VXLAN tunnel). is a 32 bit tunnel key id (e.g. VNI for VXLAN tunnel).
.I PREFIX .I ADDRESS
must be a valid IPv4 or IPv6 address optionally followed by a slash and the must be a valid IPv4 or IPv6 address. Dst port
prefix length. If the prefix is missing, \fBtc\fR assumes a full-length
host match. Dst port
.I NUMBER .I NUMBER
is a 16 bit UDP dst port. is a 16 bit UDP dst port.
.SH NOTES .SH NOTES

8
tc/f_flower.c
View File

@ -48,14 +48,14 @@ static void explain(void)
" dst_mac MASKED-LLADDR |\n" " dst_mac MASKED-LLADDR |\n"
" src_mac MASKED-LLADDR |\n" " src_mac MASKED-LLADDR |\n"
" ip_proto [tcp | udp | sctp | icmp | icmpv6 | IP-PROTO ] |\n" " ip_proto [tcp | udp | sctp | icmp | icmpv6 | IP-PROTO ] |\n"
" dst_ip PREFIX |\n" " dst_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
" src_ip PREFIX |\n" " src_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
" dst_port PORT-NUMBER |\n" " dst_port PORT-NUMBER |\n"
" src_port PORT-NUMBER |\n" " src_port PORT-NUMBER |\n"
" type ICMP-TYPE |\n" " type ICMP-TYPE |\n"
" code ICMP-CODE }\n" " code ICMP-CODE }\n"
" enc_dst_ip PREFIX |\n" " enc_dst_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
" enc_src_ip PREFIX |\n" " enc_src_ip [ IPV4-ADDR | IPV6-ADDR ] |\n"
" enc_key_id [ KEY-ID ] }\n" " enc_key_id [ KEY-ID ] }\n"
" FILTERID := X:Y:Z\n" " FILTERID := X:Y:Z\n"
" MASKED_LLADDR := { LLADDR | LLADDR/MASK | LLADDR/BITS }\n" " MASKED_LLADDR := { LLADDR | LLADDR/MASK | LLADDR/BITS }\n"