Author: cy Date: Sun Feb 3 05:25:49 2019 New Revision: 343701 URL: https://svnweb.freebsd.org/changeset/base/343701
Log: ipfilter #ifdef cleanup. Remove #ifdefs for ancient and irrelevant operating systems from ipfilter. When ipfilter was written the UNIX and UNIX-like systems in use were diverse and plentiful. IRIX, Tru64 (OSF/1) don't exist any more. OpenBSD removed ipfilter shortly after the first time the ipfilter license terms changed in the early 2000's. ipfilter on AIX, HP/UX, and Linux never really caught on. Removal of code for operating systems that ipfilter will never run on again will simplify the code making it easier to fix bugs, complete partially implemented features, and extend ipfilter. Unsupported previous version FreeBSD code and some older NetBSD code has also been removed. What remains is supported FreeBSD, NetBSD, and illumos. FreeBSD and NetBSD have collaborated exchanging patches, while illumos has expressed willingness to have their ipfilter updated to 5.1.2, provided their zone-specific updates to their ipfilter are merged (which are of interest to FreeBSD to allow control of ipfilters in jails from the global zone). Reviewed by: glebius@ MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D19006 Modified: head/contrib/ipfilter/arc4random.c head/contrib/ipfilter/ip_dstlist.c head/contrib/ipfilter/ip_fil.c head/contrib/ipfilter/ip_fil_compat.c head/contrib/ipfilter/ipf.h head/contrib/ipfilter/ipsend/.OLD/ip_compat.h head/contrib/ipfilter/ipsend/44arp.c head/contrib/ipfilter/ipsend/arp.c head/contrib/ipfilter/ipsend/dlcommon.c head/contrib/ipfilter/ipsend/ip.c head/contrib/ipfilter/ipsend/ipresend.c head/contrib/ipfilter/ipsend/ipsend.c head/contrib/ipfilter/ipsend/ipsend.h head/contrib/ipfilter/ipsend/ipsopt.c head/contrib/ipfilter/ipsend/iptest.c head/contrib/ipfilter/ipsend/iptests.c head/contrib/ipfilter/ipsend/resend.c head/contrib/ipfilter/ipsend/sdlpi.c head/contrib/ipfilter/ipsend/sock.c head/contrib/ipfilter/lib/getifname.c head/contrib/ipfilter/lib/getproto.c head/contrib/ipfilter/lib/inet_addr.c head/contrib/ipfilter/lib/kmem.c head/contrib/ipfilter/lib/printproto.c head/contrib/ipfilter/md5.c head/contrib/ipfilter/tools/ipf.c head/contrib/ipfilter/tools/ipfs.c head/contrib/ipfilter/tools/ipfstat.c head/contrib/ipfilter/tools/ipftest.c head/contrib/ipfilter/tools/ipmon.c head/contrib/ipfilter/tools/ipnat.c head/contrib/ipfilter/tools/ipnat_y.y head/contrib/ipfilter/tools/ippool.c head/contrib/ipfilter/tools/ippool_y.y head/sys/contrib/ipfilter/netinet/fil.c head/sys/contrib/ipfilter/netinet/ip_auth.c head/sys/contrib/ipfilter/netinet/ip_compat.h head/sys/contrib/ipfilter/netinet/ip_dstlist.c head/sys/contrib/ipfilter/netinet/ip_fil.h head/sys/contrib/ipfilter/netinet/ip_frag.c head/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c head/sys/contrib/ipfilter/netinet/ip_htable.c head/sys/contrib/ipfilter/netinet/ip_irc_pxy.c head/sys/contrib/ipfilter/netinet/ip_log.c head/sys/contrib/ipfilter/netinet/ip_lookup.c head/sys/contrib/ipfilter/netinet/ip_nat.c head/sys/contrib/ipfilter/netinet/ip_nat.h head/sys/contrib/ipfilter/netinet/ip_nat6.c head/sys/contrib/ipfilter/netinet/ip_pool.c head/sys/contrib/ipfilter/netinet/ip_proxy.c head/sys/contrib/ipfilter/netinet/ip_raudio_pxy.c head/sys/contrib/ipfilter/netinet/ip_scan.c head/sys/contrib/ipfilter/netinet/ip_state.c head/sys/contrib/ipfilter/netinet/ip_sync.c Modified: head/contrib/ipfilter/arc4random.c ============================================================================== --- head/contrib/ipfilter/arc4random.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/arc4random.c Sun Feb 3 05:25:49 2019 (r343701) @@ -7,7 +7,7 @@ * * Dan Moschuk */ -#if !defined(SOLARIS2) && !defined(__osf__) +#if !defined(SOLARIS2) # include <sys/cdefs.h> #endif @@ -16,26 +16,16 @@ #ifdef __FreeBSD__ # include <sys/kernel.h> #endif -#if !defined(__osf__) # include <sys/random.h> -#endif #ifdef __FreeBSD__ # include <sys/libkern.h> #endif #include <sys/lock.h> -#ifndef __osf__ # include <sys/mutex.h> -#endif #include <sys/time.h> -#if defined(SOLARIS2) && (SOLARIS2 < 9) -# include <netinet/in_systm.h> -#endif #include <sys/socket.h> #include <net/if.h> -#ifdef __osf__ -# include <net/route.h> -#endif #include <netinet/in.h> #include <netinet/ip.h> #include "netinet/ip_compat.h" Modified: head/contrib/ipfilter/ip_dstlist.c ============================================================================== --- head/contrib/ipfilter/ip_dstlist.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ip_dstlist.c Sun Feb 3 05:25:49 2019 (r343701) @@ -9,9 +9,6 @@ # define KERNEL 1 # define _KERNEL 1 #endif -#if defined(__osf__) -# define _PROTO_NET_H_ -#endif #include <sys/errno.h> #include <sys/types.h> #include <sys/param.h> @@ -21,9 +18,6 @@ # include <stdlib.h> # include <string.h> # define _KERNEL -# ifdef __OpenBSD__ -struct file; -# endif # include <sys/uio.h> # undef _KERNEL #else @@ -33,14 +27,12 @@ struct file; # endif #endif #include <sys/time.h> -#if !defined(linux) # include <sys/protosw.h> -#endif #include <sys/socket.h> -#if defined(_KERNEL) && (!defined(__SVR4) && !defined(__svr4__)) +#if defined(_KERNEL) && !defined(__SVR4) # include <sys/mbuf.h> #endif -#if defined(__SVR4) || defined(__svr4__) +#if defined(__SVR4) # include <sys/filio.h> # include <sys/byteorder.h> # ifdef _KERNEL @@ -49,7 +41,7 @@ struct file; # include <sys/stream.h> # include <sys/kmem.h> #endif -#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) +#if defined(__FreeBSD_version) # include <sys/malloc.h> #endif Modified: head/contrib/ipfilter/ip_fil.c ============================================================================== --- head/contrib/ipfilter/ip_fil.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ip_fil.c Sun Feb 3 05:25:49 2019 (r343701) @@ -25,24 +25,10 @@ struct rtentry; static void ipf_setifpaddr __P((struct ifnet *, char *)); void init_ifp __P((void)); -#if defined(__sgi) && (IRIX < 60500) static int no_output __P((struct ifnet *, struct mbuf *, - struct sockaddr *)); -static int write_output __P((struct ifnet *, struct mbuf *, - struct sockaddr *)); -#else -# if TRU64 >= 1885 -static int no_output __P((struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *, char *)); -static int write_output __P((struct ifnet *, struct mbuf *, - struct sockaddr *, struct rtentry *, char *)); -# else -static int no_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *)); static int write_output __P((struct ifnet *, struct mbuf *, struct sockaddr *, struct rtentry *)); -# endif -#endif struct ifaddr { struct sockaddr_storage ifa_addr; @@ -123,17 +109,8 @@ ipf_forgetifp(softc, ifp) static int -#if defined(__sgi) && (IRIX < 60500) -no_output(ifp, m, s) -#else -# if TRU64 >= 1885 -no_output (ifp, m, s, rt, cp) - char *cp; -# else no_output(ifp, m, s, rt) -# endif struct rtentry *rt; -#endif struct ifnet *ifp; struct mbuf *m; struct sockaddr *s; @@ -143,17 +120,8 @@ no_output(ifp, m, s, rt) static int -#if defined(__sgi) && (IRIX < 60500) -write_output(ifp, m, s) -#else -# if TRU64 >= 1885 -write_output (ifp, m, s, rt, cp) - char *cp; -# else write_output(ifp, m, s, rt) -# endif struct rtentry *rt; -#endif struct ifnet *ifp; struct mbuf *m; struct sockaddr *s; @@ -167,8 +135,7 @@ write_output(ifp, m, s, rt) ip = MTOD(mb, ip_t *); #if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) + defined(__FreeBSD__) sprintf(fname, "/tmp/%s", ifp->if_xname); #else sprintf(fname, "/tmp/%s%d", ifp->if_name, ifp->if_unit); @@ -189,42 +156,26 @@ ipf_setifpaddr(ifp, addr) struct ifnet *ifp; char *addr; { -#ifdef __sgi - struct in_ifaddr *ifa; -#else struct ifaddr *ifa; -#endif -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) if (ifp->if_addrlist.tqh_first != NULL) #else -# ifdef __sgi - if (ifp->in_ifaddr != NULL) -# else if (ifp->if_addrlist != NULL) -# endif #endif return; ifa = (struct ifaddr *)malloc(sizeof(*ifa)); -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) ifp->if_addrlist.tqh_first = ifa; #else -# ifdef __sgi - ifp->in_ifaddr = ifa; -# else ifp->if_addrlist = ifa; -# endif #endif if (ifa != NULL) { struct sockaddr_in *sin; -#ifdef __sgi - sin = (struct sockaddr_in *)&ifa->ia_addr; -#else sin = (struct sockaddr_in *)&ifa->ifa_addr; -#endif #ifdef USE_INET6 if (index(addr, ':') != NULL) { struct sockaddr_in6 *sin6; @@ -263,8 +214,7 @@ get_unit(name, family) struct ifnet *ifp, **ifpp, **old_ifneta; char *addr; #if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) + defined(__FreeBSD__) if (!*name) return NULL; @@ -333,12 +283,11 @@ get_unit(name, family) } ifp = ifneta[nifs - 1]; -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) TAILQ_INIT(&ifp->if_addrlist); #endif #if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) + defined(__FreeBSD__) (void) strncpy(ifp->if_xname, name, sizeof(ifp->if_xname)); #else s = name + strlen(name) - 1; @@ -375,8 +324,7 @@ get_ifname(ifp) { static char ifname[LIFNAMSIZ]; -#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(linux) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) +#if defined(__NetBSD__) || defined(__FreeBSD__) sprintf(ifname, "%s", ifp->if_xname); #else if (ifp->if_unit != -1) @@ -397,8 +345,7 @@ init_ifp() int fd; #if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199606)) || \ - (defined(OpenBSD) && (OpenBSD >= 199603)) || defined(linux) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 501113)) + defined(__FreeBSD__) for (ifpp = ifneta; ifpp && (ifp = *ifpp); ifpp++) { ifp->if_output = (void *)write_output; sprintf(fname, "/tmp/%s", ifp->if_xname); @@ -717,20 +664,12 @@ ipf_ifpaddr(softc, v, atype, ifptr, inp, inpmask) i6addr_t *inp, *inpmask; { struct ifnet *ifp = ifptr; -#ifdef __sgi - struct in_ifaddr *ifa; -#else struct ifaddr *ifa; -#endif -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(__NetBSD__) || defined(__FreeBSD__) ifa = ifp->if_addrlist.tqh_first; #else -# ifdef __sgi - ifa = (struct in_ifaddr *)ifp->in_ifaddr; -# else ifa = ifp->if_addrlist; -# endif #endif if (ifa != NULL) { if (v == 4) { @@ -738,11 +677,7 @@ ipf_ifpaddr(softc, v, atype, ifptr, inp, inpmask) mask.sin_addr.s_addr = 0xffffffff; -#ifdef __sgi - sin = (struct sockaddr_in *)&ifa->ia_addr; -#else sin = (struct sockaddr_in *)&ifa->ifa_addr; -#endif return ipf_ifpfillv4addr(atype, sin, &mask, &inp->in4, &inpmask->in4); Modified: head/contrib/ipfilter/ip_fil_compat.c ============================================================================== --- head/contrib/ipfilter/ip_fil_compat.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ip_fil_compat.c Sun Feb 3 05:25:49 2019 (r343701) @@ -9,15 +9,12 @@ # define KERNEL 1 # define _KERNEL 1 #endif -#if defined(__osf__) -# define _PROTO_NET_H_ -#endif #include <sys/param.h> #include <sys/errno.h> #include <sys/types.h> #include <sys/time.h> #include <sys/file.h> -#if __FreeBSD_version >= 220000 && defined(_KERNEL) +#if defined(__FreeBSD_version) && defined(_KERNEL) # include <sys/fcntl.h> # include <sys/filio.h> #else @@ -26,17 +23,10 @@ #if !defined(_KERNEL) # include <string.h> # define _KERNEL -# ifdef __OpenBSD__ -struct file; -# endif # include <sys/uio.h> # undef _KERNEL #endif #include <sys/socket.h> -#if (defined(__osf__) || defined(AIX) || defined(__hpux) || defined(__sgi)) && defined(_KERNEL) -# include "radix_ipf_local.h" -# define _RADIX_H_ -#endif #include <net/if.h> #if defined(__FreeBSD__) # include <sys/cdefs.h> @@ -44,7 +34,7 @@ struct file; #endif #if defined(_KERNEL) # include <sys/systm.h> -# if !defined(__SVR4) && !defined(__svr4__) +# if !defined(__SVR4) # include <sys/mbuf.h> # endif #endif @@ -348,9 +338,6 @@ typedef struct fr_info_4_1_32 { void *fin_qpi; char fin_ifname[LIFNAMSIZ]; #endif -#ifdef __sgi - void *fin_hbuf; -#endif } fr_info_4_1_32_t; typedef struct fr_info_4_1_24 { @@ -389,9 +376,6 @@ typedef struct fr_info_4_1_24 { void *fin_qpi; char fin_ifname[LIFNAMSIZ]; #endif -#ifdef __sgi - void *fin_hbuf; -#endif } fr_info_4_1_24_t; typedef struct fr_info_4_1_23 { @@ -429,9 +413,6 @@ typedef struct fr_info_4_1_23 { void *fin_qpi; char fin_ifname[LIFNAMSIZ]; #endif -#ifdef __sgi - void *fin_hbuf; -#endif } fr_info_4_1_23_t; typedef struct fr_info_4_1_11 { @@ -468,9 +449,6 @@ typedef struct fr_info_4_1_11 { void *fin_qpi; char fin_ifname[LIFNAMSIZ]; #endif -#ifdef __sgi - void *fin_hbuf; -#endif } fr_info_4_1_11_t; /* ------------------------------------------------------------------------ */ @@ -2678,9 +2656,6 @@ fr_info_4_1_32_to_current(old, current) fin->fin_qfm = old->fin_qfm; fin->fin_qpi = old->fin_qpi; #endif -#ifdef __sgi - fin->fin_hbuf = old->fin_hbuf; -#endif } @@ -2719,9 +2694,6 @@ fr_info_4_1_24_to_current(old, current) fin->fin_qfm = old->fin_qfm; fin->fin_qpi = old->fin_qpi; #endif -#ifdef __sgi - fin->fin_hbuf = old->fin_hbuf; -#endif } @@ -2759,9 +2731,6 @@ fr_info_4_1_23_to_current(old, current) fin->fin_qfm = old->fin_qfm; fin->fin_qpi = old->fin_qpi; #endif -#ifdef __sgi - fin->fin_hbuf = fin->fin_hbuf; -#endif } @@ -2799,9 +2768,6 @@ fr_info_4_1_11_to_current(old, current) fin->fin_qfm = old->fin_qfm; fin->fin_qpi = old->fin_qpi; #endif -#ifdef __sgi - fin->fin_hbuf = fin->fin_hbuf; -#endif } @@ -4078,9 +4044,6 @@ fr_info_current_to_4_1_24(current, old) old->fin_qpi = fin->fin_qpi; old->fin_ifname[0] = '\0'; #endif -#ifdef __sgi - old->fin_hbuf = fin->fin_hbuf; -#endif } @@ -4121,9 +4084,6 @@ fr_info_current_to_4_1_23(current, old) old->fin_qpi = fin->fin_qpi; old->fin_ifname[0] = '\0'; #endif -#ifdef __sgi - old->fin_hbuf = fin->fin_hbuf; -#endif } @@ -4163,9 +4123,6 @@ fr_info_current_to_4_1_11(current, old) old->fin_qfm = fin->fin_qfm; old->fin_qpi = fin->fin_qpi; old->fin_ifname[0] = '\0'; -#endif -#ifdef __sgi - old->fin_hbuf = fin->fin_hbuf; #endif } Modified: head/contrib/ipfilter/ipf.h ============================================================================== --- head/contrib/ipfilter/ipf.h Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipf.h Sun Feb 3 05:25:49 2019 (r343701) @@ -12,11 +12,6 @@ #ifndef __IPF_H__ #define __IPF_H__ -#if defined(__osf__) -# define radix_mask ipf_radix_mask -# define radix_node ipf_radix_node -# define radix_node_head ipf_radix_node_head -#endif #include <sys/param.h> #include <sys/types.h> @@ -31,9 +26,6 @@ # define _KERNEL # define KERNEL #endif -#ifdef __OpenBSD__ -struct file; -#endif #include <sys/uio.h> #ifdef ADD_KERNEL # undef _KERNEL @@ -188,9 +180,8 @@ typedef struct proxyrule { } proxyrule_t; -#if defined(__NetBSD__) || defined(__OpenBSD__) || \ - (_BSDI_VERSION >= 199701) || (__FreeBSD_version >= 300000) || \ - SOLARIS || defined(__sgi) || defined(__osf__) || defined(linux) +#if defined(__NetBSD__) || defined(__FreeBSD_version) || \ + SOLARIS # include <stdarg.h> typedef int (* ioctlfunc_t) __P((int, ioctlcmd_t, ...)); #else @@ -199,13 +190,6 @@ typedef int (* ioctlfunc_t) __P((dev_t, ioctlcmd_t, vo typedef int (* addfunc_t) __P((int, ioctlfunc_t, void *)); typedef int (* copyfunc_t) __P((void *, void *, size_t)); - -/* - * SunOS4 - */ -#if defined(sun) && !defined(__SVR4) && !defined(__svr4__) -extern int ioctl __P((int, int, void *)); -#endif extern char thishost[]; extern char flagset[]; Modified: head/contrib/ipfilter/ipsend/.OLD/ip_compat.h ============================================================================== --- head/contrib/ipfilter/ipsend/.OLD/ip_compat.h Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/.OLD/ip_compat.h Sun Feb 3 05:25:49 2019 (r343701) @@ -112,130 +112,12 @@ # define IPOPT_SECUR_TOPSECRET ((u_short)0x6bc5) #endif -#ifdef linux -# if LINUX < 0200 -# define icmp icmphdr -# define icmp_type type -# define icmp_code code -# endif -/* - * From /usr/include/netinet/ip_var.h - * !%@#!$@# linux... - */ -struct ipovly { - caddr_t ih_next, ih_prev; /* for protocol sequence q's */ - u_char ih_x1; /* (unused) */ - u_char ih_pr; /* protocol */ - short ih_len; /* protocol length */ - struct in_addr ih_src; /* source internet address */ - struct in_addr ih_dst; /* destination internet address */ -}; - -typedef struct { - __u16 th_sport; - __u16 th_dport; - __u32 th_seq; - __u32 th_ack; -# if defined(__i386__) || defined(__MIPSEL__) || defined(__alpha__) ||\ - defined(vax) - __u8 th_res:4; - __u8 th_off:4; -#else - __u8 th_off:4; - __u8 th_res:4; -#endif - __u8 th_flags; - __u16 th_win; - __u16 th_sum; - __u16 th_urp; -} tcphdr_t; - -typedef struct { - __u16 uh_sport; - __u16 uh_dport; - __s16 uh_ulen; - __u16 uh_sum; -} udphdr_t; - -typedef struct { -# if defined(__i386__) || defined(__MIPSEL__) || defined(__alpha__) ||\ - defined(vax) - __u8 ip_hl:4; - __u8 ip_v:4; -# else - __u8 ip_hl:4; - __u8 ip_v:4; -# endif - __u8 ip_tos; - __u16 ip_len; - __u16 ip_id; - __u16 ip_off; - __u8 ip_ttl; - __u8 ip_p; - __u16 ip_sum; - struct in_addr ip_src; - struct in_addr ip_dst; -} ip_t; - -typedef struct { - __u8 ether_dhost[6]; - __u8 ether_shost[6]; - __u16 ether_type; -} ether_header_t; - -typedef 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_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 - union { - struct id_ts { - n_time its_otime; - n_time its_rtime; - n_time its_ttime; - } id_ts; - struct id_ip { - ip_t idi_ip; - /* options and then 64 bits of data */ - } id_ip; - u_long 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_mask icmp_dun.id_mask -#define icmp_data icmp_dun.id_data -} icmphdr_t; - -# define bcopy(a,b,c) memmove(b,a,c) -# define bcmp(a,b,c) memcmp(a,b,c) - -# define ifnet device - -#else - typedef struct udphdr udphdr_t; typedef struct tcphdr tcphdr_t; typedef struct ip ip_t; typedef struct ether_header ether_header_t; -#endif #if defined(__SVR4) || defined(__svr4__) # define bcopy(a,b,c) memmove(b,a,c) Modified: head/contrib/ipfilter/ipsend/44arp.c ============================================================================== --- head/contrib/ipfilter/ipsend/44arp.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/44arp.c Sun Feb 3 05:25:49 2019 (r343701) @@ -10,9 +10,7 @@ #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> -#ifndef __osf__ # include <net/route.h> -#endif #include <netinet/in.h> #include <netinet/if_ether.h> #include <arpa/inet.h> Modified: head/contrib/ipfilter/ipsend/arp.c ============================================================================== --- head/contrib/ipfilter/ipsend/arp.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/arp.c Sun Feb 3 05:25:49 2019 (r343701) @@ -88,7 +88,6 @@ int arp(ip, ether) sin = (struct sockaddr_in *)&ar.arp_pa; sin->sin_family = AF_INET; bcopy(ip, (char *)&sin->sin_addr.s_addr, 4); -#ifndef hpux if ((hp = gethostbyaddr(ip, 4, AF_INET))) # if SOLARIS && (SOLARIS2 >= 10) if (!(ether_hostton(hp->h_name, (struct ether_addr *)ether))) @@ -96,7 +95,6 @@ int arp(ip, ether) if (!(ether_hostton(hp->h_name, ether))) # endif goto savearp; -#endif if (sfd == -1) if ((sfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) Modified: head/contrib/ipfilter/ipsend/dlcommon.c ============================================================================== --- head/contrib/ipfilter/ipsend/dlcommon.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/dlcommon.c Sun Feb 3 05:25:49 2019 (r343701) @@ -20,11 +20,7 @@ typedef unsigned long ulong; #include <sys/types.h> #include <sys/stream.h> #include <sys/stropts.h> -#ifdef __osf__ -# include <sys/dlpihdr.h> -#else # include <sys/dlpi.h> -#endif #include <sys/signal.h> #include <stdio.h> #include <string.h> Modified: head/contrib/ipfilter/ipsend/ip.c ============================================================================== --- head/contrib/ipfilter/ipsend/ip.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/ip.c Sun Feb 3 05:25:49 2019 (r343701) @@ -17,11 +17,9 @@ static const char rcsid[] = "@(#)$Id$"; #include <netinet/in.h> #include <netinet/ip.h> #include <sys/param.h> -#ifndef linux # include <net/route.h> # include <netinet/if_ether.h> # include <netinet/ip_var.h> -#endif #include <errno.h> #include <stdio.h> #include <stdlib.h> Modified: head/contrib/ipfilter/ipsend/ipresend.c ============================================================================== --- head/contrib/ipfilter/ipsend/ipresend.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/ipresend.c Sun Feb 3 05:25:49 2019 (r343701) @@ -18,9 +18,7 @@ static const char rcsid[] = "@(#)$Id$"; #include <arpa/inet.h> #include <netinet/in_systm.h> #include <netinet/ip.h> -#ifndef linux #include <netinet/ip_var.h> -#endif #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -37,9 +35,6 @@ extern struct ipread pcap, iphex, iptext; int opts = 0; #ifndef DEFAULT_DEVICE -# ifdef linux -char default_device[] = "eth0"; -# else # ifdef sun char default_device[] = "le0"; # else @@ -49,15 +44,10 @@ char default_device[] = "ln0"; # ifdef __bsdi__ char default_device[] = "ef0"; # else -# ifdef __sgi -char default_device[] = "ec0"; -# else char default_device[] = "lan0"; -# endif # endif # endif # endif -# endif #else char default_device[] = DEFAULT_DEVICE; #endif Modified: head/contrib/ipfilter/ipsend/ipsend.c ============================================================================== --- head/contrib/ipfilter/ipsend/ipsend.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/ipsend.c Sun Feb 3 05:25:49 2019 (r343701) @@ -21,14 +21,10 @@ static const char rcsid[] = "@(#)$Id$"; #include <netdb.h> #include <string.h> #include <netinet/ip.h> -#ifndef linux # include <netinet/ip_var.h> -#endif #include "ipsend.h" #include "ipf.h" -#ifndef linux # include <netinet/udp_var.h> -#endif extern char *optarg; @@ -37,27 +33,15 @@ extern void iplang __P((FILE *)); char options[68]; int opts; -#ifdef linux -char default_device[] = "eth0"; -#else # ifdef ultrix char default_device[] = "ln0"; # else # ifdef __bsdi__ char default_device[] = "ef0"; # else -# ifdef __sgi -char default_device[] = "ec0"; -# else -# ifdef __hpux -char default_device[] = "lan0"; -# else char default_device[] = "le0"; -# endif /* __hpux */ -# endif /* __sgi */ # endif /* __bsdi__ */ # endif /* ultrix */ -#endif /* linux */ static void usage __P((char *)); Modified: head/contrib/ipfilter/ipsend/ipsend.h ============================================================================== --- head/contrib/ipfilter/ipsend/ipsend.h Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/ipsend.h Sun Feb 3 05:25:49 2019 (r343701) @@ -26,9 +26,6 @@ #include <net/if.h> #include "ipf.h" -#ifdef linux -#include <linux/sockios.h> -#endif /* XXX: The following is needed by tcpip.h */ #include <netinet/ip_var.h> #include "netinet/tcpip.h" @@ -49,11 +46,7 @@ extern u_32_t buildopts __P((char *, char *, int)); extern int addipopt __P((char *, struct ipopt_names *, int, char *)); extern int initdevice __P((char *, int)); extern int sendip __P((int, char *, int)); -#ifdef linux -extern struct sock *find_tcp __P((int, struct tcpiphdr *)); -#else extern struct tcpcb *find_tcp __P((int, struct tcpiphdr *)); -#endif extern int ip_resend __P((char *, int, struct ipread *, struct in_addr, char *)); extern void ip_test1 __P((char *, int, ip_t *, struct in_addr, int)); Modified: head/contrib/ipfilter/ipsend/ipsopt.c ============================================================================== --- head/contrib/ipfilter/ipsend/ipsopt.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/ipsopt.c Sun Feb 3 05:25:49 2019 (r343701) @@ -20,9 +20,7 @@ static const char rcsid[] = "@(#)$Id$"; #include <stdio.h> #include <string.h> #include <stdlib.h> -#ifndef linux #include <netinet/ip_var.h> -#endif #include <netinet/tcp.h> #include <arpa/inet.h> #include "ipsend.h" Modified: head/contrib/ipfilter/ipsend/iptest.c ============================================================================== --- head/contrib/ipfilter/ipsend/iptest.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/iptest.c Sun Feb 3 05:25:49 2019 (r343701) @@ -18,12 +18,7 @@ static const char rcsid[] = "@(#)$Id$"; #include <arpa/inet.h> #include <netinet/in_systm.h> #include <netinet/ip.h> -#ifndef linux #include <netinet/ip_var.h> -#endif -#ifdef linux -#include <linux/sockios.h> -#endif #include <stdio.h> #include <netdb.h> #include <unistd.h> @@ -36,9 +31,6 @@ extern char *optarg; extern int optind; char options[68]; -#ifdef linux -char default_device[] = "eth0"; -#else # ifdef sun char default_device[] = "le0"; # else @@ -48,15 +40,10 @@ char default_device[] = "ln0"; # ifdef __bsdi__ char default_device[] = "ef0"; # else -# ifdef __sgi -char default_device[] = "ec0"; -# else char default_device[] = "lan0"; -# endif # endif # endif # endif -#endif static void usage __P((char *)); int main __P((int, char **)); Modified: head/contrib/ipfilter/ipsend/iptests.c ============================================================================== --- head/contrib/ipfilter/ipsend/iptests.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/iptests.c Sun Feb 3 05:25:49 2019 (r343701) @@ -21,7 +21,6 @@ static const char rcsid[] = "@(#)$Id$"; typedef int boolean_t; #endif #include <sys/time.h> -#if !defined(__osf__) # ifdef __NetBSD__ # include <machine/lock.h> # include <machine/mutex.h> @@ -37,7 +36,6 @@ typedef int boolean_t; # endif # undef _KERNEL # undef KERNEL -#endif #if !defined(solaris) && !defined(linux) && !defined(__sgi) # include <nlist.h> # include <sys/user.h> @@ -66,24 +64,13 @@ typedef int boolean_t; #endif #include <netinet/in_systm.h> #include <sys/socket.h> -#ifdef __hpux -# define _NET_ROUTE_INCLUDED -#endif #include <net/if.h> -#if defined(linux) && (LINUX >= 0200) -# include <asm/atomic.h> -#endif -#if !defined(linux) # if defined(__FreeBSD__) # include "radix_ipf.h" # endif # if !defined(solaris) # include <net/route.h> # endif -#else -# define __KERNEL__ /* because there's a macro not wrapped by this */ -# include <net/route.h> /* in this file :-/ */ -#endif #include <netinet/in.h> #include <arpa/inet.h> #include <netinet/ip.h> @@ -94,20 +81,13 @@ typedef int boolean_t; #include <unistd.h> #include <stdlib.h> #include <string.h> -#ifdef __hpux -# undef _NET_ROUTE_INCLUDED -#endif -#if !defined(linux) # include <netinet/ip_var.h> # if !defined(__hpux) && !defined(solaris) # include <netinet/in_pcb.h> # endif -#endif #include "ipsend.h" -#if !defined(linux) && !defined(__hpux) # include <netinet/tcp_timer.h> # include <netinet/tcp_var.h> -#endif #if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106000000) # define USE_NANOSLEEP #endif @@ -951,9 +931,7 @@ void ip_test5(dev, mtu, ip, gwip, ptest) int nfd, i; t = (tcphdr_t *)((char *)ip + (IP_HL(ip) << 2)); -#if !defined(linux) && !defined(__osf__) t->th_x2 = 0; -#endif TCP_OFF_A(t, 0); t->th_sport = htons(1); t->th_dport = htons(1); Modified: head/contrib/ipfilter/ipsend/resend.c ============================================================================== --- head/contrib/ipfilter/ipsend/resend.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/resend.c Sun Feb 3 05:25:49 2019 (r343701) @@ -19,10 +19,8 @@ static const char rcsid[] = "@(#)$Id$"; #include <arpa/inet.h> #include <netinet/in_systm.h> #include <netinet/ip.h> -#ifndef linux # include <netinet/ip_var.h> # include <netinet/if_ether.h> -#endif #include <stdio.h> #include <netdb.h> #include <string.h> Modified: head/contrib/ipfilter/ipsend/sdlpi.c ============================================================================== --- head/contrib/ipfilter/ipsend/sdlpi.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/sdlpi.c Sun Feb 3 05:25:49 2019 (r343701) @@ -25,14 +25,7 @@ # include <sys/pfmod.h> # include <sys/bufmod.h> #endif -#ifdef __osf__ -# include <sys/dlpihdr.h> -#else # include <sys/dlpi.h> -#endif -#ifdef __hpux -# include <sys/dlpi_ext.h> -#endif #include <net/if.h> #include <netinet/in.h> Modified: head/contrib/ipfilter/ipsend/sock.c ============================================================================== --- head/contrib/ipfilter/ipsend/sock.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/ipsend/sock.c Sun Feb 3 05:25:49 2019 (r343701) @@ -29,7 +29,6 @@ typedef int boolean_t; #else # include <sys/dir.h> #endif -#if !defined(__osf__) # ifdef __NetBSD__ # include <machine/lock.h> # endif @@ -50,7 +49,6 @@ typedef int boolean_t; # undef _KERNEL # undef KERNEL # endif -#endif #include <nlist.h> #include <sys/user.h> #include <sys/socket.h> @@ -74,9 +72,7 @@ typedef int boolean_t; #include <netinet/ip.h> #include <netinet/tcp.h> #include <net/if.h> -#ifndef __osf__ # include <net/route.h> -#endif #include <netinet/ip_var.h> #define _WANT_INPCB #include <netinet/in_pcb.h> Modified: head/contrib/ipfilter/lib/getifname.c ============================================================================== --- head/contrib/ipfilter/lib/getifname.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/lib/getifname.c Sun Feb 3 05:25:49 2019 (r343701) @@ -25,9 +25,6 @@ char *getifname(ptr) # include <sys/mutex.h> # include <sys/condvar.h> # endif -# ifdef __hpux -# include "compat.h" -# endif # include "../pfil/qif.h" char *ifname; qif_t qif; Modified: head/contrib/ipfilter/lib/getproto.c ============================================================================== --- head/contrib/ipfilter/lib/getproto.c Sun Feb 3 04:41:00 2019 (r343700) +++ head/contrib/ipfilter/lib/getproto.c Sun Feb 3 05:25:49 2019 (r343701) @@ -23,14 +23,6 @@ int getproto(name) if (*s == '\0') return atoi(name); -#ifdef _AIX51 - /* - * For some bogus reason, "ip" is 252 in /etc/protocols on AIX 5 - * The IANA has doubled up on the definition of 0 - it is now also - * used for IPv6 hop-opts, so we can no longer rely on /etc/protocols - * providing the correct name->number mapping - */ -#endif if (!strcasecmp(name, "ip")) return 0; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
