rpms/iproute
7
0
Fork 0
Code Issues Pull Requests Releases Activity

new version 4.2.0

Browse Source
This commit is contained in:
Pavel Šimerda 2015-09-02 13:47:43 +02:00
parent 7b5b0d9243
commit cb3d41dbba
3 changed files with 178 additions and 497 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
iproute.spec
View File

@ -1,7 +1,7 @@
%global cbq_version v0.7.3
Summary: Advanced IP routing and network device configuration tools
Name: iproute
Version: 4.1.1
Version: 4.2.0
Release: 1%{?dist}
Group: Applications/System
URL: http://kernel.org/pub/linux/utils/net/%{name}2/
@ -11,16 +11,9 @@ Source2: avpkt
# manpage/help improvements
#
# * Posted upstream.
# * TODO: Repost in chunks.
# * Piece by piece absorbed upstream.
#
# https://bugzilla.redhat.com/show_bug.cgi?id=1072441
# https://bugzilla.redhat.com/show_bug.cgi?id=1075692
# https://bugzilla.redhat.com/show_bug.cgi?id=1077191
# https://bugzilla.redhat.com/show_bug.cgi?id=1105438
# https://bugzilla.redhat.com/show_bug.cgi?id=1121261
#
# http://www.spinics.net/lists/netdev/msg325114.html
# https://github.com/pavlix/iproute2/commits/fedora
Patch1: iproute2-3.19.0-docs.patch
License: GPLv2+ and Public Domain
@ -171,6 +164,9 @@ done
%{_includedir}/libnetlink.h
%changelog
* Wed Sep 02 2015 Pavel Šimerda <psimerda@redhat.com> - 4.2.0-1
- new version 4.2.0
* Tue Jul 07 2015 Pavel Šimerda <psimerda@redhat.com> - 4.1.1-1
- new version 4.1.1

657
iproute2-3.19.0-docs.patch
View File

