Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

mdocify and update the traceroute(8) manual page.

Reviewed by: brueffer
No objection: ru, uqs

Fix a bug in the TCP tracerouting which resulted in not accepting any
incoming packets. So all packets seemed to be lost.

MFC after: 1 week

For some reason, contrib/traceroute/traceroute.c ensures MAXHOSTNAMELEN
is defined, but then proceeds to use a hardcoded maximum hostname length
of 64 anyway. Fix this by checking against MAXHOSTNAMELEN instead.

PR: bin/157732
MFC after: 3 days

Check return code of setuid() in traceroute.

While it will not fail in normal circumstances, better safe than sorry.

Reported by: LLVM's clang static analyzer
MFC after: 3 days

traceroute(8): make WARNS=3 clean

Also fixes an operator precedence bug for TCP tracerouting

Remove unused traceroute(8) contrib code from head

It still lives on under vendor/traceroute.

Remove clause 3 and 4 from TNF licenses.

Obtained from: NetBSD
Approved by: core

Remove unneeded struct timezone passed to gettimeofday().

- Add AS lookup functionality to traceroute6(8) as well.
- Support for IPv6 transport for AS lookup.
- Introduce $RA_SERVER to set whois server.
- Support for 4 byte ASN.
- ANSIfy function declaration in as.c.

Tested by: IHANet folks.

Add AS lookup functionality. On each hop we query a whois server to
find the corresponding AS for that IP (-a switch).
We can also choose a different whois server with the -A switch. The
default is whois.radb.net.

Obtained from: NetBSD
Reviewed by: bms, njl (mentor)
Approved by: njl (mentor)

Commit IPv6 support for FAST_IPSEC to the tree.
This commit includes all remaining changes for the time being including
user space updates.

Submitted by: bz
Approved by: re

o I failed to find a suitable explanation why traceroute(8) and
traceroute6(8) force -w flag (wait time) to be > 1 sec. Make it
possible to use 1 sec wait time.

PR: bin/110933
Submitted by: Dmitry Marakasov
Reviewed by: freebsd-net (silence)
MFC after: 1 month

Make it so that the synopsis and usage message almost agree.

MFC after: 3 weeks

Add a -D option to traceroute that prints the differences between
the probe packet we sent and the packet quoted by the ICMP response.
Can be useful for spotting hops that change the packet in-flight
or have problems generating correct ICMP responses.

MFC after: 3 weeks

Make traceroute decode all the ICMP unreachable messages defined
in http://www.iana.org/assignments/icmp-parameters. Thankfully
IANA's list aggrees with <netinet/ip_icmp.h>.

I've tried to do this in a way which is mostly consistent with
tcptraceroute and Debian's version of traceroute. However, sometimes
a letter is used twice by these versions, so I've gone with:

LBL tcptr Debian (chosen)
ICMP_UNREACH_NET !N !N !N !N
ICMP_UNREACH_HOST !H !H !H !H
ICMP_UNREACH_PROTOCOL !P !P !P !P
ICMP_UNREACH_PORT ! !p ! !
ICMP_UNREACH_NEEDFRAG !F-%d !F !F-<%d> !F-<%d>
ICMP_UNREACH_SRCFAIL !S !S !S !S
ICMP_UNREACH_NET_UNKNOWN !<%d> !U !<%d> !U
ICMP_UNREACH_HOST_UNKNOWN !<%d> !U !<%d> !W
ICMP_UNREACH_ISOLATED !<%d> !I !I !I
ICMP_UNREACH_NET_PROHIB !<%d> !A !A !A
ICMP_UNREACH_HOST_PROHIB !<%d> !C !C !Z
ICMP_UNREACH_TOSNET !<%d> !T !T !Q
ICMP_UNREACH_TOSHOST !<%d> !T !T !T
ICMP_UNREACH_FILTER_PROHIB !X !A !A !X
ICMP_UNREACH_HOST_PRECEDENCE !V !<%d> !V !V
ICMP_UNREACH_PRECEDENCE_CUTOFF !C !<%d> !C !C

Graham Wilson is planning to use the same codes in Debian's version.

MFC after: 3 weeks

o It's lilac-dmc.Berkeley.EDU, not lbl-csam.arpa.

Obtained from: NetBSD

Option for setting a fixed destination port. This is useful for tracing
to a host behind a firewall where only specific services are allowed.
For example, to trace the hops to an HTTP server behind a firewall,

$ traceroute -e -P tcp -p 80 www-firewalled.example.com

MFC after: 1 week

- Update pretty print of multipath routes to better handle timeout of first
probe

Before:
5 *
freebsd (195.250.137.134) 19.086 ms 24.694 ms

After:
5 * freebsd (195.250.137.134) 19.086 ms 24.694 ms

Fixes: bin/90098
Reported by: Jeremy Chadwick <freebsd@jdc.parodius.com>
Approved by: andre
MFC after: 1 day

Pretty print multipath routes.

Before (backslash in c syntax meaning):
6 p16-2-0-0.r21.sttlwa01.us.bb.verio.net (129.250.2.180) 71.027 ms \
p16-1-1-3.r20.sttlwa01.us.bb.verio.net (129.250.2.6) 66.730 ms 66.535 ms
7 xe-0-2-0.r20.sttlwa01.us.bb.verio.net (129.250.4.16) 71.092 ms \
xe-3-1.r00.sttlwa01.us.bb.verio.net (129.250.2.205) 66.598 ms \
xe-0-2-0.r20.sttlwa01.us.bb.verio.net (129.250.4.16) 71.024 ms

