From f050a320ca4b46809073fd4813d0cb7df92875f2 Mon Sep 17 00:00:00 2001 From: Steven Edwards Date: Wed, 15 Jun 2005 20:24:31 +0000 Subject: [PATCH] Added new better tracert replacement by Ged Murphy svn path=/trunk/; revision=15926 --- reactos/apps/utils/net/directory.xml | 3 + reactos/apps/utils/net/tracert/ip.h | 195 --- reactos/apps/utils/net/tracert/ip_icmp.h | 186 --- reactos/apps/utils/net/tracert/tracert.c | 1613 ++++++++------------ reactos/apps/utils/net/tracert/tracert.h | 80 + reactos/apps/utils/net/tracert/tracert.rc | 5 +- reactos/apps/utils/net/tracert/tracert.xml | 12 + 7 files changed, 753 insertions(+), 1341 deletions(-) delete mode 100644 reactos/apps/utils/net/tracert/ip.h delete mode 100644 reactos/apps/utils/net/tracert/ip_icmp.h create mode 100644 reactos/apps/utils/net/tracert/tracert.h create mode 100644 reactos/apps/utils/net/tracert/tracert.xml diff --git a/reactos/apps/utils/net/directory.xml b/reactos/apps/utils/net/directory.xml index a0b63207a20..d47738b9da4 100644 --- a/reactos/apps/utils/net/directory.xml +++ b/reactos/apps/utils/net/directory.xml @@ -22,6 +22,9 @@ + + + diff --git a/reactos/apps/utils/net/tracert/ip.h b/reactos/apps/utils/net/tracert/ip.h deleted file mode 100644 index 6463b72dcc4..00000000000 --- a/reactos/apps/utils/net/tracert/ip.h +++ /dev/null @@ -1,195 +0,0 @@ -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip.h 8.2 (Berkeley) 6/1/94 - * $FreeBSD: src/sys/netinet/ip.h,v 1.16 1999/08/28 00:49:19 peter Exp $ - */ - -#ifndef _NETINET_IP_H_ -#define _NETINET_IP_H_ - -/* - * Definitions for internet protocol version 4. - * Per RFC 791, September 1981. - */ -#define IPVERSION 4 - -/* A little magic to make the Windows build happy. */ -#if defined(_MSC_VER) || defined(__MINGW32__) -#include -#include -#include - -typedef u_short n_short; -typedef u_int n_long; -typedef u_int n_time; - -#define EMSGSIZE WSAEMSGSIZE -#define ENETUNREACH WSAENETUNREACH -#define EHOSTUNREACH WSAEHOSTUNREACH -#endif - -/* - * Structure of an internet header, naked of options. - */ -struct ip { -#ifdef _IP_VHL - u_char ip_vhl; /* version << 4 | header length >> 2 */ -#else -#if BYTE_ORDER == LITTLE_ENDIAN - u_int ip_hl:4, /* header length */ - ip_v:4; /* version */ -#endif -#if BYTE_ORDER == BIG_ENDIAN - u_int ip_v:4, /* version */ - ip_hl:4; /* header length */ -#endif -#endif /* not _IP_VHL */ - u_char ip_tos; /* type of service */ - u_short ip_len; /* total length */ - u_short ip_id; /* identification */ - u_short ip_off; /* fragment offset field */ -#define IP_RF 0x8000 /* reserved fragment flag */ -#define IP_DF 0x4000 /* don't fragment flag */ -#define IP_MF 0x2000 /* more fragments flag */ -#define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ - u_char ip_ttl; /* time to live */ - u_char ip_p; /* protocol */ - u_short ip_sum; /* checksum */ - struct in_addr ip_src,ip_dst; /* source and dest address */ -}; - -#ifdef _IP_VHL -#define IP_MAKE_VHL(v, hl) ((v) << 4 | (hl)) -#define IP_VHL_HL(vhl) ((vhl) & 0x0f) -#define IP_VHL_V(vhl) ((vhl) >> 4) -#define IP_VHL_BORING 0x45 -#endif - -#define IP_MAXPACKET 65535 /* maximum packet size */ - -/* - * Definitions for IP type of service (ip_tos) - */ -#define IPTOS_LOWDELAY 0x10 -#define IPTOS_THROUGHPUT 0x08 -#define IPTOS_RELIABILITY 0x04 -#define IPTOS_MINCOST 0x02 - -/* - * Definitions for IP precedence (also in ip_tos) (hopefully unused) - */ -#define IPTOS_PREC_NETCONTROL 0xe0 -#define IPTOS_PREC_INTERNETCONTROL 0xc0 -#define IPTOS_PREC_CRITIC_ECP 0xa0 -#define IPTOS_PREC_FLASHOVERRIDE 0x80 -#define IPTOS_PREC_FLASH 0x60 -#define IPTOS_PREC_IMMEDIATE 0x40 -#define IPTOS_PREC_PRIORITY 0x20 -#define IPTOS_PREC_ROUTINE 0x00 - -/* - * Definitions for options. - */ -#define IPOPT_COPIED(o) ((o)&0x80) -#define IPOPT_CLASS(o) ((o)&0x60) -#define IPOPT_NUMBER(o) ((o)&0x1f) - -#define IPOPT_CONTROL 0x00 -#define IPOPT_RESERVED1 0x20 -#define IPOPT_DEBMEAS 0x40 -#define IPOPT_RESERVED2 0x60 - -#define IPOPT_EOL 0 /* end of option list */ -#define IPOPT_NOP 1 /* no operation */ - -#define IPOPT_RR 7 /* record packet route */ -#define IPOPT_TS 68 /* timestamp */ -#define IPOPT_SECURITY 130 /* provide s,c,h,tcc */ -#define IPOPT_LSRR 131 /* loose source route */ -#define IPOPT_SATID 136 /* satnet id */ -#define IPOPT_SSRR 137 /* strict source route */ -#define IPOPT_RA 148 /* router alert */ - -/* - * Offsets to fields in options other than EOL and NOP. - */ -#define IPOPT_OPTVAL 0 /* option ID */ -#define IPOPT_OLEN 1 /* option length */ -#define IPOPT_OFFSET 2 /* offset within option */ -#define IPOPT_MINOFF 4 /* min value of above */ - -/* - * Time stamp option structure. - */ -struct ip_timestamp { - u_char ipt_code; /* IPOPT_TS */ - u_char ipt_len; /* size of structure (variable) */ - u_char ipt_ptr; /* index of current entry */ -#if BYTE_ORDER == LITTLE_ENDIAN - u_int ipt_flg:4, /* flags, see below */ - ipt_oflw:4; /* overflow counter */ -#endif -#if BYTE_ORDER == BIG_ENDIAN - u_int ipt_oflw:4, /* overflow counter */ - ipt_flg:4; /* flags, see below */ -#endif - union ipt_timestamp { - n_long ipt_time[1]; - struct ipt_ta { - struct in_addr ipt_addr; - n_long ipt_time; - } ipt_ta[1]; - } ipt_timestamp; -}; - -/* flag bits for ipt_flg */ -#define IPOPT_TS_TSONLY 0 /* timestamps only */ -#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */ -#define IPOPT_TS_PRESPEC 3 /* specified modules only */ - -/* bits for security (not byte swapped) */ -#define IPOPT_SECUR_UNCLASS 0x0000 -#define IPOPT_SECUR_CONFID 0xf135 -#define IPOPT_SECUR_EFTO 0x789a -#define IPOPT_SECUR_MMMM 0xbc4d -#define IPOPT_SECUR_RESTR 0xaf13 -#define IPOPT_SECUR_SECRET 0xd788 -#define IPOPT_SECUR_TOPSECRET 0x6bc5 - -/* - * Internet implementation parameters. - */ -#define MAXTTL 255 /* maximum time to live (seconds) */ -#define IPDEFTTL 64 /* default ttl, from RFC 1340 */ -#define IPFRAGTTL 60 /* time to live for frags, slowhz */ -#define IPTTLDEC 1 /* subtracted when forwarding */ - -#define IP_MSS 576 /* default maximum segment size */ - -#endif diff --git a/reactos/apps/utils/net/tracert/ip_icmp.h b/reactos/apps/utils/net/tracert/ip_icmp.h deleted file mode 100644 index 2b3ee2eb280..00000000000 --- a/reactos/apps/utils/net/tracert/ip_icmp.h +++ /dev/null @@ -1,186 +0,0 @@ -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip_icmp.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/ip_icmp.h,v 1.13 1999/08/28 00:49:24 peter Exp $ - */ - -#ifndef _NETINET_IP_ICMP_H_ -#define _NETINET_IP_ICMP_H_ - -/* - * Interface Control Message Protocol Definitions. - * Per RFC 792, September 1981. - */ - -/* - * Internal of an ICMP Router Advertisement - */ -struct icmp_ra_addr { - u_int32_t ira_addr; - u_int32_t ira_preference; -}; - -/* - * Structure of an icmp header. - */ -struct icmp { - u_char icmp_type; /* type of message, see below */ - u_char icmp_code; /* type sub code */ - u_short icmp_cksum; /* ones complement cksum of struct */ - union { - u_char ih_pptr; /* ICMP_PARAMPROB */ - struct in_addr ih_gwaddr; /* ICMP_REDIRECT */ - struct ih_idseq { - n_short icd_id; - n_short icd_seq; - } ih_idseq; - int ih_void; - - /* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */ - struct ih_pmtu { - n_short ipm_void; - n_short ipm_nextmtu; - } ih_pmtu; - - struct ih_rtradv { - u_char irt_num_addrs; - u_char irt_wpa; - u_int16_t irt_lifetime; - } ih_rtradv; - } icmp_hun; -#define icmp_pptr icmp_hun.ih_pptr -#define icmp_gwaddr icmp_hun.ih_gwaddr -#define icmp_id icmp_hun.ih_idseq.icd_id -#define icmp_seq icmp_hun.ih_idseq.icd_seq -#define icmp_void icmp_hun.ih_void -#define icmp_pmvoid icmp_hun.ih_pmtu.ipm_void -#define icmp_nextmtu icmp_hun.ih_pmtu.ipm_nextmtu -#define icmp_num_addrs icmp_hun.ih_rtradv.irt_num_addrs -#define icmp_wpa icmp_hun.ih_rtradv.irt_wpa -#define icmp_lifetime icmp_hun.ih_rtradv.irt_lifetime - union { - struct id_ts { - n_time its_otime; - n_time its_rtime; - n_time its_ttime; - } id_ts; - struct id_ip { - struct ip idi_ip; - /* options and then 64 bits of data */ - } id_ip; - struct icmp_ra_addr id_radv; - u_int32_t id_mask; - char id_data[1]; - } icmp_dun; -#define icmp_otime icmp_dun.id_ts.its_otime -#define icmp_rtime icmp_dun.id_ts.its_rtime -#define icmp_ttime icmp_dun.id_ts.its_ttime -#define icmp_ip icmp_dun.id_ip.idi_ip -#define icmp_radv icmp_dun.id_radv -#define icmp_mask icmp_dun.id_mask -#define icmp_data icmp_dun.id_data -}; - -/* - * Lower bounds on packet lengths for various types. - * For the error advice packets must first insure that the - * packet is large enough to contain the returned ip header. - * Only then can we do the check to see if 64 bits of packet - * data have been returned, since we need to check the returned - * ip header length. - */ -#define ICMP_MINLEN 8 /* abs minimum */ -#define ICMP_TSLEN (8 + 3 * sizeof (n_time)) /* timestamp */ -#define ICMP_MASKLEN 12 /* address mask */ -#define ICMP_ADVLENMIN (8 + sizeof (struct ip) + 8) /* min */ -#ifndef _IP_VHL -#define ICMP_ADVLEN(p) (8 + ((p)->icmp_ip.ip_hl << 2) + 8) - /* N.B.: must separately check that ip_hl >= 5 */ -#else -#define ICMP_ADVLEN(p) (8 + (IP_VHL_HL((p)->icmp_ip.ip_vhl) << 2) + 8) - /* N.B.: must separately check that header length >= 5 */ -#endif - -/* - * Definition of type and code field values. - */ -#define ICMP_ECHOREPLY 0 /* echo reply */ -#define ICMP_UNREACH 3 /* dest unreachable, codes: */ -#define ICMP_UNREACH_NET 0 /* bad net */ -#define ICMP_UNREACH_HOST 1 /* bad host */ -#define ICMP_UNREACH_PROTOCOL 2 /* bad protocol */ -#define ICMP_UNREACH_PORT 3 /* bad port */ -#define ICMP_UNREACH_NEEDFRAG 4 /* IP_DF caused drop */ -#define ICMP_UNREACH_SRCFAIL 5 /* src route failed */ -#define ICMP_UNREACH_NET_UNKNOWN 6 /* unknown net */ -#define ICMP_UNREACH_HOST_UNKNOWN 7 /* unknown host */ -#define ICMP_UNREACH_ISOLATED 8 /* src host isolated */ -#define ICMP_UNREACH_NET_PROHIB 9 /* prohibited access */ -#define ICMP_UNREACH_HOST_PROHIB 10 /* ditto */ -#define ICMP_UNREACH_TOSNET 11 /* bad tos for net */ -#define ICMP_UNREACH_TOSHOST 12 /* bad tos for host */ -#define ICMP_UNREACH_FILTER_PROHIB 13 /* admin prohib */ -#define ICMP_UNREACH_HOST_PRECEDENCE 14 /* host prec vio. */ -#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15 /* prec cutoff */ -#define ICMP_SOURCEQUENCH 4 /* packet lost, slow down */ -#define ICMP_REDIRECT 5 /* shorter route, codes: */ -#define ICMP_REDIRECT_NET 0 /* for network */ -#define ICMP_REDIRECT_HOST 1 /* for host */ -#define ICMP_REDIRECT_TOSNET 2 /* for tos and net */ -#define ICMP_REDIRECT_TOSHOST 3 /* for tos and host */ -#define ICMP_ECHO 8 /* echo service */ -#define ICMP_ROUTERADVERT 9 /* router advertisement */ -#define ICMP_ROUTERSOLICIT 10 /* router solicitation */ -#define ICMP_TIMXCEED 11 /* time exceeded, code: */ -#define ICMP_TIMXCEED_INTRANS 0 /* ttl==0 in transit */ -#define ICMP_TIMXCEED_REASS 1 /* ttl==0 in reass */ -#define ICMP_PARAMPROB 12 /* ip header bad */ -#define ICMP_PARAMPROB_OPTABSENT 1 /* req. opt. absent */ -#define ICMP_TSTAMP 13 /* timestamp request */ -#define ICMP_TSTAMPREPLY 14 /* timestamp reply */ -#define ICMP_IREQ 15 /* information request */ -#define ICMP_IREQREPLY 16 /* information reply */ -#define ICMP_MASKREQ 17 /* address mask request */ -#define ICMP_MASKREPLY 18 /* address mask reply */ - -#define ICMP_MAXTYPE 18 - -#define ICMP_INFOTYPE(type) \ - ((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \ - (type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \ - (type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \ - (type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \ - (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY) - -#ifdef KERNEL -void icmp_error __P((struct mbuf *, int, int, n_long, struct ifnet *)); -void icmp_input __P((struct mbuf *, int)); -#endif - -#endif diff --git a/reactos/apps/utils/net/tracert/tracert.c b/reactos/apps/utils/net/tracert/tracert.c index 1094347b69c..fcdb0850d64 100644 --- a/reactos/apps/utils/net/tracert/tracert.c +++ b/reactos/apps/utils/net/tracert/tracert.c @@ -1,957 +1,656 @@ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Van Jacobson. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 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 University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University 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 REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1990, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static char sccsid[] = "@(#)traceroute.c 8.1 (Berkeley) 6/6/93"; -#endif /* not lint */ - -/* - * traceroute host - trace the route ip packets follow going to "host". - * - * Attempt to trace the route an ip packet would follow to some - * internet host. We find out intermediate hops by launching probe - * packets with a small ttl (time to live) then listening for an - * 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 30 hops & can be changed with the -m flag). Three - * probes (change with -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 - * 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 -w flag), a "*" is printed for that - * probe. - * - * Probe packets are UDP format. We don't want the destination - * host to process them 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 -p flag). - * - * A sample use might be: - * - * [yak 71]% traceroute nis.nsf.net. - * traceroute to nis.nsf.net (35.1.1.48), 30 hops max, 56 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 - * 3 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 39 ms 19 ms - * 4 ccngw-ner-cc.Berkeley.EDU (128.32.136.23) 39 ms 40 ms 39 ms - * 5 ccn-nerif22.Berkeley.EDU (128.32.168.22) 39 ms 39 ms 39 ms - * 6 128.32.197.4 (128.32.197.4) 40 ms 59 ms 59 ms - * 7 131.119.2.5 (131.119.2.5) 59 ms 59 ms 59 ms - * 8 129.140.70.13 (129.140.70.13) 99 ms 99 ms 80 ms - * 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 - * - * Note that lines 2 & 3 are the same. This is due to a buggy - * kernel on the 2nd hop system -- lbl-csam.arpa -- that forwards - * packets with a zero ttl. - * - * A more interesting example is: - * - * [yak 72]% traceroute allspice.lcs.mit.edu. - * traceroute to allspice.lcs.mit.edu (18.26.0.115), 30 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 - * 3 lilac-dmc.Berkeley.EDU (128.32.216.1) 39 ms 19 ms 19 ms - * 4 ccngw-ner-cc.Berkeley.EDU (128.32.136.23) 19 ms 39 ms 39 ms - * 5 ccn-nerif22.Berkeley.EDU (128.32.168.22) 20 ms 39 ms 39 ms - * 6 128.32.197.4 (128.32.197.4) 59 ms 119 ms 39 ms - * 7 131.119.2.5 (131.119.2.5) 59 ms 59 ms 39 ms - * 8 129.140.70.13 (129.140.70.13) 80 ms 79 ms 99 ms - * 9 129.140.71.6 (129.140.71.6) 139 ms 139 ms 159 ms - * 10 129.140.81.7 (129.140.81.7) 199 ms 180 ms 300 ms - * 11 129.140.72.17 (129.140.72.17) 300 ms 239 ms 239 ms - * 12 * * * - * 13 128.121.54.72 (128.121.54.72) 259 ms 499 ms 279 ms - * 14 * * * - * 15 * * * - * 16 * * * - * 17 * * * - * 18 ALLSPICE.LCS.MIT.EDU (18.26.0.115) 339 ms 279 ms 279 ms - * - * (I start to see why I'm having so much trouble with mail to - * MIT.) 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. - * - * 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 - * original datagram. Since, for gateways, the remaining ttl is - * 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: - * - * 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 - * 4 ccngw-ner-cc.Berkeley.EDU (128.32.136.23) 39 ms 40 ms 19 ms - * 5 ccn-nerif35.Berkeley.EDU (128.32.168.35) 39 ms 39 ms 39 ms - * 6 csgw.Berkeley.EDU (128.32.133.254) 39 ms 59 ms 39 ms - * 7 * * * - * 8 * * * - * 9 * * * - * 10 * * * - * 11 * * * - * 12 * * * - * 13 rip.Berkeley.EDU (128.32.131.22) 59 ms ! 39 ms ! 39 ms ! - * - * 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) - * is using the ttl from our arriving datagram as the ttl in its - * icmp reply. So, the reply will time out on the return path - * (with no notice sent to anyone since icmp's aren't sent for - * icmp's) until we probe with a ttl that's at least twice the path - * 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 - * frequently and/or take care picking the target host of your - * probes. - * - * Other possible annotations after the time are !H, !N, !P (got a host, - * network or protocol unreachable, respectively), !S or !F (source - * route failed or fragmentation needed -- neither of these should - * ever occur and the associated gateway is busted if you see one). If - * almost all the probes result in some kind of unreachable, traceroute - * will give up and exit. - * - * Notes - * ----- - * This program must be run by root or be setuid. (I suggest that - * you *don't* make it setuid -- casual use could result in a lot - * of unnecessary traffic on our poor, congested nets.) - * - * This program requires a kernel mod that does not appear in any - * system available from Berkeley: A raw ip socket using proto - * IPPROTO_RAW must interpret the data sent as an ip datagram (as - * opposed to data to be wrapped in a ip datagram). See the README - * file that came with the source to this program for a description - * of the mods I made to /sys/netinet/raw_ip.c. Your mileage may - * vary. But, again, ANY 4.x (x < 4) BSD KERNEL WILL HAVE TO BE - * MODIFIED TO RUN THIS PROGRAM. - * - * The udp port usage may appear bizarre (well, ok, it is bizarre). - * The problem is that an icmp message only contains 8 bytes of - * data from the original datagram. 8 bytes is the size of a udp - * header so, if we want to associate replies with the original - * datagram, the necessary information must be encoded into the - * udp header (the ip id could be used but there's no way to - * interlock with the kernel's assignment of ip id's and, anyway, - * it would have taken a lot more kernel hacking to allow this - * code to set the ip id). So, to allow two or more users to - * use traceroute simultaneously, we use this task's pid as the - * source port (the high bit is set to move the port number out - * of the "likely" range). To keep track of which probe is being - * replied to (so times and/or hop counts don't get confused by a - * reply that was delayed in transit), we increment the destination - * port number before each probe. - * - * Don't use this as a coding example. I was trying to find a - * routing problem and this code sort-of popped out after 48 hours - * without sleep. I was amazed it ever compiled, much less ran. - * - * I stole the idea for this program from Steve Deering. Since - * the first release, I've learned that had I attended the right - * IETF working group meetings, I also could have stolen it from Guy - * Almes or Matt Mathis. I don't know (or care) who came up with - * the idea first. I envy the originators' perspicacity and I'm - * glad they didn't keep the idea a secret. - * - * Tim Seaver, Ken Adelman and C. Philip Wood provided bug fixes and/or - * enhancements to the original distribution. - * - * I've hacked up a round-trip-route version of this that works by - * sending a loose-source-routed udp datagram through the destination - * back to yourself. Unfortunately, SO many gateways botch source - * routing, the thing is almost worthless. Maybe one day... - * - * -- Van Jacobson (van@helios.ee.lbl.gov) - * Tue Dec 20 03:50:13 PST 1988 - */ - -#define caddr_t void * - -#include -#include -#include -#include -#include - -#include - - -#include -#include -#include - -//void print(buf, cc, from); -char * inetname(struct in_addr); -double deltaT(struct timeval *, struct timeval *); -void usage(); -void send_probe(int, int); - -#define bzero( ptr, count ) memset( ptr, 0, count ) -#define bcopy(src,dest,len) memcpy(dest,src,len) - -// setlinebuf is equivalent to the setvbuf call below. -inline int setlinebuf(FILE *stream) -{ - return setvbuf( stream, (char*)0, _IONBF, 0 ); -} - -#ifndef __GNUC__ -#define EPOCHFILETIME (116444736000000000i64) -#else -#define EPOCHFILETIME (116444736000000000LL) -#endif - -struct timezone { - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ -}; - -int gettimeofday(struct timeval *tv, struct timezone *tz) -{ - FILETIME ft; - LARGE_INTEGER li; - __int64 t; - static int tzflag; - - if (tv) - { - GetSystemTimeAsFileTime(&ft); - //li.LowPart = ft.dwLowDateTime; - //li.HighPart = ft.dwHighDateTime; - t = li.QuadPart; /* In 100-nanosecond intervals */ - t -= EPOCHFILETIME; /* Offset to the Epoch time */ - t /= 10; /* In microseconds */ - tv->tv_sec = (long)(t / 1000000); - tv->tv_usec = (long)(t % 1000000); - } - - if (tz) - { - if (!tzflag) - { - _tzset(); - tzflag++; - } - tz->tz_minuteswest = _timezone / 60; - tz->tz_dsttime = _daylight; - } - - return 0; -} - - - -/* Set up endiannes macros for the ip and ip_icmp BSD headers */ -#ifndef BIG_ENDIAN -#define BIG_ENDIAN 4321 -#endif -#ifndef LITTLE_ENDIAN -#define LITTLE_ENDIAN 1234 -#endif -#ifndef BYTE_ORDER -#ifdef WORDS_BIGENDIAN -#define BYTE_ORDER BIG_ENDIAN -#else -#define BYTE_ORDER LITTLE_ENDIAN -#endif -#endif /* BYTE_ORDER */ - -#define u_int16_t WORD -#define u_int32_t DWORD - -/* These are BSD headers. We use these here because they are needed on - * libc5 Linux systems. On other platforms they are usually simply more - * complete than the native stuff, and cause less portability problems - * so we use them anyway. - */ -#include "ip.h" -#include "ip_icmp.h" - - -#define MAXPACKET 65535 /* max ip packet size */ -#ifndef MAXHOSTNAMELEN -#define MAXHOSTNAMELEN 64 -#endif - -#ifndef FD_SET -#define NFDBITS (8*sizeof(fd_set)) -#define FD_SETSIZE NFDBITS -#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS))) -#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) -#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS))) -#define FD_ZERO(p) bzero((char *)(p), sizeof(*(p))) -#endif - -#define Fprintf (void)fprintf -#define Sprintf (void)sprintf -#define Printf (void)printf - -/* - * Define the UDP header - */ -typedef struct udphdr { - u_short uh_dport; - u_short uh_sport; - u_short uh_sum; - u_short uh_ulen; -} udphdr; - -/* - * format of a (udp) probe packet. - */ -struct opacket { - struct ip ip; - udphdr udp; - u_char seq; /* sequence number of this packet */ - u_char ttl; /* ttl packet left with */ - struct timeval tv; /* time packet left */ -}; - -u_char packet[512]; /* last inbound (icmp) packet */ -struct opacket *outpacket; /* last output (udp) packet */ - -#if 0 -int wait_for_reply __P((int, struct sockaddr_in *)); -void send_probe __P((int, int)); -double deltaT __P((struct timeval *, struct timeval *)); -int packet_ok __P((u_char *, int, struct sockaddr_in *, int)); -//void print __P((u_char *, int, struct sockaddr_in *)); -void tvsub __P((struct timeval *, struct timeval *)); -char *inetname __P((struct in_addr)); -void usage __P(()); -#endif - -int s; /* receive (icmp) socket file descriptor */ -int sndsock; /* send (udp) socket file descriptor */ -struct timezone tz; /* leftover */ - -struct sockaddr whereto; /* Who to try to reach */ -int datalen; /* How much data */ - -char *source = 0; -char *hostname; - -int nprobes = 3; -int max_ttl = 30; -u_short ident; -u_short port = 32768+666; /* start udp dest port # for probe packets */ -int options; /* socket options */ -int verbose; -int waittime = 5; /* time to wait for response (in seconds) */ -int nflag; /* print addresses numerically */ - -void -print(buf, cc, from) - u_char *buf; - int cc; - struct sockaddr_in *from; -{ - struct ip *ip; - int hlen; - - ip = (struct ip *) buf; - hlen = ip->ip_hl << 2; - cc -= hlen; - - if (nflag) - Printf(" %s", inet_ntoa(from->sin_addr)); - else - Printf(" %s (%s)", inetname(from->sin_addr), - inet_ntoa(from->sin_addr)); - - if (verbose) - Printf (" %d bytes to %s", cc, inet_ntoa (ip->ip_dst)); -} - - -int -main(argc, argv) - int argc; - char *argv[]; -{ - extern char *optarg; - extern int optind; - struct hostent *hp; - struct protoent *pe; - struct sockaddr_in from, *to; - int ch, i, on, probe, seq, tos, ttl; - WSADATA wsadata; - INT status; - - on = 1; - seq = tos = 0; - to = (struct sockaddr_in *)&whereto; - while ((ch = getopt(argc, argv, "dm:np:q:rs:t:w:v")) != EOF) - switch(ch) { - case 'd': - options |= SO_DEBUG; - break; - case 'm': - max_ttl = atoi(optarg); - if (max_ttl <= 1) { - Fprintf(stderr, - "traceroute: max ttl must be >1.\n"); - WSACleanup(); - exit(1); - } - break; - case 'n': - nflag++; - break; - case 'p': - port = atoi(optarg); - if (port < 1) { - Fprintf(stderr, - "traceroute: port must be >0.\n"); - WSACleanup(); - exit(1); - } - break; - case 'q': - nprobes = atoi(optarg); - if (nprobes < 1) { - Fprintf(stderr, - "traceroute: nprobes must be >0.\n"); - WSACleanup(); - exit(1); - } - break; - case 'r': - options |= SO_DONTROUTE; - break; - case 's': - /* - * set the ip source address of the outbound - * probe (e.g., on a multi-homed host). - */ - source = optarg; - break; - case 't': - tos = atoi(optarg); - if (tos < 0 || tos > 255) { - Fprintf(stderr, - "traceroute: tos must be 0 to 255.\n"); - WSACleanup(); - exit(1); - } - break; - case 'v': - verbose++; - break; - case 'w': - waittime = atoi(optarg); - if (waittime <= 1) { - Fprintf(stderr, - "traceroute: wait must be >1 sec.\n"); - WSACleanup(); - exit(1); - } - break; - default: - usage(); - } - argc -= optind; - argv += optind; - - if (argc < 1) - usage(); - - status = WSAStartup(MAKEWORD(2, 2), &wsadata); - if (status != 0) { - printf("Could not initialize winsock dll.\n"); - return FALSE; - } - - setlinebuf (stdout); - - (void) bzero((char *)&whereto, sizeof(struct sockaddr)); - to->sin_family = AF_INET; - to->sin_addr.s_addr = inet_addr(*argv); - if (to->sin_addr.s_addr != -1) - hostname = *argv; - else { - hp = gethostbyname(*argv); - if (hp) { - to->sin_family = hp->h_addrtype; - bcopy(hp->h_addr, (caddr_t)&to->sin_addr, hp->h_length); - hostname = hp->h_name; - } else { - (void)fprintf(stderr, - "traceroute: unknown host %s\n", *argv); - WSACleanup(); - exit(1); - } - } - if (*++argv) - datalen = atoi(*argv); - if (datalen < 0 || datalen >= MAXPACKET - sizeof(struct opacket)) { - Fprintf(stderr, - "traceroute: packet size must be 0 <= s < %ld.\n", - MAXPACKET - sizeof(struct opacket)); - WSACleanup(); - exit(1); - } - datalen += sizeof(struct opacket); - outpacket = (struct opacket *)malloc((unsigned)datalen); - if (! outpacket) { - perror("traceroute: malloc"); - WSACleanup(); - exit(1); - } - (void) bzero((char *)outpacket, datalen); - outpacket->ip.ip_dst = to->sin_addr; - outpacket->ip.ip_tos = tos; - outpacket->ip.ip_v = IPVERSION; - outpacket->ip.ip_id = 0; - - ident = (getpid() & 0xffff) | 0x8000; - - if ((pe = getprotobyname("icmp")) == NULL) { - Fprintf(stderr, "icmp: unknown protocol\n"); - WSACleanup(); - exit(10); - } - if ((s = socket(AF_INET, SOCK_RAW, pe->p_proto)) < 0) { - perror("traceroute: icmp socket"); - WSACleanup(); - exit(5); - } - if (options & SO_DEBUG) - (void) setsockopt(s, SOL_SOCKET, SO_DEBUG, - (char *)&on, sizeof(on)); - if (options & SO_DONTROUTE) - (void) setsockopt(s, SOL_SOCKET, SO_DONTROUTE, - (char *)&on, sizeof(on)); - - if ((sndsock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) < 0) { - perror("traceroute: raw socket"); - WSACleanup(); - exit(5); - } -#ifdef SO_SNDBUF - if (setsockopt(sndsock, SOL_SOCKET, SO_SNDBUF, (char *)&datalen, - sizeof(datalen)) < 0) { - perror("traceroute: SO_SNDBUF"); - WSACleanup(); - exit(6); - } -#endif /* SO_SNDBUF */ -#ifdef IP_HDRINCL - if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, (char *)&on, - sizeof(on)) < 0) { - perror("traceroute: IP_HDRINCL"); - WSACleanup(); - exit(6); - } -#endif /* IP_HDRINCL */ - if (options & SO_DEBUG) - (void) setsockopt(sndsock, SOL_SOCKET, SO_DEBUG, - (char *)&on, sizeof(on)); - if (options & SO_DONTROUTE) - (void) setsockopt(sndsock, SOL_SOCKET, SO_DONTROUTE, - (char *)&on, sizeof(on)); - - if (source) { - (void) bzero((char *)&from, sizeof(struct sockaddr)); - from.sin_family = AF_INET; - from.sin_addr.s_addr = inet_addr(source); - if (from.sin_addr.s_addr == -1) { - Printf("traceroute: unknown host %s\n", source); - WSACleanup(); - exit(1); - } - outpacket->ip.ip_src = from.sin_addr; -#ifndef IP_HDRINCL - if (bind(sndsock, (struct sockaddr *)&from, sizeof(from)) < 0) { - perror ("traceroute: bind:"); - WSACleanup(); - exit (1); - } -#endif /* IP_HDRINCL */ - } - - Fprintf(stderr, "traceroute to %s (%s)", hostname, - inet_ntoa(to->sin_addr)); - if (source) - Fprintf(stderr, " from %s", source); - Fprintf(stderr, ", %d hops max, %d byte packets\n", max_ttl, datalen); - (void) fflush(stderr); - - for (ttl = 1; ttl <= max_ttl; ++ttl) { - u_long lastaddr = 0; - int got_there = 0; - int unreachable = 0; - - Printf("%2d ", ttl); - for (probe = 0; probe < nprobes; ++probe) { - int cc; - struct timeval t1, t2; - struct timezone tz; - struct ip *ip; - - (void) gettimeofday(&t1, &tz); - send_probe(++seq, ttl); - while (cc = wait_for_reply(s, &from)) { - (void) gettimeofday(&t2, &tz); - if ((i = packet_ok(packet, cc, &from, seq))) { - if (from.sin_addr.s_addr != lastaddr) { - print(packet, cc, &from); - lastaddr = from.sin_addr.s_addr; - } - Printf(" %g ms", deltaT(&t1, &t2)); - switch(i - 1) { - case ICMP_UNREACH_PORT: -#ifndef ARCHAIC - ip = (struct ip *)packet; - if (ip->ip_ttl <= 1) - Printf(" !"); -#endif /* ARCHAIC */ - ++got_there; - break; - case ICMP_UNREACH_NET: - ++unreachable; - Printf(" !N"); - break; - case ICMP_UNREACH_HOST: - ++unreachable; - Printf(" !H"); - break; - case ICMP_UNREACH_PROTOCOL: - ++got_there; - Printf(" !P"); - break; - case ICMP_UNREACH_NEEDFRAG: - ++unreachable; - Printf(" !F"); - break; - case ICMP_UNREACH_SRCFAIL: - ++unreachable; - Printf(" !S"); - break; - } - break; - } - } - if (cc == 0) - Printf(" *"); - (void) fflush(stdout); - } - putchar('\n'); - if (got_there || unreachable >= nprobes-1) { - WSACleanup(); - exit(0); - } - } - - WSACleanup(); - return 0; -} - -int -wait_for_reply(sock, from) - int sock; - struct sockaddr_in *from; -{ - fd_set fds; - struct timeval wait; - int cc = 0; - int fromlen = sizeof (*from); - - FD_ZERO(&fds); - FD_SET(sock, &fds); - wait.tv_sec = waittime; wait.tv_usec = 0; - - if (select(sock+1, &fds, (fd_set *)0, (fd_set *)0, &wait) > 0) - cc=recvfrom(s, (char *)packet, sizeof(packet), 0, - (struct sockaddr *)from, &fromlen); - - return(cc); -} - - -void -send_probe(seq, ttl) - int seq, ttl; -{ - struct opacket *op = outpacket; - struct ip *ip = &op->ip; - struct udphdr *up = &op->udp; - int i; - - ip->ip_off = 0; - ip->ip_hl = sizeof(*ip) >> 2; - ip->ip_p = IPPROTO_UDP; - ip->ip_len = datalen; - ip->ip_ttl = ttl; - ip->ip_v = IPVERSION; - ip->ip_id = htons(ident+seq); - - up->uh_sport = htons(ident); - up->uh_dport = htons(port+seq); - up->uh_ulen = htons((u_short)(datalen - sizeof(struct ip))); - up->uh_sum = 0; - - op->seq = seq; - op->ttl = ttl; - (void) gettimeofday(&op->tv, &tz); - - i = sendto(sndsock, (char *)outpacket, datalen, 0, &whereto, - sizeof(struct sockaddr)); - if (i < 0 || i != datalen) { - if (i<0) - perror("sendto"); - Printf("traceroute: wrote %s %d chars, ret=%d\n", hostname, - datalen, i); - (void) fflush(stdout); - } -} - - -double -deltaT(t1p, t2p) - struct timeval *t1p, *t2p; -{ - register double dt; - - dt = (double)(t2p->tv_sec - t1p->tv_sec) * 1000.0 + - (double)(t2p->tv_usec - t1p->tv_usec) / 1000.0; - return (dt); -} - - -/* - * Convert an ICMP "type" field to a printable string. - */ -char * -pr_type(t) - u_char t; -{ - static char *ttab[] = { - "Echo Reply", "ICMP 1", "ICMP 2", "Dest Unreachable", - "Source Quench", "Redirect", "ICMP 6", "ICMP 7", - "Echo", "ICMP 9", "ICMP 10", "Time Exceeded", - "Param Problem", "Timestamp", "Timestamp Reply", "Info Request", - "Info Reply" - }; - - if(t > 16) - return("OUT-OF-RANGE"); - - return(ttab[t]); -} - - -int -packet_ok(buf, cc, from, seq) - u_char *buf; - int cc; - struct sockaddr_in *from; - int seq; -{ - register struct icmp *icp; - u_char type, code; - int hlen; -#ifndef ARCHAIC - struct ip *ip; - - ip = (struct ip *) buf; - hlen = ip->ip_hl << 2; - if (cc < hlen + ICMP_MINLEN) { - if (verbose) - Printf("packet too short (%d bytes) from %s\n", cc, - inet_ntoa(from->sin_addr)); - return (0); - } - cc -= hlen; - icp = (struct icmp *)(buf + hlen); -#else - icp = (struct icmp *)buf; -#endif /* ARCHAIC */ - type = icp->icmp_type; code = icp->icmp_code; - if ((type == ICMP_TIMXCEED && code == ICMP_TIMXCEED_INTRANS) || - type == ICMP_UNREACH) { - struct ip *hip; - struct udphdr *up; - - hip = &icp->icmp_ip; - hlen = hip->ip_hl << 2; - up = (struct udphdr *)((u_char *)hip + hlen); - if (hlen + 12 <= cc && hip->ip_p == IPPROTO_UDP && - up->uh_sport == htons(ident) && - up->uh_dport == htons(port+seq)) - if (hlen + 12 <= cc && hip->ip_p == IPPROTO_UDP) - return (type == ICMP_TIMXCEED? -1 : code+1); - } -#ifndef ARCHAIC - if (verbose) { - int i; - u_long *lp = (u_long *)&icp->icmp_ip; - - Printf("\n%d bytes from %s to %s", cc, - inet_ntoa(from->sin_addr), inet_ntoa(ip->ip_dst)); - Printf(": icmp type %d (%s) code %d\n", type, pr_type(type), - icp->icmp_code); - for (i = 4; i < cc ; i += sizeof(long)) - Printf("%2d: x%8.8lx\n", i, *lp++); - } -#endif /* ARCHAIC */ - return(0); -} - -#ifdef notyet -/* - * Checksum routine for Internet Protocol family headers (C Version) - */ -u_short -in_cksum(addr, len) - u_short *addr; - int len; -{ - register int nleft = len; - register u_short *w = addr; - register u_short answer; - register int sum = 0; - - /* - * Our algorithm is simple, using a 32 bit accumulator (sum), - * we add sequential 16 bit words to it, and at the end, fold - * back all the carry bits from the top 16 bits into the lower - * 16 bits. - */ - while (nleft > 1) { - sum += *w++; - nleft -= 2; - } - - /* mop up an odd byte, if necessary */ - if (nleft == 1) - sum += *(u_char *)w; - - /* - * add back carry outs from top 16 bits to low 16 bits - */ - sum = (sum >> 16) + (sum & 0xffff); /* add hi 16 to low 16 */ - sum += (sum >> 16); /* add carry */ - answer = ~sum; /* truncate to 16 bits */ - return (answer); -} -#endif /* notyet */ - -/* - * Subtract 2 timeval structs: out = out - in. - * Out is assumed to be >= in. - */ -void -tvsub(out, in) - register struct timeval *out, *in; -{ - if ((out->tv_usec -= in->tv_usec) < 0) { - out->tv_sec--; - out->tv_usec += 1000000; - } - out->tv_sec -= in->tv_sec; -} - - -/* - * Construct an Internet address representation. - * If the nflag has been supplied, give - * numeric value, otherwise try for symbolic name. - */ -char * -inetname(in) - struct in_addr in; -{ - register char *cp; - static char line[50]; - struct hostent *hp; - static char domain[MAXHOSTNAMELEN + 1]; - static int first = 1; - - if (first && !nflag) { - first = 0; - if (gethostname(domain, MAXHOSTNAMELEN) == 0 && - (cp = strrchr(domain, '.'))) - (void) strcpy(domain, cp + 1); - else - domain[0] = 0; - } - cp = 0; - if (!nflag && in.s_addr != INADDR_ANY) { - hp = gethostbyaddr((char *)&in, sizeof (in), AF_INET); - if (hp) { - if ((cp = strrchr(hp->h_name, '.')) && - !strcmp(cp + 1, domain)) - *cp = 0; - cp = hp->h_name; - } - } - if (cp) - (void) strcpy(line, cp); - else { - in.s_addr = ntohl(in.s_addr); -#define C(x) ((x) & 0xff) - Sprintf(line, "%lu.%lu.%lu.%lu", C(in.s_addr >> 24), - C(in.s_addr >> 16), C(in.s_addr >> 8), C(in.s_addr)); - } - return (line); -} - -void -usage() -{ - (void)fprintf(stderr, -"usage: traceroute [-dnrv] [-m max_ttl] [-p port#] [-q nqueries]\n\t\ -[-s src_addr] [-t tos] [-w wait] host [data size]\n"); - exit(1); -} +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS traceroute utility + * FILE: apps/utils/net/tracert/tracert.c + * PURPOSE: trace a packets route through a network + * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com) + * REVISIONS: + * GM 03/05/05 Created + * + */ + + +#include +#include +#include +#include +#include +#include +#include +#include +#include "tracert.h" + +#define WIN32_LEAN_AND_MEAN + +#ifdef DBG +#undef DBG +#endif + +/* + * globals + */ +SOCKET icmpSock; // socket descriptor +SOCKADDR_IN source, dest; // source and destination address info +ECHO_REPLY_HEADER sendpacket; // ICMP echo packet +IPv4_HEADER recvpacket; // return reveive packet + +BOOL bUsePerformanceCounter; // whether to use the high res performance counter +LARGE_INTEGER TicksPerMs; // number of millisecs in relation to proc freq +LARGE_INTEGER TicksPerUs; // number of microsecs in relation to proc freq +LONGLONG lTimeStart; // send packet, timer start +LONGLONG lTimeEnd; // receive packet, timer end + +CHAR cHostname[256]; // target hostname +CHAR cDestIP[18]; // target IP + + +/* + * command line options + */ +BOOL bResolveAddresses = TRUE; // -d MS ping defaults to true. +INT iMaxHops = 30; // -h Max number of hops before trace ends +INT iHostList; // -j @UNIMPLEMENTED@ +INT iTimeOut = 2000; // -w time before packet times out + + + + +/* + * + * Parse command line parameters and set any options + * + */ +BOOL ParseCmdline(int argc, char* argv[]) +{ + int i; + + if (argc < 2) + { + Usage(); + return FALSE; + } + + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-') { + switch (argv[i][1]) { + case 'd': bResolveAddresses = FALSE; + break; + case 'h': sscanf(argv[i+1], "%d", &iMaxHops); + break; + case 'l': break; /* @unimplemented@ */ + case 'w': sscanf(argv[i+1], "%d", &iTimeOut); + break; + default: + _tprintf(_T("%s is not a valid option.\n"), argv[i]); + Usage(); + return FALSE; + } + } else { + /* copy target address */ + strncpy(cHostname, argv[i], 255); + + } + } + + return TRUE; +} + + + +/* + * + * Driver function, controls the traceroute program + * + */ +INT Driver(VOID) { + + INT i; + INT iHopCount = 1; // hop counter. default max is 30 + INT iSeqNum = 0; // initialise packet sequence number + INT iTTL = 1; // set initial packet TTL to 1 + BOOL bFoundTarget = FALSE; // Have we reached our destination yet + BOOL bAwaitPacket; // indicates whether we have recieved a good packet + INT iDecRes; // DecodeResponse return value + INT iRecieveReturn; // RecieveReturn return value + INT iNameInfoRet; // getnameinfo return value + INT iPacketSize = PACKET_SIZE; // packet size + WORD wHeaderLen; // header length + PECHO_REPLY_HEADER icmphdr; + + + //temps for getting host name + CHAR cHost[256]; + CHAR cServ[256]; + CHAR *ip; + + /* setup winsock */ + WSADATA wsaData; + + /* check for winsock 2 */ + if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) { +#ifdef DBG + _tprintf(_T("WSAStartup failed.\n")); +#endif /* DBG */ + exit(1); + } + + SetupTimingMethod(); + + /* setup target info */ + ResolveHostname(); + + /* print standard tracing info to screen */ + _tprintf(_T("\nTracing route to %s [%s]\n"), cHostname, cDestIP); + _tprintf(_T("over a maximum of %d hop"), iMaxHops); + iMaxHops > 1 ? _tprintf(_T("s:\n\n")) : _tprintf(_T(":\n\n")); + + /* run until we hit either max hops, or we recieve 3 echo replys */ + while ((iHopCount <= iMaxHops) && (bFoundTarget != TRUE)) { + _tprintf(_T("%3d "), iHopCount); + /* run 3 pings for each hop */ + for (i=0; i<3; i++) { + if (Setup(iTTL) != TRUE) { +#ifdef DBG + _tprintf(_T("error in Setup()\n")); +#endif /* DBG */ + WSACleanup(); + exit(1); + } + PreparePacket(iPacketSize, iSeqNum); + if (SendPacket(iPacketSize) != SOCKET_ERROR) { + /* loop until we get a good packet */ + bAwaitPacket = TRUE; + while (bAwaitPacket) { + /* Receive replies until we either get a successful + * read, or a fatal error occurs. */ + if ((iRecieveReturn = ReceivePacket(iPacketSize)) < 0) { + /* check the sequence number in the packet + * if it's bad, complain and wait for another packet + * , otherwise break */ + wHeaderLen = recvpacket.h_len * 4; + icmphdr = (ECHO_REPLY_HEADER *)((char*)&recvpacket + wHeaderLen); + if (icmphdr->icmpheader.seq != iSeqNum) { + _tprintf(_T("bad sequence number!\n")); + continue; + } else { + break; + } + } + + /* if RecievePacket timed out we don't bother decoding */ + if (iRecieveReturn != 1) { + iDecRes = DecodeResponse(iPacketSize, iSeqNum); + + switch (iDecRes) { + case 0 : bAwaitPacket = FALSE; /* time exceeded */ + break; + case 1 : bAwaitPacket = FALSE; /* echo reply */ + break; + case 2 : bAwaitPacket = FALSE; /* destination unreachable */ + break; +#ifdef DBG + case -1 : + _tprintf(_T("recieved foreign packet\n")); + break; + case -2 : + _tprintf(_T("error in DecodeResponse\n")); + break; + case -3 : + _tprintf(_T("unknown ICMP packet\n")); + break; +#endif /* DBG */ + default : break; + } + } else { + /* packet timed out. Don't wait for it again */ + bAwaitPacket = FALSE; + } + } + } + + iSeqNum++; + _tprintf(_T(" ")); + } + + if(bResolveAddresses) { + /* gethostbyaddr() and getnameinfo() are + * unimplemented in ROS at present. + * Alex has advised he will be implementing gethostbyaddr + * but as it's depricieted and getnameinfo is much nicer, + * I've used that for the time being for testing in Windows*/ + + //ip = inet_addr(inet_ntoa(source.sin_addr)); + //host = gethostbyaddr((char *)&ip, 4, 0); + + ip = inet_ntoa(source.sin_addr); + + iNameInfoRet = getnameinfo((SOCKADDR *)&source, + sizeof(SOCKADDR), + cHost, + 256, + cServ, + 256, + NI_NUMERICSERV); + if (iNameInfoRet == 0) { + /* if IP address resolved to a hostname, + * print the IP address after it */ + if (lstrcmpA(cHost, ip) != 0) { + _tprintf(_T("%s [%s]"), cHost, ip); + } else { + _tprintf(_T("%s"), cHost); + } + } else { + _tprintf(_T("error: %d"), WSAGetLastError()); +#ifdef DBG + _tprintf(_T(" getnameinfo failed: %d"), iNameInfoRet); +#endif /* DBG */ + } + + } else { + _tprintf(_T("%s"), inet_ntoa(source.sin_addr)); + } + _tprintf(_T("\n")); + + /* check if we've arrived at the target */ + if (strcmp(cDestIP, inet_ntoa(source.sin_addr)) == 0) { + bFoundTarget = TRUE; + } else { + iTTL++; + iHopCount++; + Sleep(500); + } + } + _tprintf(_T("\nTrace complete.\n")); + WSACleanup(); + + return 0; +} + +/* + * Establish if performance counters are available and + * set up timing figures in relation to processor frequency. + * If performance counters are not available, we'll be using + * gettickcount, so set the figures to 1 + * + */ +VOID SetupTimingMethod(VOID) +{ + LARGE_INTEGER PerformanceCounterFrequency; + + /* check if performance counters are available */ + bUsePerformanceCounter = QueryPerformanceFrequency(&PerformanceCounterFrequency); + if (bUsePerformanceCounter) { + /* restrict execution to first processor on SMP systems */ + if (SetThreadAffinityMask(GetCurrentThread(), 1) == 0) { + bUsePerformanceCounter = FALSE; + } + + TicksPerMs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000; + TicksPerUs.QuadPart = PerformanceCounterFrequency.QuadPart / 1000000; + } + + if (!bUsePerformanceCounter) { + TicksPerMs.QuadPart = 1; + TicksPerUs.QuadPart = 1; + } +} + + +/* + * + * Check for a hostname or dotted deciamal for our target. + * If we have a hostname, resolve to an IP and store it, else + * just store the target IP address. Also set up other key + * SOCKADDR_IN members needed for the connection. + * + */ +VOID ResolveHostname(VOID) +{ + HOSTENT *hp; + ULONG addr; + + memset(&dest, 0, sizeof(dest)); + + addr = inet_addr(cHostname); + /* if address is not a dotted decimal */ + if (addr == INADDR_NONE) { + hp = gethostbyname(cHostname); + if (hp != 0) { + memcpy(&dest.sin_addr, hp->h_addr, hp->h_length); + //dest.sin_addr = *((struct in_addr *)hp->h_addr); + dest.sin_family = hp->h_addrtype; + } else { + _tprintf(_T("Unable to resolve target system name %s.\n"), cHostname); + WSACleanup(); + exit(1); + } + } else { + dest.sin_addr.s_addr = addr; + dest.sin_family = AF_INET; + } + /* copy destination IP address into a string */ + strcpy(cDestIP, inet_ntoa(dest.sin_addr)); +} + + + +/* + * + * Create our socket which will be used for sending and recieving, + * Socket Type is raw, Protocol is ICMP. Also set the TTL value which will be + * set in the outgoing IP packet. + * + */ +INT Setup(INT iTTL) +{ + INT iSockRet; + + /* create raw socket */ + icmpSock = WSASocket(AF_INET, SOCK_RAW, IPPROTO_ICMP, 0, 0, 0); + if (icmpSock == INVALID_SOCKET) { + _tprintf(_T("Could not create socket : %d.\n"), WSAGetLastError()); + if (WSAGetLastError() == WSAEACCES) { + _tprintf(_T("\n\nYou must be an administrator to run this program!\n\n")); + WSACleanup(); + exit(1); + } + return FALSE; + } + + /* setup for TTL */ + iSockRet = setsockopt(icmpSock, IPPROTO_IP, IP_TTL, (const char *)&iTTL, sizeof(iTTL)); + if (iSockRet == SOCKET_ERROR) { + _tprintf(_T("TTL setsockopt failed : %d. \n"), WSAGetLastError()); + return FALSE; + } + + return TRUE; +} + + + +/* + * Prepare the ICMP echo request packet for sending. + * Calculate the packet checksum + * + */ +VOID PreparePacket(INT iPacketSize, INT iSeqNum) +{ + /* assemble ICMP echo request packet */ + sendpacket.icmpheader.type = ECHO_REQUEST; + sendpacket.icmpheader.code = 0; + sendpacket.icmpheader.checksum = 0; + sendpacket.icmpheader.id = (USHORT)GetCurrentProcessId(); + sendpacket.icmpheader.seq = iSeqNum; + + /* calculate checksum of packet */ + sendpacket.icmpheader.checksum = CheckSum((PUSHORT)&sendpacket, sizeof(ICMP_HEADER) + iPacketSize); +} + + + +/* + * + * Get the system time and send the ICMP packet to the destination + * address. + * + */ +INT SendPacket(INT datasize) +{ + INT iSockRet; + INT iPacketSize; + + iPacketSize = sizeof(ECHO_REPLY_HEADER) + datasize; + +#ifdef DBG + _tprintf(_T("\nsending packet of %d bytes\n"), iPacketSize); +#endif /* DBG */ + + /* get time packet was sent */ + lTimeStart = GetTime(); + + iSockRet = sendto(icmpSock, //socket + (char *)&sendpacket, //buffer + iPacketSize, //size of buffer + 0, //flags + (SOCKADDR *)&dest, //destination + sizeof(dest)); //address length + + if (iSockRet == SOCKET_ERROR) { + if (WSAGetLastError() == WSAEACCES) { + _tprintf(_T("\n\nYou must be an administrator to run this program!\n\n")); + exit(1); + WSACleanup(); + } else { +#ifdef DBG + _tprintf(_T("sendto failed %d\n"), WSAGetLastError()); +#endif /* DBG */ + return FALSE; + } + } +#ifdef DBG + _tprintf(_T("sent %d bytes\n"), iSockRet); +#endif /* DBG */ + + /* return number of bytes sent */ + return iSockRet; +} + + + +/* + * + * Set up a timeout value and put the socket in a select poll. + * Wait until we recieve an IPv4 reply packet in reply to the ICMP + * echo request packet and get the time the packet was recieved. + * If we don't recieve a packet, do some checking to establish why. + * + */ +INT ReceivePacket(INT datasize) +{ + TIMEVAL timeVal; + FD_SET readFDS; + int iSockRet, iSelRet; + int iFromLen; + int iPacketSize; + + /* allow for a larger recv buffer to store ICMP TTL + * exceed, IP header and orginal ICMP request */ + iPacketSize = MAX_REC_SIZE + datasize; + + iFromLen = sizeof(source); + +#ifdef DBG + _tprintf(_T("receiving packet. Available buffer, %d bytes\n"), iPacketSize); +#endif /* DBG */ + + /* monitor icmpSock for incomming connections */ + FD_ZERO(&readFDS); + FD_SET(icmpSock, &readFDS); + + /* set timeout values */ + timeVal.tv_sec = iTimeOut / 1000; + timeVal.tv_usec = iTimeOut % 1000; + + iSelRet = select(0, &readFDS, NULL, NULL, &timeVal); + + if ((iSelRet != SOCKET_ERROR) && (iSelRet != 0)) { + iSockRet = recvfrom(icmpSock, //socket + (char *)&recvpacket, //buffer + iPacketSize, //size of buffer + 0, //flags + (SOCKADDR *)&source, //source address + &iFromLen); //pointer to address length + /* get time packet was recieved */ + lTimeEnd = GetTime(); + /* if socket timed out */ + } else if (iSelRet == 0) { + _tprintf(_T(" * ")); + return 1; + } else if (iSelRet == SOCKET_ERROR) { + _tprintf(_T("select() failed in sendPacket() %d\n"), WSAGetLastError()); + return -1; + } + + + if (iSockRet == SOCKET_ERROR) { + _tprintf(_T("recvfrom failed: %d\n"), WSAGetLastError()); + return -2; + } +#ifdef DBG + else { + _tprintf(_T("reveived %d bytes\n"), iSockRet); + } +#endif /* DBG */ + + return 0; +} + + + +/* + * + * Cast the IPv4 packet to an echo reply and to a TTL exceed. + * Check the 'type' field to establish what was recieved, and + * ensure the packet is related to the originating process. + * It all is well, print the time taken for the round trip. + * + */ +INT DecodeResponse(INT iPacketSize, INT iSeqNum) +{ + unsigned short header_len = recvpacket.h_len * 4; + /* cast the recieved packet into an ECHO reply and a TTL Exceed so we can check the ID*/ + ECHO_REPLY_HEADER *IcmpHdr = (ECHO_REPLY_HEADER *)((char*)&recvpacket + header_len); + TTL_EXCEED_HEADER *TTLExceedHdr = (TTL_EXCEED_HEADER *)((char *)&recvpacket + header_len); + + /* Make sure the reply is ok */ + if (iPacketSize < header_len + ICMP_MIN_SIZE) { + _tprintf(_T("too few bytes from %s\n"), inet_ntoa(dest.sin_addr)); + return -2; + } + + switch (IcmpHdr->icmpheader.type) { + case TTL_EXCEEDED : + if (TTLExceedHdr->OrigIcmpHeader.id != (USHORT)GetCurrentProcessId()) { + /* FIXME */ + /* we've picked up a packet not related to this process + * probably from another local program. We ignore it */ +#ifdef DGB + _tprintf(_T("header id, process id %d"), TTLExceedHdr->OrigIcmpHeader.id, GetCurrentProcessId()); +#endif /* DBG */ + //_tprintf(_T("oops "); + return -1; + } + _tprintf(_T("%3Ld ms"), (lTimeEnd - lTimeStart) / TicksPerMs.QuadPart); + return 0; + case ECHO_REPLY : + if (IcmpHdr->icmpheader.id != (USHORT)GetCurrentProcessId()) { + /* FIXME */ + /* we've picked up a packet not related to this process + * probably from another local program. We ignore it */ +#ifdef DGB + _tprintf(_T("\nPicked up wrong packet. icmpheader.id = %d and process id = %d"), IcmpHdr->icmpheader.id, GetCurrentProcessId()); +#endif /* DBG */ + //_tprintf(_T("oops "); + return -1; + } + _tprintf(_T("%3Ld ms"), (lTimeEnd - lTimeStart) / TicksPerMs.QuadPart); + return 1; + case DEST_UNREACHABLE : + _tprintf(_T(" * ")); + return 2; + default : + /* unknown ICMP packet */ + return -3; + } +} + + +/* + * + * Get the system time using preformance counters if available, + * otherwise fall back to GetTickCount() + * + */ + +LONG GetTime(VOID) +{ + LARGE_INTEGER Time; + + if (bUsePerformanceCounter) { + if (QueryPerformanceCounter(&Time) == 0) { + Time.u.LowPart = (DWORD)GetTickCount(); + Time.u.HighPart = 0; + return (LONGLONG)Time.u.LowPart; + } + } else { + Time.u.LowPart = (DWORD)GetTickCount(); + Time.u.HighPart = 0; + return (LONGLONG)Time.u.LowPart; + } + return Time.QuadPart; +} + + +/* + * + * Calculate packet checksum. + * + */ +WORD CheckSum(PUSHORT data, UINT size) +{ + DWORD dwSum = 0; + + while (size > 1) { + dwSum += *data++; + size -= sizeof(USHORT); + } + + if (size) + dwSum += *(UCHAR*)data; + + dwSum = (dwSum >> 16) + (dwSum & 0xFFFF); + dwSum += (dwSum >> 16); + + return (USHORT)(~dwSum); +} + + +/* + * + * print program usage to screen + * + */ +VOID Usage(VOID) +{ + _tprintf(_T("\nUsage: tracert [-d] [-h maximum_hops] [-j host-list] [-w timeout] target_name\n\n")); + _tprintf(_T("Options:\n")); + _tprintf(_T(" -d Do not resolve addresses to hostnames.\n")); + _tprintf(_T(" -h maximum_hops Maximum number of hops to search for target.\n")); + _tprintf(_T(" -j host-list Loose source route along host-list.\n")); + _tprintf(_T(" -w timeout Wait timeout milliseconds for each reply.\n\n")); + + /* temp notes to stop user questions until getnameinfo/gethostbyaddr and getsockopt are implemented */ + _tprintf(_T("NOTES\n-----\n" + "- Setting TTL values is not currently supported in ReactOS, so the trace will\n" + " jump straight to the destination. This feature will be implemented soon.\n" + "- Host info is not currently available in ReactOS and will fail with strange\n" + " results. Use -d to force it not to resolve IP's.\n" + "- For testing purposes, all should work as normal in a Windows environment\n\n")); +} + + + +/* + * + * Program entry point + * + */ +int main(int argc, char* argv[]) +{ + if (!ParseCmdline(argc, _argv)) return -1; + + Driver(); + + return 0; +} diff --git a/reactos/apps/utils/net/tracert/tracert.h b/reactos/apps/utils/net/tracert/tracert.h new file mode 100644 index 00000000000..1fc27e9fc42 --- /dev/null +++ b/reactos/apps/utils/net/tracert/tracert.h @@ -0,0 +1,80 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS traceroute utility + * FILE: apps/utils/net/tracert/tracert.h + * PURPOSE: trace a packets route through a network + * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com) + * REVISIONS: + * GM 03/05/05 Created + */ + +#define ECHO_REPLY 0 +#define DEST_UNREACHABLE 3 +#define ECHO_REQUEST 8 +#define TTL_EXCEEDED 11 + +#define ICMP_MIN_SIZE 8 +#define ICMP_MAX_SIZE 65535 +#define PACKET_SIZE 32 +/* we need this for packets which have the 'dont fragment' + * bit set, as they can get quite large otherwise + * (I've seen some reach 182 bytes */ +#define MAX_REC_SIZE 200 + +/* pack the structures */ +#pragma pack(1) + +/* IPv4 Header, 20 bytes */ +typedef struct IPv4Header { + BYTE h_len:4; + BYTE version:4; + BYTE tos; + USHORT length; + USHORT id; + USHORT flag_frag; + BYTE ttl; + BYTE proto; + USHORT checksum; + ULONG source; + ULONG dest; +} IPv4_HEADER, *PIPv4_HEADER; + +/* ICMP Header, 8 bytes */ +typedef struct ICMPHeader { + BYTE type; + BYTE code; + USHORT checksum; + USHORT id; // not used in time exceeded + USHORT seq; // not used in time exceeded +} ICMP_HEADER, *PICMP_HEADER; + +/* ICMP Echo Reply Header, 12 bytes */ +typedef struct EchoReplyHeader { + struct ICMPHeader icmpheader; + struct timeval timestamp; +} ECHO_REPLY_HEADER, *PECHO_REPLY_HEADER; + +/* ICMP Echo Reply Header, 12 bytes */ +typedef struct TTLExceedHeader { + struct ICMPHeader icmpheader; + struct IPv4Header ipheader; + struct ICMPHeader OrigIcmpHeader; +} TTL_EXCEED_HEADER, *PTTL_EXCEED_HEADER; + +/* return to normal */ +#pragma pack() + + +/* function definitions */ +//BOOL ParseCmdline(int argc, char* argv[]); +INT Driver(void); +INT Setup(INT ttl); +VOID SetupTimingMethod(void); +VOID ResolveHostname(void); +VOID PreparePacket(INT packetSize, INT seqNum); +INT SendPacket(INT datasize); +INT ReceivePacket(INT datasize); +INT DecodeResponse(INT packetSize, INT seqNum); +LONG GetTime(void); +WORD CheckSum(PUSHORT data, UINT size); +VOID Usage(void); diff --git a/reactos/apps/utils/net/tracert/tracert.rc b/reactos/apps/utils/net/tracert/tracert.rc index f1351caf1a0..f290fd7302c 100644 --- a/reactos/apps/utils/net/tracert/tracert.rc +++ b/reactos/apps/utils/net/tracert/tracert.rc @@ -1,6 +1,5 @@ -/* $Id: route.rc 11816 2004-11-26 06:51:47Z arty $ */ - -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Traceroute\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS TCP/IPv4 Win32 Traceroute\0" #define REACTOS_STR_INTERNAL_NAME "tracert\0" #define REACTOS_STR_ORIGINAL_FILENAME "tracert.exe\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Ged Murphy (gedmurphy@gmail.com)\0" #include diff --git a/reactos/apps/utils/net/tracert/tracert.xml b/reactos/apps/utils/net/tracert/tracert.xml new file mode 100644 index 00000000000..7f73bb7f520 --- /dev/null +++ b/reactos/apps/utils/net/tracert/tracert.xml @@ -0,0 +1,12 @@ + + . + + + 0x600 + 0x501 + kernel32 + ws2_32 + winmm + tracert.c + tracert.rc +