diff -u ping_991020.orig/Makefile ping_991020/Makefile --- ping_991020.orig/Makefile Fri Aug 28 02:01:55 1998 +++ ping_991020/Makefile Wed Jun 7 12:57:24 2000 @@ -19,30 +19,30 @@ # ---------------------------------------------------------------------- #if defined(_AIX) -SYSDEFS = -D_BSD -D_BSD_INCLUDES -U__STR__ -DBIT_ZERO_ON_LEFT +#SYSDEFS = -D_BSD -D_BSD_INCLUDES -U__STR__ -DBIT_ZERO_ON_LEFT #endif #if defined(SCO) && You have either OpenDeskTop 3 or OpenServer 5 -SYSDEFS = -DSYSV +#SYSDEFS = -DSYSV #endif #if defined(solaris) && You do not want to use BSD compatibility mode -SYSDEFS = -DSYSV +#SYSDEFS = -DSYSV #endif #if defined(solaris) && You are using its default broken resolver library -SYSDEFS = -DNO_YP_LOOKUP +#SYSDEFS = -DNO_YP_LOOKUP #endif #if defined(linux) && The IP checksum is now ip_sum and no longer ip_csum -SYSDEFS = -DLINUX_IPSUM +#SYSDEFS = -DLINUX_IPSUM #endif #if defined(linux) && You have the real BSD netinet header files (GLIBC) -SYSDEFS = -D_BSD_SOURCE +#SYSDEFS = -D_BSD_SOURCE #endif -SYSDEFS = +SYSDEFS = -DLINUX_IPSUM # ---------------------------------------------------------------------- # Configuration definitions. @@ -50,22 +50,22 @@ # ---------------------------------------------------------------------- #if defined(BIND_49) && __res_state is still shipped as struct state -CONFIGDEFS = -DOLD_RES_STATE +#CONFIGDEFS = -DOLD_RES_STATE #endif # If this is a SUN with SunOS 4.1.x and you have an NC400 ethernet board -CONFIGDEFS = -DOMNINET='"ne0"' +#CONFIGDEFS = -DOMNINET='"ne0"' # If combined use of IPOPT_LSRR and IPOPT_RR doesn't *hang* your router -CONFIGDEFS = -DMULTIPLE_IP_OPTIONS +#CONFIGDEFS = -DMULTIPLE_IP_OPTIONS # If sendto() accepts a different maximum size for atomic packets -CONFIGDEFS = -DMAXPKT=8192 +#CONFIGDEFS = -DMAXPKT=8192 # If special ping modes should be restricted only to the superuser -CONFIGDEFS = -DRESTRICT_PINGMODES +#CONFIGDEFS = -DRESTRICT_PINGMODES -CONFIGDEFS = +CONFIGDEFS = -DMULTIPLE_IP_OPTIONS -DMAXPKT=65535 # ---------------------------------------------------------------------- # Include file directories. @@ -89,7 +89,7 @@ DEFS = $(CONFIGDEFS) $(SYSDEFS) $(INCLUDES) COPTS = -COPTS = -O +COPTS = -O3 CFLAGS = $(COPTS) $(DEFS) @@ -97,7 +97,7 @@ CC = /usr/ucb/cc #if defined(solaris) && BSD CC = /bin/cc -arch m68k -arch i386 #if defined(next) CC = /bin/cc -CC = cc +CC = gcc # ---------------------------------------------------------------------- # Linking definitions. diff -u ping_991020.orig/linux.h ping_991020/linux.h --- ping_991020.orig/linux.h Wed Aug 26 03:18:45 1998 +++ ping_991020/linux.h Wed May 17 21:38:34 2000 @@ -86,13 +86,13 @@ #define n_long u_int /* redefine for 64-bit machines */ #define n_time u_int /* redefine for 64-bit machines */ -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 */ +/* struct icmp { + u_char icmp_type; + u_char icmp_code; + u_short icmp_cksum; union { - u_char ih_pptr; /* ICMP_PARAMPROB */ - struct in_addr ih_gwaddr; /* ICMP_REDIRECT */ + u_char ih_pptr; + struct in_addr ih_gwaddr; struct ih_idseq { n_short icd_id; n_short icd_seq; @@ -112,7 +112,6 @@ } id_ts; struct id_ip { struct ip idi_ip; - /* options and then 64 bits of data */ } id_ip; n_long id_mask; char id_data[1]; @@ -123,7 +122,7 @@ #define icmp_ip icmp_dun.id_ip.idi_ip #define icmp_mask icmp_dun.id_mask #define icmp_data icmp_dun.id_data -}; +}; */ #define ICMP_MINLEN 8 /* abs minimum */ @@ -170,10 +169,10 @@ * Definitions needed for the tcp header structure. */ -#if 0 + #define th_sport source #define th_dport dest -#endif + /* * Some IP options have different names as well.