* [PATCH iproute2 2/6] ip: update man pages and usage() for 'ip monitor'
2012-12-13 13:42 [PATCH iproute2 1/6] ip: add man pages for netconf Nicolas Dichtel
@ 2012-12-13 13:42 ` Nicolas Dichtel
2012-12-13 13:42 ` [PATCH iproute2 3/6] ip: update mand pages and usage() for 'ip mroute' Nicolas Dichtel
` (3 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Nicolas Dichtel @ 2012-12-13 13:42 UTC (permalink / raw)
To: shemminger; +Cc: netdev, Nicolas Dichtel
Sync with the current code.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
ip/ipmonitor.c | 5 ++++-
man/man8/ip-monitor.8 | 15 +++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c
index 09a339c..a9ff1e8 100644
--- a/ip/ipmonitor.c
+++ b/ip/ipmonitor.c
@@ -29,7 +29,10 @@ int prefix_banner;
static void usage(void)
{
- fprintf(stderr, "Usage: ip monitor [ all | LISTofOBJECTS ]\n");
+ fprintf(stderr, "Usage: ip monitor [ all | LISTofOBJECTS ] [ FILE ]\n");
+ fprintf(stderr, "LISTofOBJECTS := link | address | route | mroute | prefix |\n");
+ fprintf(stderr, " neigh | netconf\n");
+ fprintf(stderr, "FILE := file FILENAME\n");
exit(-1);
}
diff --git a/man/man8/ip-monitor.8 b/man/man8/ip-monitor.8
index 351a744..b07cb0e 100644
--- a/man/man8/ip-monitor.8
+++ b/man/man8/ip-monitor.8
@@ -1,4 +1,4 @@
-.TH IP\-MONITOR 8 "20 Dec 2011" "iproute2" "Linux"
+.TH IP\-MONITOR 8 "13 Dec 2012" "iproute2" "Linux"
.SH "NAME"
ip-monitor, rtmon \- state monitoring
.SH "SYNOPSIS"
@@ -6,8 +6,8 @@ ip-monitor, rtmon \- state monitoring
.ad l
.in +8
.ti -8
-.BR "ip monitor" " [ " all " |"
-.IR LISTofOBJECTS " ]"
+.BR "ip " " [ ip-OPTIONS ] " "monitor" " [ " all " |"
+.IR LISTofOBJECTS " ] [ file " FILENAME " ]
.sp
.SH DESCRIPTION
@@ -20,12 +20,13 @@ Namely, the
command is the first in the command line and then the object list follows:
.BR "ip monitor" " [ " all " |"
-.IR LISTofOBJECTS " ]"
+.IR LISTofOBJECTS " ] [ file " FILENAME " ]
.I OBJECT-LIST
is the list of object types that we want to monitor.
It may contain
-.BR link ", " address " and " route "."
+.BR link ", " address ", " route ", " mroute ", " prefix ", "
+.BR neigh " and " netconf "."
If no
.B file
argument is given,
@@ -34,7 +35,9 @@ opens RTNETLINK, listens on it and dumps state changes in the format
described in previous sections.
.P
-If a file name is given, it does not listen on RTNETLINK,
+If a
+.I FILENAME
+is given, it does not listen on RTNETLINK,
but opens the file containing RTNETLINK messages saved in binary format
and dumps them. Such a history file can be generated with the
.B rtmon
--
1.8.0.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH iproute2 3/6] ip: update mand pages and usage() for 'ip mroute'
2012-12-13 13:42 [PATCH iproute2 1/6] ip: add man pages for netconf Nicolas Dichtel
2012-12-13 13:42 ` [PATCH iproute2 2/6] ip: update man pages and usage() for 'ip monitor' Nicolas Dichtel
@ 2012-12-13 13:42 ` Nicolas Dichtel
2012-12-13 13:42 ` [PATCH iproute2 4/6] ip: update man pages for 'ip link' Nicolas Dichtel
` (2 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Nicolas Dichtel @ 2012-12-13 13:42 UTC (permalink / raw)
To: shemminger; +Cc: netdev, Nicolas Dichtel
Sync with the current code.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
ip/ipmroute.c | 2 ++
man/man8/ip-mroute.8 | 14 +++++++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ip/ipmroute.c b/ip/ipmroute.c
index defcfc5..345576d 100644
--- a/ip/ipmroute.c
+++ b/ip/ipmroute.c
@@ -36,6 +36,8 @@ static void usage(void) __attribute__((noreturn));
static void usage(void)
{
fprintf(stderr, "Usage: ip mroute show [ [ to ] PREFIX ] [ from PREFIX ] [ iif DEVICE ]\n");
+ fprintf(stderr, " [ table TABLE_ID ]\n");
+ fprintf(stderr, "TABLE_ID := [ local | main | default | all | NUMBER ]\n");
#if 0
fprintf(stderr, "Usage: ip mroute [ add | del ] DESTINATION from SOURCE [ iif DEVICE ] [ oif DEVICE ]\n");
#endif
diff --git a/man/man8/ip-mroute.8 b/man/man8/ip-mroute.8
index 98aab88..870df5e 100644
--- a/man/man8/ip-mroute.8
+++ b/man/man8/ip-mroute.8
@@ -1,4 +1,4 @@
-.TH IP\-MROUTE 8 "20 Dec 2011" "iproute2" "Linux"
+.TH IP\-MROUTE 8 "13 Dec 2012" "iproute2" "Linux"
.SH "NAME"
ip-mroute \- multicast routing cache management
.SH "SYNOPSIS"
@@ -6,12 +6,15 @@ ip-mroute \- multicast routing cache management
.ad l
.in +8
.ti -8
-.BR "ip mroute show" " ["
+.BR "ip " " [ ip-OPTIONS ] " "mroute show" " [ [ "
+.BR " to " " ] "
.IR PREFIX " ] [ "
.B from
.IR PREFIX " ] [ "
.B iif
-.IR DEVICE " ]"
+.IR DEVICE " ] [ "
+.B table
+.IR TABLE_ID " ] "
.SH DESCRIPTION
.B mroute
@@ -42,6 +45,11 @@ the interface on which multicast packets are received.
.BI from " PREFIX"
the prefix selecting the IP source addresses of the multicast route.
+.TP
+.BI table " TABLE_ID"
+the table id selecting the multicast table. It can be
+.BR local ", " main ", " default ", " all " or a number."
+
.SH SEE ALSO
.br
.BR ip (8)
--
1.8.0.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH iproute2 4/6] ip: update man pages for 'ip link'
2012-12-13 13:42 [PATCH iproute2 1/6] ip: add man pages for netconf Nicolas Dichtel
2012-12-13 13:42 ` [PATCH iproute2 2/6] ip: update man pages and usage() for 'ip monitor' Nicolas Dichtel
2012-12-13 13:42 ` [PATCH iproute2 3/6] ip: update mand pages and usage() for 'ip mroute' Nicolas Dichtel
@ 2012-12-13 13:42 ` Nicolas Dichtel
2012-12-13 13:42 ` [PATCH iproute2 5/6] ip: term OPTIONS was used twice in 'ip route' man pages Nicolas Dichtel
2012-12-13 13:42 ` [PATCH iproute2 6/6] ip/link_iptnl: fix indentation Nicolas Dichtel
4 siblings, 0 replies; 12+ messages in thread
From: Nicolas Dichtel @ 2012-12-13 13:42 UTC (permalink / raw)
To: shemminger; +Cc: netdev, Nicolas Dichtel
Now 'ip link' supports ipip, sit and ip6tnl.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
man/man8/ip-link.8.in | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index 43c4ac6..8d2a6f9 100644
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -1,4 +1,4 @@
-.TH IP\-LINK 8 "20 Dec 2011" "iproute2" "Linux"
+.TH IP\-LINK 8 "13 Dec 2012" "iproute2" "Linux"
.SH "NAME"
ip-link \- network device configuration
.SH "SYNOPSIS"
@@ -59,7 +59,10 @@ ip-link \- network device configuration
.BR vcan " | "
.BR veth " | "
.BR vlan " | "
-.BR vxlan " ]"
+.BR vxlan " |"
+.BR ip6tnl " |"
+.BR ipip " |"
+.BR sit " ]"
.ti -8
.BI "ip link delete " DEVICE
@@ -174,6 +177,15 @@ Link types:
.sp
.BR vxlan
- Virtual eXtended LAN
+.sp
+.BR ip6tnl
+- Virtual tunnel interface IPv4|IPv6 over IPv6
+.sp
+.BR ipip
+- Virtual tunnel interface IPv4 over IPv4
+.sp
+.BR sit
+- Virtual tunnel interface IPv6 over IPv4
.in -8
.TP
--
1.8.0.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH iproute2 5/6] ip: term OPTIONS was used twice in 'ip route' man pages
2012-12-13 13:42 [PATCH iproute2 1/6] ip: add man pages for netconf Nicolas Dichtel
` (2 preceding siblings ...)
2012-12-13 13:42 ` [PATCH iproute2 4/6] ip: update man pages for 'ip link' Nicolas Dichtel
@ 2012-12-13 13:42 ` Nicolas Dichtel
2012-12-13 13:42 ` [PATCH iproute2 6/6] ip/link_iptnl: fix indentation Nicolas Dichtel
4 siblings, 0 replies; 12+ messages in thread
From: Nicolas Dichtel @ 2012-12-13 13:42 UTC (permalink / raw)
To: shemminger; +Cc: netdev, Nicolas Dichtel
INFO_SPEC already uses the term 'OPTIONS' and describe it.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
man/man8/ip-route.8.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/man/man8/ip-route.8.in b/man/man8/ip-route.8.in
index f06fcba..2c35a97 100644
--- a/man/man8/ip-route.8.in
+++ b/man/man8/ip-route.8.in
@@ -1,4 +1,4 @@
-.TH IP\-ROUTE 8 "20 Dec 2011" "iproute2" "Linux"
+.TH IP\-ROUTE 8 "13 Dec 2012" "iproute2" "Linux"
.SH "NAME"
ip-route \- routing table management
.SH "SYNOPSIS"
@@ -7,7 +7,7 @@ ip-route \- routing table management
.in +8
.ti -8
.B ip
-.RI "[ " OPTIONS " ]"
+.RI "[ " ip-OPTIONS " ]"
.B route
.RI " { " COMMAND " | "
.BR help " }"
--
1.8.0.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH iproute2 6/6] ip/link_iptnl: fix indentation
2012-12-13 13:42 [PATCH iproute2 1/6] ip: add man pages for netconf Nicolas Dichtel
` (3 preceding siblings ...)
2012-12-13 13:42 ` [PATCH iproute2 5/6] ip: term OPTIONS was used twice in 'ip route' man pages Nicolas Dichtel
@ 2012-12-13 13:42 ` Nicolas Dichtel
2012-12-14 18:02 ` Stephen Hemminger
4 siblings, 1 reply; 12+ messages in thread
From: Nicolas Dichtel @ 2012-12-13 13:42 UTC (permalink / raw)
To: shemminger; +Cc: netdev, Nicolas Dichtel
Use tabs instead of space when possible.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
ip/link_iptnl.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index 238722d..b00d8d9 100644
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -298,10 +298,10 @@ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[
fprintf(f, "nopmtudisc ");
if (tb[IFLA_IPTUN_FLAGS]) {
- __u16 iflags = rta_getattr_u16(tb[IFLA_IPTUN_FLAGS]);
+ __u16 iflags = rta_getattr_u16(tb[IFLA_IPTUN_FLAGS]);
- if (iflags & SIT_ISATAP)
- fprintf(f, "isatap ");
+ if (iflags & SIT_ISATAP)
+ fprintf(f, "isatap ");
}
if (tb[IFLA_IPTUN_6RD_PREFIXLEN] &&
@@ -314,12 +314,12 @@ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[
printf("6rd-prefix %s/%u ",
inet_ntop(AF_INET6, RTA_DATA(tb[IFLA_IPTUN_6RD_PREFIX]),
- s1, sizeof(s1)),
+ s1, sizeof(s1)),
prefixlen);
if (relayprefix) {
printf("6rd-relay_prefix %s/%u ",
format_host(AF_INET, 4, &relayprefix, s1,
- sizeof(s1)),
+ sizeof(s1)),
relayprefixlen);
}
}
--
1.8.0.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH iproute2 6/6] ip/link_iptnl: fix indentation
2012-12-13 13:42 ` [PATCH iproute2 6/6] ip/link_iptnl: fix indentation Nicolas Dichtel
@ 2012-12-14 18:02 ` Stephen Hemminger
2012-12-17 8:44 ` Nicolas Dichtel
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Hemminger @ 2012-12-14 18:02 UTC (permalink / raw)
To: Nicolas Dichtel; +Cc: netdev
On Thu, 13 Dec 2012 14:42:54 +0100
Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote:
> Use tabs instead of space when possible.
>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Thanks applied all these.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH iproute2 6/6] ip/link_iptnl: fix indentation
2012-12-14 18:02 ` Stephen Hemminger
@ 2012-12-17 8:44 ` Nicolas Dichtel
2012-12-17 16:10 ` Stephen Hemminger
0 siblings, 1 reply; 12+ messages in thread
From: Nicolas Dichtel @ 2012-12-17 8:44 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
Le 14/12/2012 19:02, Stephen Hemminger a écrit :
> On Thu, 13 Dec 2012 14:42:54 +0100
> Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote:
>
>> Use tabs instead of space when possible.
>>
>> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
>
> Thanks applied all these.
>
Two patches are missing in your tree:
1/6 ip: update man pages and usage() for 'ip monitor'
2/6 ip: add man pages for netconf
Should I resend them?
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH iproute2 6/6] ip/link_iptnl: fix indentation
2012-12-17 8:44 ` Nicolas Dichtel
@ 2012-12-17 16:10 ` Stephen Hemminger
2012-12-17 16:41 ` [RESEND PATCH iproute2 1/2] ip: add man pages for netconf Nicolas Dichtel
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Hemminger @ 2012-12-17 16:10 UTC (permalink / raw)
To: nicolas.dichtel; +Cc: netdev
On Mon, 17 Dec 2012 09:44:58 +0100
Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote:
> Le 14/12/2012 19:02, Stephen Hemminger a écrit :
> > On Thu, 13 Dec 2012 14:42:54 +0100
> > Nicolas Dichtel <nicolas.dichtel@6wind.com> wrote:
> >
> >> Use tabs instead of space when possible.
> >>
> >> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
> >
> > Thanks applied all these.
> >
> Two patches are missing in your tree:
> 1/6 ip: update man pages and usage() for 'ip monitor'
> 2/6 ip: add man pages for netconf
>
> Should I resend them?
yes, probably got lost in the merge day.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [RESEND PATCH iproute2 1/2] ip: add man pages for netconf
2012-12-17 16:10 ` Stephen Hemminger
@ 2012-12-17 16:41 ` Nicolas Dichtel
2012-12-17 16:41 ` [RESEND PATCH iproute2 2/2] ip: update man pages and usage() for 'ip monitor' Nicolas Dichtel
0 siblings, 1 reply; 12+ messages in thread
From: Nicolas Dichtel @ 2012-12-17 16:41 UTC (permalink / raw)
To: shemminger; +Cc: netdev, Nicolas Dichtel
This patch add the documentation about 'ip netconf' command.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
man/man8/Makefile | 2 +-
man/man8/ip-netconf.8 | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 1 deletion(-)
create mode 100644 man/man8/ip-netconf.8
diff --git a/man/man8/Makefile b/man/man8/Makefile
index 4bad9d6..d208f3b 100644
--- a/man/man8/Makefile
+++ b/man/man8/Makefile
@@ -9,7 +9,7 @@ MAN8PAGES = $(TARGETS) ip.8 arpd.8 lnstat.8 routel.8 rtacct.8 rtmon.8 ss.8 \
ip-addrlabel.8 ip-l2tp.8 \
ip-maddress.8 ip-monitor.8 ip-mroute.8 ip-neighbour.8 \
ip-netns.8 ip-ntable.8 ip-rule.8 ip-tunnel.8 ip-xfrm.8 \
- ip-tcp_metrics.8
+ ip-tcp_metrics.8 ip-netconf.8
all: $(TARGETS)
diff --git a/man/man8/ip-netconf.8 b/man/man8/ip-netconf.8
new file mode 100644
index 0000000..8041ea2
--- /dev/null
+++ b/man/man8/ip-netconf.8
@@ -0,0 +1,36 @@
+.TH IP\-NETCONF 8 "13 Dec 2012" "iproute2" "Linux"
+.SH "NAME"
+ip-netconf \- network configuration monitoring
+.SH "SYNOPSIS"
+.sp
+.ad l
+.in +8
+.ti -8
+.BR "ip " " [ ip-OPTIONS ] " "netconf show" " [ "
+.B dev
+.IR STRING " ]"
+
+.SH DESCRIPTION
+The
+.B ip netconf
+utility can monitor IPv4 and IPv6 parameters (see
+.BR "/proc/sys/net/ipv[4|6]/conf/[all|DEV]/" ")"
+like forwarding, rp_filter
+or mc_forwarding status.
+
+If no interface is specified, the entry
+.B all
+is displayed.
+
+.SS ip netconf show - display network parameters
+
+.TP
+.BI dev " STRING"
+the name of the device to display network parameters.
+
+.SH SEE ALSO
+.br
+.BR ip (8)
+
+.SH AUTHOR
+Original Manpage by Nicolas Dichtel <nicolas.dichtel@6wind.com>
--
1.8.0.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [RESEND PATCH iproute2 2/2] ip: update man pages and usage() for 'ip monitor'
2012-12-17 16:41 ` [RESEND PATCH iproute2 1/2] ip: add man pages for netconf Nicolas Dichtel
@ 2012-12-17 16:41 ` Nicolas Dichtel
2012-12-17 16:48 ` Stephen Hemminger
0 siblings, 1 reply; 12+ messages in thread
From: Nicolas Dichtel @ 2012-12-17 16:41 UTC (permalink / raw)
To: shemminger; +Cc: netdev, Nicolas Dichtel
Sync with the current code.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
ip/ipmonitor.c | 5 ++++-
man/man8/ip-monitor.8 | 15 +++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/ip/ipmonitor.c b/ip/ipmonitor.c
index 09a339c..a9ff1e8 100644
--- a/ip/ipmonitor.c
+++ b/ip/ipmonitor.c
@@ -29,7 +29,10 @@ int prefix_banner;
static void usage(void)
{
- fprintf(stderr, "Usage: ip monitor [ all | LISTofOBJECTS ]\n");
+ fprintf(stderr, "Usage: ip monitor [ all | LISTofOBJECTS ] [ FILE ]\n");
+ fprintf(stderr, "LISTofOBJECTS := link | address | route | mroute | prefix |\n");
+ fprintf(stderr, " neigh | netconf\n");
+ fprintf(stderr, "FILE := file FILENAME\n");
exit(-1);
}
diff --git a/man/man8/ip-monitor.8 b/man/man8/ip-monitor.8
index 351a744..b07cb0e 100644
--- a/man/man8/ip-monitor.8
+++ b/man/man8/ip-monitor.8
@@ -1,4 +1,4 @@
-.TH IP\-MONITOR 8 "20 Dec 2011" "iproute2" "Linux"
+.TH IP\-MONITOR 8 "13 Dec 2012" "iproute2" "Linux"
.SH "NAME"
ip-monitor, rtmon \- state monitoring
.SH "SYNOPSIS"
@@ -6,8 +6,8 @@ ip-monitor, rtmon \- state monitoring
.ad l
.in +8
.ti -8
-.BR "ip monitor" " [ " all " |"
-.IR LISTofOBJECTS " ]"
+.BR "ip " " [ ip-OPTIONS ] " "monitor" " [ " all " |"
+.IR LISTofOBJECTS " ] [ file " FILENAME " ]
.sp
.SH DESCRIPTION
@@ -20,12 +20,13 @@ Namely, the
command is the first in the command line and then the object list follows:
.BR "ip monitor" " [ " all " |"
-.IR LISTofOBJECTS " ]"
+.IR LISTofOBJECTS " ] [ file " FILENAME " ]
.I OBJECT-LIST
is the list of object types that we want to monitor.
It may contain
-.BR link ", " address " and " route "."
+.BR link ", " address ", " route ", " mroute ", " prefix ", "
+.BR neigh " and " netconf "."
If no
.B file
argument is given,
@@ -34,7 +35,9 @@ opens RTNETLINK, listens on it and dumps state changes in the format
described in previous sections.
.P
-If a file name is given, it does not listen on RTNETLINK,
+If a
+.I FILENAME
+is given, it does not listen on RTNETLINK,
but opens the file containing RTNETLINK messages saved in binary format
and dumps them. Such a history file can be generated with the
.B rtmon
--
1.8.0.1
^ permalink raw reply related [flat|nested] 12+ messages in thread