diff options
| author | Sami Kerola <kerolasa@iki.fi> | 2018-10-19 20:01:39 +0100 |
|---|---|---|
| committer | Sami Kerola <kerolasa@iki.fi> | 2018-10-19 20:08:57 +0100 |
| commit | 52370fa17af1f007af1b589e951b5cfc628a6df6 (patch) | |
| tree | f50e75788891334efd01a2b9e0188380c3b04416 | |
| parent | 5d45667da08064a3e4afd6fa9d7d4439ea6b2c8f (diff) | |
| download | iputils-52370fa17af1f007af1b589e951b5cfc628a6df6.tar.gz | |
tracepath: remove references to tracepath6
Users should use -6 when tracing network path to IPv6 destination. While
fixing this remove typo from traceroute6 manual, and fix build-sys issue
that the typo'ed note was talking about.
Addresses: https://github.com/iputils/iputils/issues/98
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
| -rw-r--r-- | doc/tracepath.xml | 7 | ||||
| -rw-r--r-- | doc/traceroute6.xml | 2 | ||||
| -rw-r--r-- | meson.build | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/doc/tracepath.xml b/doc/tracepath.xml index 40942e5..877935e 100644 --- a/doc/tracepath.xml +++ b/doc/tracepath.xml @@ -14,7 +14,6 @@ </refmeta> <refnamediv> <refname>tracepath</refname> - <refname>tracepath6</refname> <refpurpose>traces path to a network host discovering MTU along this path</refpurpose> </refnamediv> <!-- body begins here --> @@ -42,7 +41,7 @@ It uses UDP port <emphasis remap='I'>port</emphasis> or some random port. It is similar to <emphasis remap='B'>traceroute</emphasis>, only does not require superuser privileges and has no fancy options.</para> - <para><emphasis remap='B'>tracepath6</emphasis> is good replacement for <emphasis remap='B'>traceroute6</emphasis> + <para><emphasis remap='B'>tracepath -6</emphasis> is good replacement for <emphasis remap='B'>traceroute6</emphasis> and classic example of application of Linux error queues. The situation with IPv4 is worse, because commercial IP routers do not return enough information in ICMP error messages. @@ -82,7 +81,7 @@ of UDP ports to maintain trace history.</para> <term><option>-l</option></term> <listitem> <para>Sets the initial packet length to <emphasis remap='I'>pktlen</emphasis> instead of -65535 for <command>tracepath</command> or 128000 for <emphasis remap='B'>tracepath6</emphasis>.</para> +65535 for <command>IPv4</command> or 128000 for <emphasis remap='B'>IPv6</emphasis>.</para> </listitem> </varlistentry> <varlistentry> @@ -110,7 +109,7 @@ instead of 30.</para> <refsect1 id='output'> <title>OUTPUT</title> <literallayout remap='.nf'> -root@mops:~ # tracepath6 3ffe:2400:0:109::2 +root@mops:~ # tracepath -6 3ffe:2400:0:109::2 1?: [LOCALHOST] pmtu 1500 1: dust.inr.ac.ru 0.411ms 2: dust.inr.ac.ru asymm 1 0.390ms pmtu 1480 diff --git a/doc/traceroute6.xml b/doc/traceroute6.xml index 6c6db92..3a860f7 100644 --- a/doc/traceroute6.xml +++ b/doc/traceroute6.xml @@ -62,7 +62,7 @@ to Linux by Pedro Roque. After this it was kept in sync by Alexey Kuznetsov <refsect1 id='security'> <title>SECURITY</title> - <para><emphasis remap='B'>tracepath6</emphasis> requires CAP_NET_RAW capability + <para><emphasis remap='B'>traceroute6</emphasis> requires CAP_NET_RAW capability to be executed. It is safe to be used as set-uid root.</para> </refsect1> diff --git a/meson.build b/meson.build index 7cb56be..7065848 100644 --- a/meson.build +++ b/meson.build @@ -201,6 +201,12 @@ if build_traceroute6 == true executable('traceroute6', ['traceroute6.c', git_version_h], dependencies : [cap_dep, idn_dep], install: true) + meson.add_install_script('build-aux/setcap-setuid.sh', + join_paths(get_option('prefix'), get_option('bindir')), + 'traceroute6', + perm_type, + setcap.path() + ) endif if build_clockdiff == true |