@ -1,115 +1,21 @@
From 040b1593cf1fe8ff51d55e1e7a1ace8631fbbad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <psimerda@redhat.com>
Date: Thu, 2 Apr 2015 15:53:11 +0200
Subject: [PATCH 1/7] docs: improve manual pages and help
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Commit 43d29f7 substantially improves generated ip-address.8 instead of
ip-address.8.in and commit e419f2d removes the generated one losing the
improvements entirely. This commit recovers the lost changes, adapts
them to the current manual page and adds more man page and help
improvements.
Based on previous work by:
* Kenyon Ralph <kenyon@kenyonralph.com>
ip link:
* Add VLAN documentation.
* Fix srcport/dstport in VXLAN documentation.
ip address:
* Improve manual page synopsis and built-it help.
* Use full subcommand names (e.g. 'address' and 'maddress').
* Specify when IPv4, IPv6 or both are affected.
* Add lifetimes, home and nodad.
* Reduce left over double spaces.
ip route:
* Prefer 'show' over 'list' for consistency.
ip rule:
* Remove false statement about Rule 0.
ip tunnel:
* Improve manual page synopsis and built-it help.
ifcfg:
* Add manual page.
bridge fdb:
* Fix fdb synopsis.
tc qdisc:
* Add cbq manual page alias.
Changes (ss):
* Turn Debian specific statement into a general one.
* Refer to .ps docs instead of .html.
See also:
* https://bugzilla.redhat.com/show_bug.cgi?id=1072441
* https://bugzilla.redhat.com/show_bug.cgi?id=1075692
* https://bugzilla.redhat.com/show_bug.cgi?id=1077191
* https://bugzilla.redhat.com/show_bug.cgi?id=1105438
* https://bugzilla.redhat.com/show_bug.cgi?id=1121261
Signed-Off-By: Pavel Šimerda <psimerda@redhat.com>
---
bridge/fdb.c | 8 ++--
doc/ip-cref.tex | 3 --
ip/ip.c | 4 +-
ip/ipaddress.c | 16 +++----
man/man8/bridge.8 | 6 +--
man/man8/cbq.8 | 1 +
man/man8/ifcfg.8 | 57 ++++++++++++++++++++++
man/man8/ip-address.8.in | 120 ++++++++++++++++++++++++++++++++++++-----------
man/man8/ip-link.8.in | 25 +++++++++-
man/man8/ip-route.8.in | 2 +-
man/man8/ip-rule.8 | 2 -
man/man8/ip-tunnel.8 | 6 +--
man/man8/ip.8 | 6 +--
man/man8/ss.8 | 4 +-
14 files changed, 200 insertions(+), 60 deletions(-)
create mode 100644 man/man8/cbq.8
create mode 100644 man/man8/ifcfg.8
diff --git a/bridge/fdb.c b/bridge/fdb.c
index 3c33e22..1fec09a 100644
index bd7e4f9..5516633 100644
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -31,10 +31,10 @@ static unsigned int filter_index;
@@ -31,7 +31,7 @@ static unsigned int filter_index;
static void usage(void)
{
- fprintf(stderr, "Usage: bridge fdb { add | append | del | replace } ADDR dev DEV {self|master} [ temp ]\n"
- " [router] [ dst IPADDR] [ vlan VID ]\n"
- " [ port PORT] [ vni VNI ] [via DEV]\n");
- fprintf(stderr, " bridge fdb {show} [ br BRDEV ] [ brport DEV ]\n");
+ fprintf(stderr, "Usage: bridge fdb { add | append | del } LLADDR dev DEV { local | temp }\n"
+ " [ self ] [ embedded ] [ router ] [ dst IPADDR ]\n"
+ " [ vni VNI ] [ port PORT ] [ via DEVICE ]\n");
+ fprintf(stderr, " bridge fdb show [ br BRDEV ] [ brport DEV ]\n");
exit(-1);
}
- fprintf(stderr, "Usage: bridge fdb { add | append | del | replace ADDR dev DEV\n"
+ fprintf(stderr, "Usage: bridge fdb { add | append | del | replace } LLADDR dev DEV\n"
" [ self ] [ master ] [ use ] [ router ]\n"
" [ local | temp ] [ dst IPADDR ] [ vlan VID ]\n"
" [ port PORT] [ vni VNI ] [via DEV]\n");
diff --git a/doc/ip-cref.tex b/doc/ip-cref.tex
index e7a79a5..c938a2f 100644
index ea14795..58b696b 100644
--- a/doc/ip-cref.tex
+++ b/doc/ip-cref.tex
@@ -2038,9 +2038,6 @@ table \verb|local| (ID 255).
@@ -2049,9 +2049,6 @@ table \verb|local| (ID 255).
The \verb|local| table is a special routing table containing
high priority control routes for local and broadcast addresses.
@ -119,79 +25,23 @@ index e7a79a5..c938a2f 100644
\item Priority: 32766, Selector: match anything, Action: lookup routing
table \verb|main| (ID 254).
The \verb|main| table is the normal routing table containing all non-policy
diff --git a/ip/ip.c b/ip/ip.c
index da16b15..cba43ca 100644
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -47,8 +47,8 @@ static void usage(void)
fprintf(stderr,
"Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n"
" ip [ -force ] -batch filename\n"
-"where OBJECT := { link | addr | addrlabel | route | rule | neigh | ntable |\n"
-" tunnel | tuntap | maddr | mroute | mrule | monitor | xfrm |\n"
+"where OBJECT := { link | address | addrlabel | route | rule | neighbor | ntable |\n"
+" tunnel | tuntap | maddress | mroute | mrule | monitor | xfrm |\n"
" netns | l2tp | fou | tcp_metrics | token | netconf }\n"
" OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
" -h[uman-readable] | -iec |\n"
diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 99a6ab5..dc31515 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -70,15 +70,15 @@ static void usage(void)
if (do_link) {
iplink_usage();
}
- fprintf(stderr, "Usage: ip addr {add|change|replace} IFADDR dev STRING [ LIFETIME ]\n");
+ fprintf(stderr, "Usage: ip address {add|change|replace} IFADDR dev IFNAME [ LIFETIME ]\n");
fprintf(stderr, " [ CONFFLAG-LIST ]\n");
- fprintf(stderr, " ip addr del IFADDR dev STRING [mngtmpaddr]\n");
- fprintf(stderr, " ip addr {show|save|flush} [ dev STRING ] [ scope SCOPE-ID ]\n");
- fprintf(stderr, " [ to PREFIX ] [ FLAG-LIST ] [ label PATTERN ] [up]\n");
- fprintf(stderr, " ip addr {showdump|restore}\n");
+ fprintf(stderr, " ip address del IFADDR dev IFNAME [mngtmpaddr]\n");
+ fprintf(stderr, " ip address {show|save|flush} [ dev IFNAME ] [ scope SCOPE-ID ]\n");
+ fprintf(stderr, " [ to PREFIX ] [ FLAG-LIST ] [ label LABEL ] [up]\n");
+ fprintf(stderr, " ip address {showdump|restore}\n");
fprintf(stderr, "IFADDR := PREFIX | ADDR peer PREFIX\n");
fprintf(stderr, " [ broadcast ADDR ] [ anycast ADDR ]\n");
- fprintf(stderr, " [ label STRING ] [ scope SCOPE-ID ]\n");
+ fprintf(stderr, " [ label IFNAME ] [ scope SCOPE-ID ]\n");
fprintf(stderr, "SCOPE-ID := [ host | link | global | NUMBER ]\n");
fprintf(stderr, "FLAG-LIST := [ FLAG-LIST ] FLAG\n");
fprintf(stderr, "FLAG := [ permanent | dynamic | secondary | primary |\n");
@@ -1059,7 +1059,7 @@ static int ipadd_dump_check_magic(void)
__u32 magic = 0;
if (isatty(STDIN_FILENO)) {
- fprintf(stderr, "Can't restore addr dump from a terminal\n");
+ fprintf(stderr, "Can't restore address dump from a terminal\n");
return -1;
}
@@ -1787,6 +1787,6 @@ int do_ipaddr(int argc, char **argv)
return ipaddr_restore();
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);
}
diff --git a/ip/iprule.c b/ip/iprule.c
index 714278a..4402f99 100644
--- a/ip/iprule.c
+++ b/ip/iprule.c
@@ -36,7 +36,7 @@ static void usage(void)
fprintf(stderr, "SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n");
fprintf(stderr, " [ iif STRING ] [ oif STRING ] [ pref NUMBER ]\n");
fprintf(stderr, "ACTION := [ table TABLE_ID ]\n");
- fprintf(stderr, " [ prohibit | reject | unreachable ]\n");
+ fprintf(stderr, " [ prohibit | unreachable ]\n");
fprintf(stderr, " [ realms [SRCREALM/]DSTREALM ]\n");
fprintf(stderr, " [ goto NUMBER ]\n");
fprintf(stderr, " SUPPRESSOR\n");
diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index 4135d01..fd7e1d8 100644
index 5347a56..af17f7f 100644
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -53,8 +53,8 @@ bridge \- show / manipulate bridge addresses and devices
.I LLADDR
.B dev
.IR DEV " { "
-.BR local " | " temp " } { "
-.BR self " } { " router " } [ "
+.BR local " | " temp " } [ "
+.BR self " ] [ " router " ] [ "
.B dst
.IR IPADDR " ] [ "
.B vni
@@ -65,7 +65,7 @@ bridge \- show / manipulate bridge addresses and devices
.IR DEVICE " ]"
@ -201,6 +51,15 @@ index 4135d01..fd7e1d8 100644
.B dev
.IR DEV " ]"
@@ -118,7 +118,7 @@ is given multiple times, the amount of information increases.
As a rule, the information is statistics or some time values.
.TP
-.BR "\-n" , " \-net" , " \-netns " <NETNS>
+.BR "\-n" , " \-netns " <NETNS>
switches
.B bridge
to the specified network namespace
diff --git a/man/man8/cbq.8 b/man/man8/cbq.8
new file mode 100644
index 0000000..78940b6
@ -209,6 +68,48 @@ index 0000000..78940b6
@@ -0,0 +1 @@
+.so man8/tc-cbq.8
\ No newline at end of file
diff --git a/man/man8/genl.8 b/man/man8/genl.8
new file mode 100644
index 0000000..b3e8f98
--- /dev/null
+++ b/man/man8/genl.8
@@ -0,0 +1,36 @@
+.TH GENL 8
+.SH NAME
+genl \- generic netlink utility frontend
+.SH SYNOPSIS
+.B genl
+.RI [ options ] { ctrl } [ help ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B genl
+command.
+.PP
+\fBgenl\fP utility provides a simple frontend to the generic netlink library.
+.SH OPTIONS
+genl supports the following options.
+.TP
+.B \-h, \-help
+Show summary of options.
+.TP
+.B \-V, \-Version
+Show version of program.
+.TP
+.B \-s, \-stats, \-statistics
+Show object statistics.
+.TP
+.B \-d, \-details
+Show object details.
+.TP
+.B \-r, \-raw
+Dump raw output only.
+.SH SEE ALSO
+.BR ip (8)
+.br
+.SH AUTHOR
+genl was written by Jamal Hadi Salim <hadi@cyberus.ca>.
+.PP
+This manual page was written by Petr Sabata <contyk@redhat.com>.
diff --git a/man/man8/ifcfg.8 b/man/man8/ifcfg.8
new file mode 100644
index 0000000..a6b585e
@ -272,276 +173,68 @@ index 0000000..a6b585e
+
+.SH SEE ALSO
+.BR ip-cref.dvi
diff --git a/man/man8/ip-address.8.in b/man/man8/ip-address.8.in
index 6e46af8..4da3095 100644
--- a/man/man8/ip-address.8.in
+++ b/man/man8/ip-address.8.in
@@ -14,18 +14,26 @@ ip-address \- protocol address management
.sp
.ti -8
-.BR "ip address" " { " add " | " del " } "
-.IB IFADDR " dev " STRING
+.BR "ip address" " { " add " | " change " | " replace " } "
+.IB IFADDR " dev " IFNAME
+.RI "[ " LIFETIME " ] [ " CONFFLAG-LIST " ]"
.ti -8
-.BR "ip address" " { " show " | " flush " } [ " dev
-.IR STRING " ] [ "
+.BR "ip address del"
+.IB IFADDR " dev " IFNAME " [ " mngtmpaddr " ]"
+
+.ti -8
+.BR "ip address" " { " show " | " save " | " flush " } [ " dev
+.IR IFNAME " ] [ "
.B scope
.IR SCOPE-ID " ] [ "
.B to
.IR PREFIX " ] [ " FLAG-LIST " ] [ "
.B label
-.IR PATTERN " ]"
+.IR PATTERN " ] [ " up " ]"
+
+.ti -8
+.BR "ip address" " { " showdump " | " restore " }"
.ti -8
.IR IFADDR " := " PREFIX " | " ADDR
@@ -36,7 +44,7 @@ ip-address \- protocol address management
.B anycast
.IR ADDR " ] [ "
.B label
-.IR STRING " ] [ "
+.IR LABEL " ] [ "
.B scope
.IR SCOPE-ID " ]"
@@ -50,17 +58,34 @@ ip-address \- protocol address management
.ti -8
.IR FLAG " := "
-.RB "[ " permanent " | " dynamic " | " secondary " | " primary " | \
-[ - ] " tentative " | [ - ] " deprecated " | [ - ] " dadfailed " | "\
-temporary " ]"
+.RB "[ " permanent " | " dynamic " | " secondary " | " primary " | "\
+tentative " | " deprecated " | " dadfailed " | " temporary " | " CONFFLAG-LIST " ]"
+
+.ti -8
+.IR CONFFLAG-LIST " := [ " CONFFLAG-LIST " ] " CONFFLAG
+
+.ti -8
+.IR CONFFLAG " := "
+.RB "[ " home " | " nodad " ]"
+
+.ti -8
+.IR LIFETIME " := [ "
+.BI valid_lft " LFT"
+.RB "| " preferred_lft
+.IR LFT " ]"
+
+.ti -8
+.IR LFT " := [ "
+.BR forever " |"
+.IR SECONDS " ]"
.SH "DESCRIPTION"
The
.B address
-is a protocol (IP or IPv6) address attached
-to a network device. Each device must have at least one address
-to use the corresponding protocol. It is possible to have several
-different addresses attached to one device. These addresses are not
+is a protocol (IPv4 or IPv6) address attached
+to a network device. Each device must have at least one address
+to use the corresponding protocol. It is possible to have several
+different addresses attached to one device. These addresses are not
discriminated, so that the term
.B alias
is not quite appropriate for them and we do not use it in this document.
@@ -73,7 +98,7 @@ and deletes old ones.
.SS ip address add - add new protocol address.
.TP
-.BI dev " NAME"
+.BI dev " IFNAME "
the name of the device to add the address to.
.TP
@@ -107,7 +132,7 @@ instead of the broadcast address. In this case, the broadcast address
is derived by setting/resetting the host bits of the interface prefix.
.TP
-.BI label " NAME"
+.BI label " LABEL"
Each address may be tagged with a label string.
In order to preserve compatibility with Linux-2.0 net aliases,
this string must coincide with the name of the device or must be prefixed
@@ -125,7 +150,7 @@ Predefined scope values are:
- the address is globally valid.
.sp
.B site
-- (IPv6 only) the address is site local, i.e. it is
+- (IPv6 only, deprecated) the address is site local, i.e. it is
valid inside this site.
.sp
.B link
@@ -135,6 +160,30 @@ valid inside this site.
- the address is valid only inside this host.
.in -8
+.TP
+.BI valid_lft " LFT"
+the valid lifetime of this address; see section 5.5.4 of
+RFC 4862. When it expires, the address is removed by the kernel.
+Defaults to
+.BR "forever" .
+
+.TP
+.BI preferred_lft " LFT"
+the preferred lifetime of this address; see section 5.5.4
+of RFC 4862. When it expires, the address is no longer used for new
+outgoing connections. Defaults to
+.BR "forever" .
+
+.TP
+.B home
+(IPv6 only) designates this address the "home address" as defined in
+RFC 6275.
+
+.TP
+.B nodad
+(IPv6 only) do not perform Duplicate Address Detection (RFC 4862) when
+adding this address.
+
.SS ip address delete - delete protocol address
.B Arguments:
coincide with the arguments of
@@ -145,7 +194,7 @@ If no arguments are given, the first address is deleted.
.SS ip address show - look at protocol addresses
.TP
-.BI dev " NAME " (default)
+.BI dev " IFNAME " (default)
name of device.
.TP
@@ -219,36 +268,53 @@ The difference is that it does not run when no arguments are given.
.PP
.B Warning:
-This command (and other
+This command and other
.B flush
-commands described below) is pretty dangerous. If you make a mistake,
-it will not forgive it, but will cruelly purge all the addresses.
+commands are unforgiving. They will cruelly purge all the addresses.
.PP
With the
.B -statistics
option, the command becomes verbose. It prints out the number of deleted
-addresses and the number of rounds made to flush the address list. If
-this option is given twice,
+addresses and the number of rounds made to flush the address list.
+If this option is given twice,
.B ip address flush
also dumps all the deleted addresses in the format described in the
previous subsection.
.SH "EXAMPLES"
.PP
+ip address show
+.RS 4
+Shows IPv4 and IPv6 addresses assigned to all network interfaces. The 'show'
+subcommand can be omitted.
+.RE
diff --git a/man/man8/ifstat.8 b/man/man8/ifstat.8
new file mode 100644
index 0000000..042dd3e
--- /dev/null
+++ b/man/man8/ifstat.8
@@ -0,0 +1,54 @@
+.TH IFSTAST 8
+.SH NAME
+ifstat \- handy utility to read net interface statistics
+.SH SYNOPSIS
+.B ifstat
+.RI [ options ]
+.RI [ interface
+.RI [ interface
+.RI [ ... ] ] ]
+.SH DESCRIPTION
+This manual page documents briefly the
+.B ifstat
+command.
+.PP
+ip address show up
+.RS 4
+Same as above except that only addresses assigned to active network interfaces
+are shown.
+.RE
+.PP
ip address show dev eth0
.RS 4
-Shows the addresses assigned to network interface eth0
+Shows IPv4 and IPv6 addresses assigned to network interface eth0.
+.RE
+.PP
+ip address add 2001:0db8:85a3::0370:7334/64 dev eth1
+.RS 4
+Adds an IPv6 address to network interface eth1.
.RE
.PP
-ip addr add 2001:0db8:85a3::0370:7334/64 dev eth1
+ip address delete 2001:0db8:85a3::0370:7334/64 dev eth1
.RS 4
-Adds an IPv6 address to network interface eth1
+Delete the IPv6 address added above.
.RE
.PP
-ip addr flush dev eth4
+ip address flush dev eth4 scope global
.RS 4
-Removes all addresses from device eth4
+Removes all global IPv4 and IPv6 addresses from device eth4. Without 'scope
+global' it would remove all addresses including IPv6 link-local ones.
.RE
.SH SEE ALSO
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index 5ad372c..8ab50c1 100644
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -255,6 +255,21 @@ specifies the number of receive queues for new device.
specifies the desired index of the new virtual device. The link creation fails, if the index is busy.
.TP
+VLAN Type Support
+For a link of type
+.I VLAN
+the following additional arguments are supported:
+
+.BI "ip link add " DEVICE
+.BI type " vlan " id " ID
+.BI link " DEVICE
+
+.in +8
+.sp
+.BI id " VNI "
+- specifies the VLAN Identifer to use. Note that numbers with a leading " 0 " or " 0x " are interpreted as octal or hexadeimal, respectively.
+
+\fBifstat\fP neatly prints out network interface statistics.
+The utility keeps records of the previous data displayed in history files and by default only shows difference between the last and the current call. Location of the history files defaults to /tmp/.ifstat.u$UID but may be overridden with the IFSTAT_HISTORY environment variable.
+.SH OPTIONS
+.TP
VXLAN Type Support
For a link of type
.I VXLAN
@@ -273,7 +288,9 @@ the following additional arguments are supported:
.R " ] [ "
.BI tos " TOS "
.R " ] [ "
-.BI port " MIN MAX "
+.BI dstport " PORT "
+.R " ] [ "
+.BI srcport " MIN MAX "
.R " ] [ "
.I "[no]learning "
.R " ] [ "
@@ -329,7 +346,11 @@ parameter.
- specifies the TOS value to use in outgoing packets.
.sp
-.BI port " MIN MAX"
+.BI dstport " PORT"
+- specifies the UDP destination port to communicate to the remote VXLAN tunnel endpoint.
+
+.sp
+.BI srcport " MIN MAX"
- specifies the range of port numbers to use as UDP
source ports to communicate to the remote VXLAN tunnel endpoint.
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-V, \-\-version
+Show version of program.
+.TP
+.B \-a, \-\-ignore
+Ignore the history file.
+.TP
+.B \-d, \-\-scan=SECS
+Sample statistics every SECS second.
+.TP
+.B \-e, \-\-errors
+Show errors.
+.TP
+.B \-n, \-\-nooutput
+Don't display any output. Update the history file only.
+.TP
+.B \-r, \-\-reset
+Reset history.
+.TP
+.B \-s, \-\-noupdate
+Don't update the history file.
+.TP
+.B \-t, \-\-interval=SECS
+Report average over the last SECS seconds.
+.TP
+.B \-z, \-\-zeros
+Show entries with zero activity.
+.SH SEE ALSO
+.BR ip (8)
+.br
+.SH AUTHOR
+ifstat was written by Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>.
+.PP
+This manual page was written by Petr Sabata <contyk@redhat.com>.
diff --git a/man/man8/ip-route.8.in b/man/man8/ip-route.8.in
index d53cc76..7e68c52 100644
index 72d8d77..9bddfb1 100644
--- a/man/man8/ip-route.8.in
+++ b/man/man8/ip-route.8.in
@@ -16,7 +16,7 @@ ip-route \- routing table management
@ -554,9 +247,18 @@ index d53cc76..7e68c52 100644
.ti -8
diff --git a/man/man8/ip-rule.8 b/man/man8/ip-rule.8
index dd925be..0c45a6f 100644
index dd925be..8434945 100644
--- a/man/man8/ip-rule.8
+++ b/man/man8/ip-rule.8
@@ -41,7 +41,7 @@ ip-rule \- routing policy database management
.IR TABLE_ID " ] [ "
.B nat
.IR ADDRESS " ] [ "
-.BR prohibit " | " reject " | " unreachable " ] [ " realms
+.BR prohibit " | " unreachable " ] [ " realms
.RI "[" SRCREALM "/]" DSTREALM " ]"
.I SUPPRESSOR
@@ -108,8 +108,6 @@ The
.B local
table is a special routing table containing
@ -567,57 +269,20 @@ index dd925be..0c45a6f 100644
.TP
2.
diff --git a/man/man8/ip-tunnel.8 b/man/man8/ip-tunnel.8
index c97c28c..1cc1105 100644
index 8b746cb..790921a 100644
--- a/man/man8/ip-tunnel.8
+++ b/man/man8/ip-tunnel.8
@@ -50,7 +50,7 @@ ip-tunnel - tunnel configuration
.ti -8
.IR MODE " := "
-.RB " { " ipip " | " gre " | " sit " | " isatap " | " ip6ip6 " | " ipip6 " | " ip6gre " | " any " }"
+.RB " { " ipip " | " gre " | " sit " | " isatap " | " vti " | " ip6ip6 " | " ipip6 " | " ip6gre " | " vti6 " | " any " }"
.ti -8
.IR ADDR " := { " IP_ADDRESS " |"
@@ -107,10 +107,10 @@ select the tunnel device name.
set the tunnel mode. Available modes depend on the encapsulating address family.
.br
Modes for IPv4 encapsulation available:
-.BR ipip ", " sit ", " isatap " and " gre "."
+.BR ipip ", " gre ", " sit ", " isatap " and " vti "."
@@ -108,7 +108,7 @@ Modes for IPv4 encapsulation available:
.BR ipip ", " sit ", " isatap ", " vti ", and " gre "."
.br
Modes for IPv6 encapsulation available:
-.BR ip6ip6 ", " ipip6 ", " ip6gre ", and " any "."
-.BR ip6ip6 ", " ipip6 ", " ip6gre ", " vti6 ", and " any "."
+.BR ip6ip6 ", " ipip6 ", " ip6gre " and " vti6 "
.TP
.BI remote " ADDRESS"
diff --git a/man/man8/ip.8 b/man/man8/ip.8
index 4cd71de..24e257b 100644
--- a/man/man8/ip.8
+++ b/man/man8/ip.8
@@ -19,8 +19,8 @@ ip \- show / manipulate routing, devices, policy routing and tunnels
.ti -8
.IR OBJECT " := { "
-.BR link " | " addr " | " addrlabel " | " route " | " rule " | " neigh " | "\
- ntable " | " tunnel " | " tuntap " | " maddr " | " mroute " | " mrule " | "\
+.BR link " | " address " | " addrlabel " | " route " | " rule " | " neigh " | "\
+ ntable " | " tunnel " | " tuntap " | " maddress " | " mroute " | " mrule " | "\
monitor " | " xfrm " | " netns " | " l2tp " | " tcp_metrics " }"
.sp
@@ -66,7 +66,7 @@ Output more detailed information.
.TP
.BR "\-l" , " \-loops " <COUNT>
-Specify maximum number of loops the 'ip addr flush' logic
+Specify maximum number of loops the 'ip address flush' logic
will attempt before giving up. The default is 10.
Zero (0) means loop until all addresses are removed.
diff --git a/man/man8/ss.8 b/man/man8/ss.8
index b7fbaef..736d734 100644
index 6afbabb..773a4b4 100644
--- a/man/man8/ss.8
+++ b/man/man8/ss.8
@@ -131,7 +131,7 @@ Read filter information from FILE.
@ -638,6 +303,26 @@ index b7fbaef..736d734 100644
.br
.BR RFC " 793 "
- https://tools.ietf.org/rfc/rfc793.txt (TCP states)
--
2.0.5
diff --git a/man/man8/tc.8 b/man/man8/tc.8
index feafa05..02d7997 100644
--- a/man/man8/tc.8
+++ b/man/man8/tc.8
@@ -446,7 +446,7 @@ don't terminate tc on errors in batch mode.
If there were any errors during execution of the commands, the application return code will be non zero.
.TP
-.BR "\-n" , " \-net" , " \-netns " <NETNS>
+.BR "\-n" , " \-netns " <NETNS>
switches
.B tc
to the specified network namespace
@@ -502,6 +502,9 @@ option was specified. Classes can be filtered only by
option.
.TP
+.BR "\-force"
+don't terminate tc on errors in batch mode.
+If there were any errors during execution of the commands, the application return code will be non zero.
.BR "\-nm" , " \-name"
resolve class name from
.B /etc/iproute2/tc_cls

2
sources
View File

@ -1 +1 @@
39290cb3a55d38dd8d10e19a3094109f iproute2-4.1.1.tar.xz
51c54cc3245eff451154938fbc0f64f5 iproute2-4.2.0.tar.xz