After:
6 p16-2-0-0.r21.sttlwa01.us.bb.verio.net (129.250.2.180) 71.027 ms
p16-1-1-3.r20.sttlwa01.us.bb.verio.net (129.250.2.6) 66.730 ms 66.535 ms
7 xe-0-2-0.r20.sttlwa01.us.bb.verio.net (129.250.4.16) 71.092 ms
xe-3-1.r00.sttlwa01.us.bb.verio.net (129.250.2.205) 66.598 ms
xe-0-2-0.r20.sttlwa01.us.bb.verio.net (129.250.4.16) 71.024 ms

Submitted by: Richard A Steenbergen <ras at e-gerbil.net>
MFC after: 3 days

Fix minor discrepancy between documentation and implementation: the
destination port is incremented for each packet sent to the same hop.

MFC after: 1 week

Remove an empty default: case to please GCC 3.4.2.

Check -s option source address for validity.

PR: bin/29026
MFC after: 1 week

Fix traceroute where [number of hops] * [number of packets per hop] > 255.

PR: misc/61336
Submitted by: Mike Hibler <mike@cs.utah.edu>
Approved by: rwatson (mentor)

Fix misspelling.

PR: docs/44930
Submitted by: Michael McGoldrick <mmcgoldrick@linuxdriven.net>

Routing socket messages are padded to sizeof(long), not just
sizeof(u_int32_t).

Calculate checksums correctly when LSRR is in effect by passing the
IP header and protocol header seperately.
Also calculate TCP checksums.

Submitted by: orion

Merge 1.4a12

This commit was generated by cvs2svn to compensate for changes in r100784,
which included commits to RCS files with non-trunk default branches.

s/ifdef/ifndef/.

Fenner got this inverted through a misunderstanding between us.

Add '+FreeBSD' to the version string, to reflect that this program
bears little relationship to the one from LBL with the same
name and version number.

Add an ICMP protocol handler, partly based on LBL's traceroute 1.4 .

Submitted by: dcs

Actually use gen_prep() and gen_check(), instead of udp_prep() and
udp_check(), for unknown protocols.

Allocate and clear the correct number of bytes for a
struct fd_set that should be able to hold sock + 1 bits.
Before, it was apparently assumed that an fd_mask has
the same size as type char.

PR: bin/39617
Reported by: Peter N Lewis <peter@stairways.com.au>

Fetch the default maximum TTL value from the net.inet.ip.ttl MIB.

PR: bin/19598
MFC after: 1 week

Defining usage() "__dead" is just ridiculous. It also won't compile with
a June 2000 GCC 2.96 snapshot.

Reviewed by: bde

Don't write past the end of our fd_set

Obtained from: OpenBSD, via KAME

Format string paranoia.

Document the -S flag (added in rev. 1.4) in the usage() function.

PR: bin/18153
Prompted by: Nathan Ahlstrom <nrahlstr@winternet.com>

Correct FreeBSD id place. Also correct vendor rcsid.

Specified by: bde

Reviewed by: bde

Bypass IPsec for traceroute invoked by root.

PR: bin/17606
Submitted by: Louis Mamakos <louie@TransSys.COM

s/tcpdump/traceroute

PR: docs/14523
Submitted by: Adam Morrison <adam@xpert.com>

Fully document -q.
Restore original $Header$.

Fix bug (introduced by me) where UDP port numbers were starting at 1 instead
of 33435 like before.

Reported by: John Polstra <jdp@polstra.com>

Add a min TTL flag to go along with the max TTL flag. That is, this flag
allows you to start tracing at a hop number other than 1.

Submitted by: Stefan `Sec` Zehl <sec@42.org>

Add the capability for traceroute(8) to send packets of any IP protocol
instead of just UDP; an alternate protocol is specified by '-P proto'.
This is useful for finding routers that are blocking packets based on
IP protocol. New handlers can be added fairly easily to do protocol-
specific things.

Better fix for the traceroute flood bug.

Submitted by: bde

If the user provided a large enough argument to the -w option, the sum
would overflow and you'd end up doing select() with a negative timeout.

Fix an alignment problem on alpha by doing a bytewise copy.

Fix an anomaly in the option descriptions.

PR: 5469
Submitted by: NOKUBI Hirotaka <h-nokubi@yyy.or.jp>

Fix a typo. Oops.

Submitted by: asami

Paul objected to my previous change. This adds the same functionality
(implemented better, admittedly) with a new option, '-S'. If the
maintainers of traceroute (Van?) add a -S option, we will then be in
conflict.

Also added a too-brief description of the option in the man page. Someone
with a better command of English than I at the moment should probably look
over it and rephrase it.

Reviewed by: pst, jkh

Print out a summary of the loss percentages for each hop. No manual changes
just yet, I know, evil of me.

Reviewed by: jkh

Instructions on upgrading traceroute

Add FreeBSD modifications
- Move setuid(getuid()) much earlier
- Add "SANE_PRECISION" time printing code

This commit was generated by cvs2svn to compensate for changes in r18579,
which included commits to RCS files with non-trunk default branches.