[Midnightbsd-cvs] src [11117] trunk/contrib/traceroute: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Jun 19 15:08:51 EDT 2018
Revision: 11117
http://svnweb.midnightbsd.org/src/?rev=11117
Author: laffer1
Date: 2018-06-19 15:08:50 -0400 (Tue, 19 Jun 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/contrib/traceroute/CHANGES
trunk/contrib/traceroute/FREEBSD-upgrade
trunk/contrib/traceroute/INSTALL
trunk/contrib/traceroute/README
trunk/contrib/traceroute/VERSION
trunk/contrib/traceroute/as.c
trunk/contrib/traceroute/as.h
trunk/contrib/traceroute/findsaddr-socket.c
trunk/contrib/traceroute/findsaddr.h
trunk/contrib/traceroute/ifaddrlist.c
trunk/contrib/traceroute/ifaddrlist.h
trunk/contrib/traceroute/traceroute.8
trunk/contrib/traceroute/traceroute.c
trunk/contrib/traceroute/traceroute.h
Modified: trunk/contrib/traceroute/CHANGES
===================================================================
--- trunk/contrib/traceroute/CHANGES 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/CHANGES 2018-06-19 19:08:50 UTC (rev 11117)
@@ -1,4 +1,4 @@
-@(#) $Id: CHANGES,v 1.1.1.2 2006-02-25 02:34:12 laffer1 Exp $ (LBL)
+@(#) $Id: CHANGES,v 1.23 2000/12/14 06:53:11 leres Exp $ (LBL)
v1.4 Wed Dec 13 22:50:35 PST 2000
Modified: trunk/contrib/traceroute/FREEBSD-upgrade
===================================================================
--- trunk/contrib/traceroute/FREEBSD-upgrade 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/FREEBSD-upgrade 2018-06-19 19:08:50 UTC (rev 11117)
@@ -1,4 +1,4 @@
-$FreeBSD: src/contrib/traceroute/FREEBSD-upgrade,v 1.3 2002/07/28 02:26:31 fenner Exp $
+$FreeBSD: stable/10/contrib/traceroute/FREEBSD-upgrade 100787 2002-07-28 02:26:31Z fenner $
This directory contains virgin copies of the original distribution files
on a "vendor" branch. Do not, under any circumstances, attempt to upgrade
Modified: trunk/contrib/traceroute/INSTALL
===================================================================
--- trunk/contrib/traceroute/INSTALL 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/INSTALL 2018-06-19 19:08:50 UTC (rev 11117)
@@ -1,4 +1,4 @@
-@(#) $Id: INSTALL,v 1.1.1.2 2006-02-25 02:34:12 laffer1 Exp $ (LBL)
+@(#) $Id: INSTALL,v 1.13 2000/11/23 20:07:29 leres Exp $ (LBL)
Traceroute is known to build and run under SunOS 4.1.4 and Solaris 5.4.
If you are running a really old kernel, see the instructions under the
Modified: trunk/contrib/traceroute/README
===================================================================
--- trunk/contrib/traceroute/README 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/README 2018-06-19 19:08:50 UTC (rev 11117)
@@ -1,4 +1,4 @@
-@(#) $Id: README,v 1.1.1.2 2006-02-25 02:34:12 laffer1 Exp $ (LBL)
+@(#) $Id: README,v 1.9 2000/09/16 05:32:01 leres Exp $ (LBL)
TRACEROUTE 1.4
Lawrence Berkeley National Laboratory
Modified: trunk/contrib/traceroute/VERSION
===================================================================
--- trunk/contrib/traceroute/VERSION 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/VERSION 2018-06-19 19:08:50 UTC (rev 11117)
@@ -1,2 +1,2 @@
1.4a12+FreeBSD
-$FreeBSD: src/contrib/traceroute/VERSION,v 1.3 2002/07/28 02:26:31 fenner Exp $
+$FreeBSD: stable/10/contrib/traceroute/VERSION 100787 2002-07-28 02:26:31Z fenner $
Modified: trunk/contrib/traceroute/as.c
===================================================================
--- trunk/contrib/traceroute/as.c 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/as.c 2018-06-19 19:08:50 UTC (rev 11117)
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/traceroute/as.c,v 1.1.2.2 2009/09/13 11:52:17 ume Exp $ */
+/* $FreeBSD: stable/10/contrib/traceroute/as.c 216184 2010-12-04 14:19:27Z uqs $ */
/* $NetBSD: as.c,v 1.1 2001/11/04 23:14:36 atatat Exp $ */
/*
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -63,7 +56,7 @@
};
void *
-as_setup(char *server)
+as_setup(const char *server)
{
struct aslookup *asn;
struct addrinfo hints, *res0, *res;
@@ -70,6 +63,7 @@
FILE *f;
int s, error;
+ s = -1;
if (server == NULL)
server = getenv("RA_SERVER");
if (server == NULL)
Modified: trunk/contrib/traceroute/as.h
===================================================================
--- trunk/contrib/traceroute/as.h 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/as.h 2018-06-19 19:08:50 UTC (rev 11117)
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/contrib/traceroute/as.h,v 1.1.2.2 2009/09/13 11:52:17 ume Exp $ */
+/* $FreeBSD: stable/10/contrib/traceroute/as.h 216184 2010-12-04 14:19:27Z uqs $ */
/* $NetBSD: as.h,v 1.1 2001/11/04 23:14:36 atatat Exp $ */
/*
@@ -16,13 +16,6 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -37,6 +30,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-void *as_setup(char *);
+void *as_setup(const char *);
unsigned int as_lookup(void *, char *, sa_family_t);
void as_shutdown(void *);
Modified: trunk/contrib/traceroute/findsaddr-socket.c
===================================================================
--- trunk/contrib/traceroute/findsaddr-socket.c 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/findsaddr-socket.c 2018-06-19 19:08:50 UTC (rev 11117)
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/contrib/traceroute/findsaddr-socket.c,v 1.3 2004/07/28 14:21:25 mux Exp $
+ * $FreeBSD: stable/10/contrib/traceroute/findsaddr-socket.c 132796 2004-07-28 14:21:25Z mux $
*/
/* XXX Yes this is WAY too complicated */
@@ -37,7 +37,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Id: findsaddr-socket.c,v 1.1.1.2 2006-02-25 02:34:12 laffer1 Exp $ (LBL)";
+ "@(#) $Id: findsaddr-socket.c,v 1.1 2000/11/23 20:17:12 leres Exp $ (LBL)";
#endif
#include <sys/param.h>
Modified: trunk/contrib/traceroute/findsaddr.h
===================================================================
--- trunk/contrib/traceroute/findsaddr.h 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/findsaddr.h 2018-06-19 19:08:50 UTC (rev 11117)
@@ -18,6 +18,6 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#) $Id: findsaddr.h,v 1.1.1.2 2006-02-25 02:34:12 laffer1 Exp $ (LBL)
+ * @(#) $Id: findsaddr.h,v 1.1 2000/11/19 23:13:38 leres Exp $ (LBL)
*/
const char *findsaddr(const struct sockaddr_in *, struct sockaddr_in *);
Modified: trunk/contrib/traceroute/ifaddrlist.c
===================================================================
--- trunk/contrib/traceroute/ifaddrlist.c 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/ifaddrlist.c 2018-06-19 19:08:50 UTC (rev 11117)
@@ -33,7 +33,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Id: ifaddrlist.c,v 1.1.1.2 2006-02-25 02:34:12 laffer1 Exp $ (LBL)";
+ "@(#) $Id: ifaddrlist.c,v 1.9 2000/11/23 20:01:55 leres Exp $ (LBL)";
#endif
#include <sys/param.h>
@@ -61,11 +61,6 @@
#include <string.h>
#include <unistd.h>
-#include "gnuc.h"
-#ifdef HAVE_OS_PROTO_H
-#include "os-proto.h"
-#endif
-
#include "ifaddrlist.h"
/*
@@ -76,7 +71,7 @@
{
register int fd, nipaddr;
#ifdef HAVE_SOCKADDR_SA_LEN
- register int n;
+ size_t n;
#endif
register struct ifreq *ifrp, *ifend, *ifnext, *mp;
register struct sockaddr_in *sin;
@@ -83,7 +78,7 @@
register struct ifaddrlist *al;
struct ifconf ifc;
struct ifreq ibuf[(32 * 1024) / sizeof(struct ifreq)], ifr;
-#define MAX_IPADDR (sizeof(ibuf) / sizeof(ibuf[0]))
+#define MAX_IPADDR ((int)(sizeof(ibuf) / sizeof(ibuf[0])))
static struct ifaddrlist ifaddrlist[MAX_IPADDR];
char device[sizeof(ifr.ifr_name) + 1];
@@ -96,10 +91,10 @@
ifc.ifc_buf = (caddr_t)ibuf;
if (ioctl(fd, SIOCGIFCONF, (char *)&ifc) < 0 ||
- ifc.ifc_len < sizeof(struct ifreq)) {
+ ifc.ifc_len < (int)sizeof(struct ifreq)) {
if (errno == EINVAL)
(void)sprintf(errbuf,
- "SIOCGIFCONF: ifreq struct too small (%d bytes)",
+ "SIOCGIFCONF: ifreq struct too small (%zu bytes)",
sizeof(ibuf));
else
(void)sprintf(errbuf, "SIOCGIFCONF: %s",
Modified: trunk/contrib/traceroute/ifaddrlist.h
===================================================================
--- trunk/contrib/traceroute/ifaddrlist.h 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/ifaddrlist.h 2018-06-19 19:08:50 UTC (rev 11117)
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#) $Header: /home/cvs/src/contrib/traceroute/ifaddrlist.h,v 1.1.1.2 2006-02-25 02:34:12 laffer1 Exp $ (LBL)
+ * @(#) $Header: traceroute.h,v 1.1 97/01/04 19:33:33 leres Locked $ (LBL)
*/
struct ifaddrlist {
Modified: trunk/contrib/traceroute/traceroute.8
===================================================================
--- trunk/contrib/traceroute/traceroute.8 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/traceroute.8 2018-06-19 19:08:50 UTC (rev 11117)
@@ -13,116 +13,67 @@
.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
.\" WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
.\"
-.\" $Id: traceroute.8,v 1.2 2011-10-01 04:58:18 laffer1 Exp $
-.\" $FreeBSD: src/contrib/traceroute/traceroute.8,v 1.16.2.1 2008/11/13 15:27:48 rpaulo Exp $
+.\" $Id: traceroute.8,v 1.19 2000/09/21 08:44:19 leres Exp $
+.\" $FreeBSD: stable/10/contrib/traceroute/traceroute.8 283958 2015-06-03 17:45:45Z tuexen $
.\"
-.TH TRACEROUTE 8 "19 February 2008"
-.UC 6
-.SH NAME
-traceroute \- print the route packets take to network host
-.SH SYNOPSIS
-.na
-.B traceroute
-[
-.B \-adDeFISnrvx
-] [
-.B \-f
-.I first_ttl
-] [
-.B \-g
-.I gateway
-]
-.br
-.ti +8
-[
-.B \-i
-.I iface
-] [
-.B \-M
-.I first_ttl
-]
-.br
-.ti +8
-[
-.B \-m
-.I max_ttl
-] [
-.B \-P
-.I proto
-] [
-.B \-p
-.I port
-]
-.br
-.ti +8
-[
-.B \-q
-.I nqueries
-] [
-.B \-s
-.I src_addr
-] [
-.B \-t
-.I tos
-]
-.br
-.ti +8
-[
-.B \-w
-.I waittime
-] [
-.B \-A
-.I as_server
-] [
-.B \-z
-.I pausemsecs
-]
-.br
-.ti +8
-.I host
-[
-.I packetlen
-]
-.ad
-.SH DESCRIPTION
+.Dd May 31, 2015
+.Dt TRACEROUTE 8
+.Os
+.Sh NAME
+.Nm traceroute
+.Nd "print the route packets take to network host"
+.Sh SYNOPSIS
+.Nm
+.Bk -words
+.Op Fl adDeFISnrvx
+.Op Fl f Ar first_ttl
+.Op Fl g Ar gateway
+.Op Fl M Ar first_ttl
+.Op Fl m Ar max_ttl
+.Op Fl P Ar proto
+.Op Fl p Ar port
+.Op Fl q Ar nqueries
+.Op Fl s Ar src_addr
+.Op Fl t Ar tos
+.Op Fl w Ar waittime
+.Op Fl A Ar as_server
+.Op Fl z Ar pausemsecs
+.Ar host
+.Op Ar packetlen
+.Ek
+.Sh DESCRIPTION
The Internet is a large and complex aggregation of
network hardware, connected together by gateways.
Tracking the route one's packets follow (or finding the miscreant
gateway that's discarding your packets) can be difficult.
-.I Traceroute
+.Nm
utilizes the IP protocol `time to live' field and attempts to elicit an
ICMP TIME_EXCEEDED response from each gateway along the path to some
host.
-.PP
+.Pp
The only mandatory parameter is the destination host name or IP number.
The default probe datagram length is 40 bytes, but this may be increased
by specifying a packet length (in bytes) after the destination host
name.
-.PP
+.Pp
Other options are:
-.TP
-.B \-a
+.Bl -tag -width Ds
+.It Fl a
Turn on AS# lookups for each hop encountered.
-.TP
-.B -A
+.It Fl A Ar as_server
Turn on AS# lookups and use the given server instead of the
default.
-.TP
-.B \-e
+.It Fl e
Firewall evasion mode.
-Use fixed destination ports for UDP and TCP probes.
+Use fixed destination ports for UDP, UDP-Lite, TCP and SCTP probes.
The destination port does NOT increment with each packet sent.
-.TP
-.B \-f
+.It Fl f Ar first_ttl
Set the initial time-to-live used in the first outgoing probe packet.
-.TP
-.B \-F
+.It Fl F
Set the "don't fragment" bit.
-.TP
-.B \-d
+.It Fl d
Enable socket level debugging.
-.TP
-.B \-D
+.It Fl D
When an ICMP response to our probe datagram is received,
print the differences between the transmitted packet and
the packet quoted by the ICMP response.
@@ -133,65 +84,61 @@
Note,
the IP checksum and the TTL of the quoted packet are not expected to match.
By default, only one probe per hop is sent with this option.
-.TP
-.B \-g
+.It Fl g Ar gateway
Specify a loose source route gateway (8 maximum).
-.TP
-.B \-i
+.It Fl i Ar iface
Specify a network interface to obtain the source IP address for
outgoing probe packets. This is normally only useful on a multi-homed
host. (See the
-.B \-s
+.Fl s
flag for another way to do this.)
-.TP
-.B \-I
+.It Fl I
Use ICMP ECHO instead of UDP datagrams. (A synonym for "-P icmp").
-.TP
-.B \-M
+.It Fl M Ar first_ttl
Set the initial time-to-live value used in outgoing probe packets.
The default is 1, i.e., start with the first hop.
-.TP
-.B \-m
+.It Fl m Ar max_ttl
Set the max time-to-live (max number of hops) used in outgoing probe
-packets. The default is
-.I net.inet.ip.ttl
-hops (the same default used for TCP
+packets. The default is the value of the
+.Va net.inet.ip.ttl
+.Xr sysctl 8
+(the same default used for TCP
connections).
-.TP
-.B \-n
+.It Fl n
Print hop addresses numerically rather than symbolically and numerically
(saves a nameserver address-to-name lookup for each gateway found on the
path).
-.TP
-.B \-P
+.It Fl P Ar proto
Send packets of specified IP protocol. The currently supported protocols
-are: UDP, TCP, GRE and ICMP. Other protocols may also be specified (either by
-name or by number), though
-.I traceroute
+are: UDP, UDP-Lite, TCP, SCTP, GRE and ICMP. Other protocols may also be
+specified (either by name or by number), though
+.Nm
does not implement any special knowledge of their packet formats. This
option is useful for determining which router along a path may be
blocking packets based on IP protocol number. But see BUGS below.
-.TP
-.B \-p
-Protocol specific. For UDP and TCP, sets
-the base port number used in probes (default is 33434).
-Traceroute hopes that nothing is listening on UDP ports
-.I base
+.It Fl p Ar port
+Protocol specific. For UDP, UDP-Lite, TCP and SCTP, sets
+the base
+.Ar port
+number used in probes (default is 33434).
+Traceroute hopes that nothing is listening on UDP ports (or UDP-Lite ports
+if used by
+.Nm
+and supported by the peer)
+.Em base + 1
to
-.I base + nhops * nprobes - 1
+.Em base + nhops * nprobes
at the destination host (so an ICMP PORT_UNREACHABLE message will
be returned to terminate the route tracing). If something is
listening on a port in the default range, this option can be used
to pick an unused port range.
-.TP
-.B \-q
+.It Fl q Ar nqueries
Set the number of probes per hop (default is 3,
unless
-.B -D
+.Fl D
is specified,
when it is 1).
-.TP
-.B \-r
+.It Fl r
Bypass the normal routing tables and send directly to a host on an attached
network.
If the host is not on a directly-attached network,
@@ -198,9 +145,8 @@
an error is returned.
This option can be used to ping a local host through an interface
that has no route through it (e.g., after the interface was dropped by
-.IR routed (8C)).
-.TP
-.B \-s
+.Xr routed 8 .
+.It Fl s Ar src_addr
Use the following IP address (which usually is given as an IP number, not
a hostname) as the source address in outgoing probe packets. On
multi-homed hosts (those with more than one IP
@@ -209,15 +155,13 @@
of the interface the probe packet is sent on. If the IP address
is not one of this machine's interface addresses, an error is
returned and nothing is sent. (See the
-.B \-i
+.Fl i
flag for another way to do this.)
-.TP
-.B \-S
+.It Fl S
Print a summary of how many probes were not answered for each hop.
-.TP
-.B \-t
+.It Fl t Ar tos
Set the
-.I type-of-service
+.Em type-of-service
in probe packets to the following value (default zero). The value must be
a decimal integer in the range 0 to 255. This option can be used to
see if different types-of-service result in different paths. (If you
@@ -226,37 +170,35 @@
Not all values of TOS are legal or
meaningful \- see the IP spec for definitions. Useful values are
probably
-.RB ` -t
-.IR 16 '
+.Fl t Ar 16
(low delay) and
-.RB ` -t
-.IR 8 '
+.Fl t Ar 8
(high throughput).
-.TP
-.B \-v
-Verbose output. Received ICMP packets other than TIME_EXCEEDED and
-UNREACHABLEs are listed.
-.TP
-.B \-w
+.It Fl v
+Verbose output. Received ICMP packets other than
+.Dv TIME_EXCEEDED
+and
+.Dv UNREACHABLE Ns s
+are listed.
+.It Fl w Ar waittime
Set the time (in seconds) to wait for a response to a probe (default 5
sec.).
-.TP
-.B \-x
+.It Fl x
Toggle ip checksums. Normally, this prevents traceroute from calculating
ip checksums. In some cases, the operating system can overwrite parts of
the outgoing packet but not recalculate the checksum (so in some cases
the default is to not calculate checksums and using
-.B \-x
+.Fl x
causes them to be calculated). Note that checksums are usually required
for the last hop when using ICMP ECHO probes
-.RB ( \-I ).
+.Pq Fl I .
So they are always calculated when using ICMP.
-.TP
-.B \-z
+.It Fl z Ar pausemsecs
Set the time (in milliseconds) to pause between probes (default 0).
Some systems such as Solaris and routers such as Ciscos rate limit
icmp messages. A good value to use with this this is 500 (e.g. 1/2 second).
-.PP
+.El
+.Pp
This program attempts to trace the route an IP packet would follow to some
internet host by launching UDP probe
packets with a small ttl (time to live) then listening for an
@@ -263,13 +205,14 @@
ICMP "time exceeded" reply from a gateway. We start our probes
with a ttl of one and increase by one until we get an ICMP "port
unreachable" (which means we got to "host") or hit a max (which
-defaults to
-.I net.inet.ip.ttl
-hops & can be changed with the
-.B \-m
+defaults to the amount of hops specified by the
+.Va net.inet.ip.ttl
+.Xr sysctl 8
+and can be changed with the
+.Fl m
flag). Three
probes (change with
-.B \-q
+.Fl q
flag) are sent at each ttl setting and a
line is printed showing the ttl, address of the gateway and
round trip time of each probe. If the probe answers come from
@@ -276,22 +219,20 @@
different gateways, the address of each responding system will
be printed. If there is no response within a 5 sec. timeout
interval (changed with the
-.B \-w
+.Fl w
flag), a "*" is printed for that
probe.
-.PP
+.Pp
We don't want the destination
host to process the UDP probe packets so the destination port is set to an
unlikely value (if some clod on the destination is using that
value, it can be changed with the
-.B \-p
+.Fl p
flag).
-.PP
+.Pp
A sample use and output might be:
-
-.RS
-.nf
-[yak 71]% traceroute nis.nsf.net.
+.Bd -literal -offset 4n
+% traceroute nis.nsf.net.
traceroute to nis.nsf.net (35.1.1.48), 64 hops max, 38 byte packet
1 helios.ee.lbl.gov (128.3.112.1) 19 ms 19 ms 0 ms
2 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 39 ms 19 ms
@@ -304,9 +245,8 @@
9 129.140.71.6 (129.140.71.6) 139 ms 239 ms 319 ms
10 129.140.81.7 (129.140.81.7) 220 ms 199 ms 199 ms
11 nic.merit.edu (35.1.1.48) 239 ms 239 ms 239 ms
-.fi
-.RE
-
+.Ed
+.Pp
Note that lines 2 & 3 are the same. This is due to a buggy
kernel on the 2nd hop system \- lilac-dmc.Berkeley.EDU \- that forwards
packets with a zero ttl (a bug in the distributed version
@@ -313,12 +253,10 @@
of 4.3BSD). Note that you have to guess what path
the packets are taking cross-country since the NSFNet (129.140)
doesn't supply address-to-name translations for its NSSes.
-.PP
+.Pp
A more interesting example is:
-
-.RS
-.nf
-[yak 72]% traceroute allspice.lcs.mit.edu.
+.Bd -literal -offset 4n
+% traceroute allspice.lcs.mit.edu.
traceroute to allspice.lcs.mit.edu (18.26.0.115), 64 hops max
1 helios.ee.lbl.gov (128.3.112.1) 0 ms 0 ms 0 ms
2 lilac-dmc.Berkeley.EDU (128.32.216.1) 19 ms 19 ms 19 ms
@@ -338,15 +276,14 @@
16 * * *
17 * * *
18 ALLSPICE.LCS.MIT.EDU (18.26.0.115) 339 ms 279 ms 279 ms
-.fi
-.RE
-
+.Ed
+.Pp
Note that the gateways 12, 14, 15, 16 & 17 hops away
either don't send ICMP "time exceeded" messages or send them
with a ttl too small to reach us. 14 \- 17 are running the
MIT C Gateway code that doesn't send "time exceeded"s. God
only knows what's going on with 12.
-.PP
+.Pp
The silent gateway 12 in the above may be the result of a bug in
the 4.[23]BSD network code (and its derivatives): 4.x (x <= 3)
sends an unreachable message using whatever ttl remains in the
@@ -354,9 +291,7 @@
zero, the ICMP "time exceeded" is guaranteed to not make it back
to us. The behavior of this bug is slightly more interesting
when it appears on the destination system:
-
-.RS
-.nf
+.Bd -literal -offset 4n
1 helios.ee.lbl.gov (128.3.112.1) 0 ms 0 ms 0 ms
2 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 19 ms 39 ms
3 lilac-dmc.Berkeley.EDU (128.32.216.1) 19 ms 39 ms 19 ms
@@ -370,9 +305,8 @@
11 * * *
12 * * *
13 rip.Berkeley.EDU (128.32.131.22) 59 ms ! 39 ms ! 39 ms !
-.fi
-.RE
-
+.Ed
+.Pp
Notice that there are 12 "gateways" (13 is the final
destination) and exactly the last half of them are "missing".
What's really happening is that rip (a Sun-3 running Sun OS3.5)
@@ -383,77 +317,82 @@
length. I.e., rip is really only 7 hops away. A reply that
returns with a ttl of 1 is a clue this problem exists.
Traceroute prints a "!" after the time if the ttl is <= 1.
-Since vendors ship a lot of obsolete (DEC's Ultrix, Sun 3.x) or
-non-standard (HPUX) software, expect to see this problem
+Since vendors ship a lot of obsolete
+.Pf ( Tn DEC Ns \'s
+Ultrix, Sun 3.x) or
+non-standard
+.Pq Tn HP-UX
+software, expect to see this problem
frequently and/or take care picking the target host of your
probes.
-
-Other possible annotations after the time are
-.BR !H ,
-.BR !N ,
-or
-.B !P
-(host, network or protocol unreachable),
-.B !S
-(source route failed),
-.B !F\-<pmtu>
-(fragmentation needed \- the RFC1191 Path MTU Discovery value is displayed),
-.B !U
-or
-.B !W
-(destination network/host unknown),
-.B !I
-(source host is isolated),
-.B !A
-(communication with destination network administratively prohibited),
-.B !Z
-(communication with destination host administratively prohibited),
-.B !Q
-(for this ToS the destination network is unreachable),
-.B !T
-(for this ToS the destination host is unreachable),
-.B !X
-(communication administratively prohibited),
-.B !V
-(host precedence violation),
-.B !C
-(precedence cutoff in effect), or
-.B !<num>
-(ICMP unreachable code <num>).
+.Pp
+Other possible annotations after the time are:
+.Bl -hang -offset indent -width 12n
+.It Sy !H
+Host unreachable.
+.It Sy !N
+Network unreachable.
+.It Sy !P
+Protocol unreachable.
+.It Sy !S
+Source route failed.
+.It Sy !F\-<pmtu>
+Fragmentation needed.
+The RFC1191 Path MTU Discovery value is displayed.
+.It Sy !U
+Destination network unknown.
+.It Sy !W
+Destination host unknown.
+.It Sy !I
+Source host is isolated.
+.It Sy !A
+Communication with destination network administratively prohibited.
+.It Sy !Z
+Communication with destination host administratively prohibited.
+.It Sy !Q
+For this ToS the destination network is unreachable.
+.It Sy !T
+For this ToS the destination host is unreachable.
+.It Sy !X
+Communication administratively prohibited.
+.It Sy !V
+Host precedence violation.
+.It Sy !C
+Precedence cutoff in effect.
+.It Sy !<num>
+ICMP unreachable code <num>.
+.El
+.Pp
These are defined by RFC1812 (which supersedes RFC1716).
-If almost all the probes result in some kind of unreachable, traceroute
+If almost all the probes result in some kind of unreachable,
+.Nm
will give up and exit.
-.PP
+.Pp
This program is intended for use in network testing, measurement
and management.
It should be used primarily for manual fault isolation.
Because of the load it could impose on the network, it is unwise to use
-.I traceroute
+.Nm
during normal operations or from automated scripts.
-.SH SEE ALSO
-pathchar(8), netstat(1), ping(8)
-.SH AUTHOR
+.Sh SEE ALSO
+.Xr netstat 1 ,
+.Xr ping 8 ,
+.Xr ping6 8 ,
+.Xr traceroute6 8 .
+.Sh AUTHORS
Implemented by Van Jacobson from a suggestion by Steve Deering. Debugged
by a cast of thousands with particularly cogent suggestions or fixes from
C. Philip Wood, Tim Seaver and Ken Adelman.
-.LP
-The current version is available via anonymous ftp:
-.LP
-.RS
-.I ftp://ftp.ee.lbl.gov/traceroute.tar.gz
-.RE
-.SH BUGS
+.Sh BUGS
When using protocols other than UDP, functionality is reduced.
In particular, the last packet will often appear to be lost, because
even though it reaches the destination host, there's no way to know
that because no ICMP message is sent back.
In the TCP case,
-.I traceroute
+.Nm
should listen for a RST from the destination host (or an intermediate
router that's filtering packets), but this is not implemented yet.
-.PP
-Please send bug reports to traceroute at ee.lbl.gov.
-.PP
+.Pp
The AS number capability reports information that may sometimes be
inaccurate due to discrepancies between the contents of the
routing database server and the current state of the Internet.
Modified: trunk/contrib/traceroute/traceroute.c
===================================================================
--- trunk/contrib/traceroute/traceroute.c 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/traceroute.c 2018-06-19 19:08:50 UTC (rev 11117)
@@ -25,10 +25,10 @@
The Regents of the University of California. All rights reserved.\n";
#if 0
static const char rcsid[] =
- "@(#)$Id: traceroute.c,v 1.2 2011-10-01 04:58:18 laffer1 Exp $ (LBL)";
+ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)";
#endif
static const char rcsid[] =
- "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.34.2.3 2011/06/29 16:46:12 dim Exp $";
+ "$FreeBSD: stable/10/contrib/traceroute/traceroute.c 283958 2015-06-03 17:45:45Z tuexen $";
#endif
/*
@@ -219,8 +219,8 @@
#include <netinet/ip.h>
#include <netinet/ip_var.h>
#include <netinet/ip_icmp.h>
+#include <netinet/sctp.h>
#include <netinet/udp.h>
-#include <netinet/udp_var.h>
#include <netinet/tcp.h>
#include <netinet/tcpip.h>
@@ -245,11 +245,6 @@
#include <string.h>
#include <unistd.h>
-#include "gnuc.h"
-#ifdef HAVE_OS_PROTO_H
-#include "os-proto.h"
-#endif
-
/* rfc1716 */
#ifndef ICMP_UNREACH_FILTER_PROHIB
#define ICMP_UNREACH_FILTER_PROHIB 13 /* admin prohibited filter */
@@ -373,9 +368,10 @@
void getaddr(u_int32_t *, char *);
struct hostinfo *gethostinfo(char *);
u_short in_cksum(u_short *, int);
+u_int32_t sctp_crc32c(const void *, u_int32_t);
char *inetname(struct in_addr);
int main(int, char **);
-u_short p_cksum(struct ip *, u_short *, int);
+u_short p_cksum(struct ip *, u_short *, int, int);
int packet_ok(u_char *, int, struct sockaddr_in *, int);
char *pr_type(u_char);
void print(u_char *, int, struct sockaddr_in *);
@@ -395,8 +391,12 @@
void udp_prep(struct outdata *);
int udp_check(const u_char *, int);
+void udplite_prep(struct outdata *);
+int udplite_check(const u_char *, int);
void tcp_prep(struct outdata *);
int tcp_check(const u_char *, int);
+void sctp_prep(struct outdata *);
+int sctp_check(const u_char *, int);
void gre_prep(struct outdata *);
int gre_check(const u_char *, int);
void gen_prep(struct outdata *);
@@ -430,6 +430,15 @@
udp_check
},
{
+ "udplite",
+ "spt dpt cov sum",
+ IPPROTO_UDPLITE,
+ sizeof(struct udphdr),
+ 32768 + 666,
+ udplite_prep,
+ udplite_check
+ },
+ {
"tcp",
"spt dpt seq ack xxflwin sum urp",
IPPROTO_TCP,
@@ -439,6 +448,15 @@
tcp_check
},
{
+ "sctp",
+ "spt dpt vtag crc tyfllen tyfllen ",
+ IPPROTO_SCTP,
+ sizeof(struct sctphdr),
+ 32768 + 666,
+ sctp_prep,
+ sctp_check
+ },
+ {
"gre",
"flg pro len clid",
IPPROTO_GRE,
@@ -458,7 +476,7 @@
},
{
NULL,
- NULL,
+ "",
0,
2 * sizeof(u_short),
0,
@@ -515,7 +533,10 @@
sockerrno = errno;
}
- setuid(getuid());
+ if (setuid(getuid()) != 0) {
+ perror("setuid()");
+ exit(1);
+ }
#ifdef IPCTL_DEFTTL
{
@@ -544,12 +565,12 @@
case 'a':
as_path = 1;
break;
-
+
case 'A':
as_path = 1;
as_server = optarg;
break;
-
+
case 'd':
options |= SO_DEBUG;
break;
@@ -672,8 +693,11 @@
if (lsrr > 0)
optlen = (lsrr + 1) * sizeof(gwlist[0]);
- minpacket = sizeof(*outip) + proto->hdrlen + sizeof(struct outdata) + optlen;
- packlen = minpacket; /* minimum sized packet */
+ minpacket = sizeof(*outip) + proto->hdrlen + optlen;
+ if (minpacket > 40)
+ packlen = minpacket;
+ else
+ packlen = 40;
/* Process destination and optional packet size */
switch (argc - optind) {
@@ -707,6 +731,11 @@
#endif
protlen = packlen - sizeof(*outip) - optlen;
+ if ((proto->num == IPPROTO_SCTP) && (packlen & 3)) {
+ Fprintf(stderr, "%s: packet length must be a multiple of 4\n",
+ prog);
+ exit(1);
+ }
outip = (struct ip *)malloc((unsigned)packlen);
if (outip == NULL) {
@@ -934,7 +963,7 @@
as_path = 0;
}
}
-
+
#if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
if (setpolicy(sndsock, "in bypass") < 0)
errx(1, "%s", ipsec_strerror());
@@ -962,7 +991,6 @@
for (probe = 0, loss = 0; probe < nprobes; ++probe) {
register int cc;
struct timeval t1, t2;
- struct timezone tz;
register struct ip *ip;
struct outdata outdata;
@@ -973,7 +1001,7 @@
outdata.ttl = ttl;
/* Avoid alignment problems by copying bytewise: */
- (void)gettimeofday(&t1, &tz);
+ (void)gettimeofday(&t1, NULL);
memcpy(&outdata.tv, &t1, sizeof(outdata.tv));
/* Finalize and send packet */
@@ -986,7 +1014,7 @@
double T;
int precis;
- (void)gettimeofday(&t2, &tz);
+ (void)gettimeofday(&t2, NULL);
i = packet_ok(packet, cc, from, seq);
/* Skip short packet */
if (i == 0)
@@ -1152,7 +1180,6 @@
fd_set *fdsp;
size_t nfds;
struct timeval now, wait;
- struct timezone tz;
register int cc = 0;
register int error;
int fromlen = sizeof(*fromp);
@@ -1165,7 +1192,7 @@
wait.tv_sec = tp->tv_sec + waittime;
wait.tv_usec = tp->tv_usec;
- (void)gettimeofday(&now, &tz);
+ (void)gettimeofday(&now, NULL);
tvsub(&wait, &now);
if (wait.tv_sec < 0) {
wait.tv_sec = 0;
@@ -1335,7 +1362,7 @@
hiplen = ((u_char *)icp + cc) - (u_char *)hip;
hlen = hip->ip_hl << 2;
inner = (u_char *)((u_char *)hip + hlen);
- if (hlen + 12 <= cc
+ if (hlen + 16 <= cc
&& hip->ip_p == proto->num
&& (*proto->check)(inner, (u_char)seq))
return (type == ICMP_TIMXCEED ? -1 : code + 1);
@@ -1348,8 +1375,8 @@
Printf("\n%d bytes from %s to ", cc, inet_ntoa(from->sin_addr));
Printf("%s: icmp type %d (%s) code %d\n",
inet_ntoa(ip->ip_dst), type, pr_type(type), icp->icmp_code);
- for (i = 4; i < cc ; i += sizeof(*lp))
- Printf("%2d: x%8.8x\n", i, *lp++);
+ for (i = 4; i <= cc - ICMP_MINLEN; i += sizeof(*lp))
+ Printf("%2d: %8.8x\n", i, ntohl(*lp++));
}
#endif
return(0);
@@ -1388,7 +1415,7 @@
outudp->uh_ulen = htons((u_short)protlen);
outudp->uh_sum = 0;
if (doipcksum) {
- u_short sum = p_cksum(outip, (u_short*)outudp, protlen);
+ u_short sum = p_cksum(outip, (u_short*)outudp, protlen, protlen);
outudp->uh_sum = (sum) ? sum : 0xffff;
}
@@ -1405,6 +1432,32 @@
}
void
+udplite_prep(struct outdata *outdata)
+{
+ struct udphdr *const outudp = (struct udphdr *) outp;
+
+ outudp->uh_sport = htons(ident + (fixedPort ? outdata->seq : 0));
+ outudp->uh_dport = htons(port + (fixedPort ? 0 : outdata->seq));
+ outudp->uh_ulen = htons(8);
+ outudp->uh_sum = 0;
+ if (doipcksum) {
+ u_short sum = p_cksum(outip, (u_short*)outudp, protlen, 8);
+ outudp->uh_sum = (sum) ? sum : 0xffff;
+ }
+
+ return;
+}
+
+int
+udplite_check(const u_char *data, int seq)
+{
+ struct udphdr *const udp = (struct udphdr *) data;
+
+ return (ntohs(udp->uh_sport) == ident + (fixedPort ? seq : 0) &&
+ ntohs(udp->uh_dport) == port + (fixedPort ? 0 : seq));
+}
+
+void
tcp_prep(struct outdata *outdata)
{
struct tcphdr *const tcp = (struct tcphdr *) outp;
@@ -1411,17 +1464,14 @@
tcp->th_sport = htons(ident);
tcp->th_dport = htons(port + (fixedPort ? 0 : outdata->seq));
- tcp->th_seq = (tcp->th_sport << 16) | (tcp->th_dport +
- (fixedPort ? outdata->seq : 0));
+ tcp->th_seq = (tcp->th_sport << 16) | tcp->th_dport;
tcp->th_ack = 0;
tcp->th_off = 5;
tcp->th_flags = TH_SYN;
tcp->th_sum = 0;
- if (doipcksum) {
- u_short sum = p_cksum(outip, (u_short*)tcp, protlen);
- tcp->th_sum = (sum) ? sum : 0xffff;
- }
+ if (doipcksum)
+ tcp->th_sum = p_cksum(outip, (u_short*)tcp, protlen, protlen);
}
int
@@ -1430,11 +1480,52 @@
struct tcphdr *const tcp = (struct tcphdr *) data;
return (ntohs(tcp->th_sport) == ident
- && ntohs(tcp->th_dport) == port + (fixedPort ? 0 : seq))
- && tcp->th_seq == (ident << 16) | (port + seq);
+ && ntohs(tcp->th_dport) == port + (fixedPort ? 0 : seq)
+ && tcp->th_seq == (tcp_seq)((tcp->th_sport << 16) | tcp->th_dport));
}
void
+sctp_prep(struct outdata *outdata)
+{
+ struct sctphdr *const sctp = (struct sctphdr *) outp;
+ struct sctp_chunkhdr *chk;
+
+ sctp->src_port = htons(ident);
+ sctp->dest_port = htons(port + (fixedPort ? 0 : outdata->seq));
+ sctp->v_tag = (sctp->src_port << 16) | sctp->dest_port;
+ sctp->checksum = htonl(0);
+ if (protlen >=
+ (int)(sizeof(struct sctphdr) + sizeof(struct sctp_chunkhdr))) {
+ chk = (struct sctp_chunkhdr *)(sctp + 1);
+ chk->chunk_type = SCTP_SHUTDOWN_ACK;
+ chk->chunk_flags = 0;
+ chk->chunk_length = htons(4);
+ }
+ if (protlen >=
+ (int)(sizeof(struct sctphdr) + 2 * sizeof(struct sctp_chunkhdr))) {
+ chk = chk + 1;
+ chk->chunk_type = SCTP_PAD_CHUNK;
+ chk->chunk_flags = 0;
+ chk->chunk_length = htons(protlen -
+ (sizeof(struct sctphdr) + sizeof(struct sctp_chunkhdr)));
+ }
+ if (doipcksum) {
+ sctp->checksum = sctp_crc32c(sctp, protlen);
+ }
+}
+
+int
+sctp_check(const u_char *data, int seq)
+{
+ struct sctphdr *const sctp = (struct sctphdr *) data;
+
+ return (ntohs(sctp->src_port) == ident
+ && ntohs(sctp->dest_port) == port + (fixedPort ? 0 : seq)
+ && sctp->v_tag ==
+ (u_int32_t)((sctp->src_port << 16) | sctp->dest_port));
+}
+
+void
gre_prep(struct outdata *outdata)
{
struct grehdr *const gre = (struct grehdr *) outp;
@@ -1500,12 +1591,11 @@
/*
* Checksum routine for UDP and TCP headers.
*/
-u_short
-p_cksum(struct ip *ip, u_short *data, int len)
+u_short
+p_cksum(struct ip *ip, u_short *data, int len, int cov)
{
static struct ipovly ipo;
- u_short sumh, sumd;
- u_long sumt;
+ u_short sum[2];
ipo.ih_pr = ip->ip_p;
ipo.ih_len = htons(len);
@@ -1512,11 +1602,10 @@
ipo.ih_src = ip->ip_src;
ipo.ih_dst = ip->ip_dst;
- sumh = in_cksum((u_short*)&ipo, sizeof(ipo)); /* pseudo ip hdr cksum */
- sumd = in_cksum((u_short*)data, len); /* payload data cksum */
- sumt = (sumh << 16) | (sumd);
+ sum[1] = in_cksum((u_short*)&ipo, sizeof(ipo)); /* pseudo ip hdr cksum */
+ sum[0] = in_cksum(data, cov); /* payload data cksum */
- return ~in_cksum((u_short*)&sumt, sizeof(sumt));
+ return ~in_cksum(sum, sizeof(sum));
}
/*
@@ -1555,6 +1644,98 @@
}
/*
+ * CRC32C routine for the Stream Control Transmission Protocol
+ */
+
+#define CRC32C(c, d) (c = (c>>8) ^ crc_c[(c^(d))&0xFF])
+
+static u_int32_t crc_c[256] = {
+ 0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4,
+ 0xC79A971F, 0x35F1141C, 0x26A1E7E8, 0xD4CA64EB,
+ 0x8AD958CF, 0x78B2DBCC, 0x6BE22838, 0x9989AB3B,
+ 0x4D43CFD0, 0xBF284CD3, 0xAC78BF27, 0x5E133C24,
+ 0x105EC76F, 0xE235446C, 0xF165B798, 0x030E349B,
+ 0xD7C45070, 0x25AFD373, 0x36FF2087, 0xC494A384,
+ 0x9A879FA0, 0x68EC1CA3, 0x7BBCEF57, 0x89D76C54,
+ 0x5D1D08BF, 0xAF768BBC, 0xBC267848, 0x4E4DFB4B,
+ 0x20BD8EDE, 0xD2D60DDD, 0xC186FE29, 0x33ED7D2A,
+ 0xE72719C1, 0x154C9AC2, 0x061C6936, 0xF477EA35,
+ 0xAA64D611, 0x580F5512, 0x4B5FA6E6, 0xB93425E5,
+ 0x6DFE410E, 0x9F95C20D, 0x8CC531F9, 0x7EAEB2FA,
+ 0x30E349B1, 0xC288CAB2, 0xD1D83946, 0x23B3BA45,
+ 0xF779DEAE, 0x05125DAD, 0x1642AE59, 0xE4292D5A,
+ 0xBA3A117E, 0x4851927D, 0x5B016189, 0xA96AE28A,
+ 0x7DA08661, 0x8FCB0562, 0x9C9BF696, 0x6EF07595,
+ 0x417B1DBC, 0xB3109EBF, 0xA0406D4B, 0x522BEE48,
+ 0x86E18AA3, 0x748A09A0, 0x67DAFA54, 0x95B17957,
+ 0xCBA24573, 0x39C9C670, 0x2A993584, 0xD8F2B687,
+ 0x0C38D26C, 0xFE53516F, 0xED03A29B, 0x1F682198,
+ 0x5125DAD3, 0xA34E59D0, 0xB01EAA24, 0x42752927,
+ 0x96BF4DCC, 0x64D4CECF, 0x77843D3B, 0x85EFBE38,
+ 0xDBFC821C, 0x2997011F, 0x3AC7F2EB, 0xC8AC71E8,
+ 0x1C661503, 0xEE0D9600, 0xFD5D65F4, 0x0F36E6F7,
+ 0x61C69362, 0x93AD1061, 0x80FDE395, 0x72966096,
+ 0xA65C047D, 0x5437877E, 0x4767748A, 0xB50CF789,
+ 0xEB1FCBAD, 0x197448AE, 0x0A24BB5A, 0xF84F3859,
+ 0x2C855CB2, 0xDEEEDFB1, 0xCDBE2C45, 0x3FD5AF46,
+ 0x7198540D, 0x83F3D70E, 0x90A324FA, 0x62C8A7F9,
+ 0xB602C312, 0x44694011, 0x5739B3E5, 0xA55230E6,
+ 0xFB410CC2, 0x092A8FC1, 0x1A7A7C35, 0xE811FF36,
+ 0x3CDB9BDD, 0xCEB018DE, 0xDDE0EB2A, 0x2F8B6829,
+ 0x82F63B78, 0x709DB87B, 0x63CD4B8F, 0x91A6C88C,
+ 0x456CAC67, 0xB7072F64, 0xA457DC90, 0x563C5F93,
+ 0x082F63B7, 0xFA44E0B4, 0xE9141340, 0x1B7F9043,
+ 0xCFB5F4A8, 0x3DDE77AB, 0x2E8E845F, 0xDCE5075C,
+ 0x92A8FC17, 0x60C37F14, 0x73938CE0, 0x81F80FE3,
+ 0x55326B08, 0xA759E80B, 0xB4091BFF, 0x466298FC,
+ 0x1871A4D8, 0xEA1A27DB, 0xF94AD42F, 0x0B21572C,
+ 0xDFEB33C7, 0x2D80B0C4, 0x3ED04330, 0xCCBBC033,
+ 0xA24BB5A6, 0x502036A5, 0x4370C551, 0xB11B4652,
+ 0x65D122B9, 0x97BAA1BA, 0x84EA524E, 0x7681D14D,
+ 0x2892ED69, 0xDAF96E6A, 0xC9A99D9E, 0x3BC21E9D,
+ 0xEF087A76, 0x1D63F975, 0x0E330A81, 0xFC588982,
+ 0xB21572C9, 0x407EF1CA, 0x532E023E, 0xA145813D,
+ 0x758FE5D6, 0x87E466D5, 0x94B49521, 0x66DF1622,
+ 0x38CC2A06, 0xCAA7A905, 0xD9F75AF1, 0x2B9CD9F2,
+ 0xFF56BD19, 0x0D3D3E1A, 0x1E6DCDEE, 0xEC064EED,
+ 0xC38D26C4, 0x31E6A5C7, 0x22B65633, 0xD0DDD530,
+ 0x0417B1DB, 0xF67C32D8, 0xE52CC12C, 0x1747422F,
+ 0x49547E0B, 0xBB3FFD08, 0xA86F0EFC, 0x5A048DFF,
+ 0x8ECEE914, 0x7CA56A17, 0x6FF599E3, 0x9D9E1AE0,
+ 0xD3D3E1AB, 0x21B862A8, 0x32E8915C, 0xC083125F,
+ 0x144976B4, 0xE622F5B7, 0xF5720643, 0x07198540,
+ 0x590AB964, 0xAB613A67, 0xB831C993, 0x4A5A4A90,
+ 0x9E902E7B, 0x6CFBAD78, 0x7FAB5E8C, 0x8DC0DD8F,
+ 0xE330A81A, 0x115B2B19, 0x020BD8ED, 0xF0605BEE,
+ 0x24AA3F05, 0xD6C1BC06, 0xC5914FF2, 0x37FACCF1,
+ 0x69E9F0D5, 0x9B8273D6, 0x88D28022, 0x7AB90321,
+ 0xAE7367CA, 0x5C18E4C9, 0x4F48173D, 0xBD23943E,
+ 0xF36E6F75, 0x0105EC76, 0x12551F82, 0xE03E9C81,
+ 0x34F4F86A, 0xC69F7B69, 0xD5CF889D, 0x27A40B9E,
+ 0x79B737BA, 0x8BDCB4B9, 0x988C474D, 0x6AE7C44E,
+ 0xBE2DA0A5, 0x4C4623A6, 0x5F16D052, 0xAD7D5351
+};
+
+u_int32_t
+sctp_crc32c(const void *packet, u_int32_t len)
+{
+ u_int32_t i, crc32c;
+ u_int8_t byte0, byte1, byte2, byte3;
+ const u_int8_t *buf = (const u_int8_t *)packet;
+
+ crc32c = ~0;
+ for (i = 0; i < len; i++)
+ CRC32C(crc32c, buf[i]);
+ crc32c = ~crc32c;
+ byte0 = crc32c & 0xff;
+ byte1 = (crc32c>>8) & 0xff;
+ byte2 = (crc32c>>16) & 0xff;
+ byte3 = (crc32c>>24) & 0xff;
+ crc32c = ((byte0 << 24) | (byte1 << 16) | (byte2 << 8) | byte3);
+ return htonl(crc32c);
+}
+
+/*
* Subtract 2 timeval structs: out = out - in.
* Out is assumed to be within about LONG_MAX seconds of in.
*/
Modified: trunk/contrib/traceroute/traceroute.h
===================================================================
--- trunk/contrib/traceroute/traceroute.h 2018-06-19 19:07:27 UTC (rev 11116)
+++ trunk/contrib/traceroute/traceroute.h 2018-06-19 19:08:50 UTC (rev 11117)
@@ -18,7 +18,7 @@
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
- * @(#) $Id: traceroute.h,v 1.1.1.2 2006-02-25 02:34:12 laffer1 Exp $ (LBL)
+ * @(#) $Id: traceroute.h,v 1.1 2000/11/23 20:06:54 leres Exp $ (LBL)
*/
extern char *prog;
More information about the Midnightbsd-cvs
mailing list