On Tue, Mar 26, 2002 at 02:09:09AM -0800, Darren Reed wrote:
> darrenr 2002/03/26 02:09:09 PST
>
> Modified files:
> sbin/ipfs Makefile
> Log:
> add extra include path to get .h files from source being used to compile
>
> Revision Changes Path
> 1.3 +1 -0 src/sbin/ipfs/Makefile
>
Darren,
Why are you doing this? This and a couple of previous -I changes didn't
do anything useful; the produced .depend files have the same set of header
files as before.
The complexity you observe is due to the tangled #include directives in
IPFilter sources. You include the header files in two different ways.
For example, fils.c and parse.c (that are both part of the ipfstat(8))
include ip_compat.h differently:
fils.c:#include "netinet/ip_compat.h"
parse.c:#include "ip_compat.h"
The proper fix is to fix #include directives so that ip_*.h and ipl.h
are always included from "netinet/" and the rest is included from the
current directory. The attached patch implements this. (It was of
course verified to work.)
After the patch:
# grep -Erh '["\<]netinet/(ip_.*|ipl)\.h' contrib/ipfilter sys/contrib/ipfilter |wc -l
252
# grep -Erh '["\<](ip_.*|ipl)\.h' contrib/ipfilter sys/contrib/ipfilter |wc -l
9
The 9 offenders are from contrib/ipfilter/FWTK/*.diff which I didn't touch.
Cheers,
--
Ruslan Ermilov Sysadmin and DBA,
[EMAIL PROTECTED] Sunbay Software AG,
[EMAIL PROTECTED] FreeBSD committer,
+380.652.512.251 Simferopol, Ukraine
http://www.FreeBSD.org The Power To Serve
http://www.oracle.com Enabling The Information Age
Index: contrib/ipfilter/common.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/common.c,v
retrieving revision 1.1.1.5
diff -u -p -u -r1.1.1.5 common.c
--- contrib/ipfilter/common.c 19 Mar 2002 11:45:00 -0000 1.1.1.5
+++ contrib/ipfilter/common.c 27 Mar 2002 10:40:41 -0000
@@ -35,8 +35,8 @@
#include <resolv.h>
#include <ctype.h>
#include <syslog.h>
-#include "ip_compat.h"
-#include "ip_fil.h"
+#include "netinet/ip_compat.h"
+#include "netinet/ip_fil.h"
#include "ipf.h"
#include "facpri.h"
Index: contrib/ipfilter/ip_sfil.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ip_sfil.c,v
retrieving revision 1.1.1.15
diff -u -p -u -r1.1.1.15 ip_sfil.c
--- contrib/ipfilter/ip_sfil.c 19 Mar 2002 11:45:05 -0000 1.1.1.15
+++ contrib/ipfilter/ip_sfil.c 27 Mar 2002 10:40:41 -0000
@@ -39,16 +39,16 @@ static const char rcsid[] = "@(#)$Id: ip
#include <netinet/udp.h>
#include <netinet/tcpip.h>
#include <netinet/ip_icmp.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#ifdef USE_INET6
# include <netinet/icmp6.h>
#endif
-#include "ip_fil.h"
-#include "ip_state.h"
-#include "ip_nat.h"
-#include "ip_frag.h"
-#include "ip_auth.h"
-#include "ip_proxy.h"
+#include "netinet/ip_fil.h"
+#include "netinet/ip_state.h"
+#include "netinet/ip_nat.h"
+#include "netinet/ip_frag.h"
+#include "netinet/ip_auth.h"
+#include "netinet/ip_proxy.h"
#include <inet/ip_ire.h>
#ifndef MIN
#define MIN(a,b) (((a)<(b))?(a):(b))
Index: contrib/ipfilter/ipf.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipf.c,v
retrieving revision 1.1.1.12
diff -u -p -u -r1.1.1.12 ipf.c
--- contrib/ipfilter/ipf.c 19 Mar 2002 11:45:01 -0000 1.1.1.12
+++ contrib/ipfilter/ipf.c 27 Mar 2002 10:40:41 -0000
@@ -41,12 +41,12 @@
#include <netdb.h>
#include <arpa/nameser.h>
#include <resolv.h>
-#include "ip_compat.h"
-#include "ip_fil.h"
-#include "ip_nat.h"
-#include "ip_state.h"
+#include "netinet/ip_compat.h"
+#include "netinet/ip_fil.h"
+#include "netinet/ip_nat.h"
+#include "netinet/ip_state.h"
#include "ipf.h"
-#include "ipl.h"
+#include "netinet/ipl.h"
#if !defined(lint)
static const char sccsid[] = "@(#)ipf.c 1.23 6/5/96 (C) 1993-2000 Darren Reed";
Index: contrib/ipfilter/ipfs.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipfs.c,v
retrieving revision 1.1.1.4
diff -u -p -u -r1.1.1.4 ipfs.c
--- contrib/ipfilter/ipfs.c 19 Mar 2002 11:45:05 -0000 1.1.1.4
+++ contrib/ipfilter/ipfs.c 27 Mar 2002 10:40:41 -0000
@@ -38,10 +38,10 @@
#include <netdb.h>
#include <arpa/nameser.h>
#include <resolv.h>
-#include "ip_compat.h"
-#include "ip_fil.h"
-#include "ip_nat.h"
-#include "ip_state.h"
+#include "netinet/ip_compat.h"
+#include "netinet/ip_fil.h"
+#include "netinet/ip_nat.h"
+#include "netinet/ip_state.h"
#include "ipf.h"
#if !defined(lint)
Index: contrib/ipfilter/ipft_ef.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipft_ef.c,v
retrieving revision 1.1.1.8
diff -u -p -u -r1.1.1.8 ipft_ef.c
--- contrib/ipfilter/ipft_ef.c 19 Mar 2002 11:45:05 -0000 1.1.1.8
+++ contrib/ipfilter/ipft_ef.c 27 Mar 2002 10:40:41 -0000
@@ -45,7 +45,7 @@ etherfind -n -t
#include <netinet/ip_icmp.h>
#include <net/if.h>
#include <netdb.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include <netinet/tcpip.h>
#include "ipf.h"
#include "ipt.h"
Index: contrib/ipfilter/ipft_hx.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipft_hx.c,v
retrieving revision 1.1.1.8
diff -u -p -u -r1.1.1.8 ipft_hx.c
--- contrib/ipfilter/ipft_hx.c 19 Mar 2002 11:45:05 -0000 1.1.1.8
+++ contrib/ipfilter/ipft_hx.c 27 Mar 2002 10:40:41 -0000
@@ -36,7 +36,7 @@
#include <netdb.h>
#include <arpa/nameser.h>
#include <resolv.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include <netinet/tcpip.h>
#include "ipf.h"
#include "ipt.h"
Index: contrib/ipfilter/ipft_pc.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipft_pc.c,v
retrieving revision 1.1.1.8
diff -u -p -u -r1.1.1.8 ipft_pc.c
--- contrib/ipfilter/ipft_pc.c 19 Mar 2002 11:45:06 -0000 1.1.1.8
+++ contrib/ipfilter/ipft_pc.c 27 Mar 2002 10:40:41 -0000
@@ -27,7 +27,7 @@
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <net/if.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include <netinet/tcpip.h>
#include "ipf.h"
#include "pcap.h"
Index: contrib/ipfilter/ipft_sn.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipft_sn.c,v
retrieving revision 1.1.1.8
diff -u -p -u -r1.1.1.8 ipft_sn.c
--- contrib/ipfilter/ipft_sn.c 19 Mar 2002 11:45:06 -0000 1.1.1.8
+++ contrib/ipfilter/ipft_sn.c 27 Mar 2002 10:40:41 -0000
@@ -31,7 +31,7 @@
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <net/if.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include <netinet/tcpip.h>
#include "ipf.h"
#include "snoop.h"
Index: contrib/ipfilter/ipft_td.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipft_td.c,v
retrieving revision 1.1.1.8
diff -u -p -u -r1.1.1.8 ipft_td.c
--- contrib/ipfilter/ipft_td.c 19 Mar 2002 11:45:06 -0000 1.1.1.8
+++ contrib/ipfilter/ipft_td.c 27 Mar 2002 10:40:41 -0000
@@ -54,7 +54,7 @@ tcpdump -nqte
#include <netinet/ip_icmp.h>
#include <net/if.h>
#include <netdb.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include <netinet/tcpip.h>
#include "ipf.h"
#include "ipt.h"
Index: contrib/ipfilter/ipft_tx.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipft_tx.c,v
retrieving revision 1.1.1.10
diff -u -p -u -r1.1.1.10 ipft_tx.c
--- contrib/ipfilter/ipft_tx.c 19 Mar 2002 11:45:06 -0000 1.1.1.10
+++ contrib/ipfilter/ipft_tx.c 27 Mar 2002 10:40:41 -0000
@@ -37,7 +37,7 @@
#include <netdb.h>
#include <arpa/nameser.h>
#include <resolv.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include <netinet/tcpip.h>
#include "ipf.h"
#include "ipt.h"
Index: contrib/ipfilter/ipt.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipt.c,v
retrieving revision 1.1.1.9
diff -u -p -u -r1.1.1.9 ipt.c
--- contrib/ipfilter/ipt.c 19 Mar 2002 11:45:06 -0000 1.1.1.9
+++ contrib/ipfilter/ipt.c 27 Mar 2002 10:40:41 -0000
@@ -52,12 +52,12 @@
#include <arpa/inet.h>
#include <resolv.h>
#include <ctype.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include <netinet/tcpip.h>
-#include "ip_fil.h"
-#include "ip_nat.h"
-#include "ip_state.h"
-#include "ip_frag.h"
+#include "netinet/ip_fil.h"
+#include "netinet/ip_nat.h"
+#include "netinet/ip_state.h"
+#include "netinet/ip_frag.h"
#include "ipf.h"
#include "ipt.h"
Index: contrib/ipfilter/misc.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/misc.c,v
retrieving revision 1.1.1.8
diff -u -p -u -r1.1.1.8 misc.c
--- contrib/ipfilter/misc.c 19 Mar 2002 11:45:06 -0000 1.1.1.8
+++ contrib/ipfilter/misc.c 27 Mar 2002 10:40:41 -0000
@@ -45,9 +45,9 @@
#include <netdb.h>
#include <arpa/nameser.h>
#include <resolv.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include <netinet/tcpip.h>
-#include "ip_fil.h"
+#include "netinet/ip_fil.h"
#include "ipf.h"
#include "ipt.h"
Index: contrib/ipfilter/mli_ipl.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/mli_ipl.c,v
retrieving revision 1.1.1.6
diff -u -p -u -r1.1.1.6 mli_ipl.c
--- contrib/ipfilter/mli_ipl.c 19 Mar 2002 11:45:06 -0000 1.1.1.6
+++ contrib/ipfilter/mli_ipl.c 27 Mar 2002 10:40:41 -0000
@@ -35,10 +35,10 @@
#include <netinet/tcpip.h>
#include <netinet/ip_icmp.h>
#include <netinet/ipfilter.h>
-#include "ipl.h"
-#include "ip_compat.h"
-#include "ip_fil.h"
-#include "ip_nat.h"
+#include "netinet/ipl.h"
+#include "netinet/ip_compat.h"
+#include "netinet/ip_fil.h"
+#include "netinet/ip_nat.h"
/*#define IPFDEBUG 1*/
Index: contrib/ipfilter/mln_ipl.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/mln_ipl.c,v
retrieving revision 1.1.1.9
diff -u -p -u -r1.1.1.9 mln_ipl.c
--- contrib/ipfilter/mln_ipl.c 19 Mar 2002 11:45:07 -0000 1.1.1.9
+++ contrib/ipfilter/mln_ipl.c 27 Mar 2002 10:40:41 -0000
@@ -42,9 +42,9 @@
#include <netinet/tcp.h>
#include <netinet/tcpip.h>
#include <sys/lkm.h>
-#include "ipl.h"
-#include "ip_compat.h"
-#include "ip_fil.h"
+#include "netinet/ipl.h"
+#include "netinet/ip_compat.h"
+#include "netinet/ip_fil.h"
#if !defined(__NetBSD_Version__) || __NetBSD_Version__ < 103050000
#define vn_lock(v,f) VOP_LOCK(v)
Index: contrib/ipfilter/mls_ipl.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/mls_ipl.c,v
retrieving revision 1.1.1.6
diff -u -p -u -r1.1.1.6 mls_ipl.c
--- contrib/ipfilter/mls_ipl.c 28 Jul 2001 11:59:21 -0000 1.1.1.6
+++ contrib/ipfilter/mls_ipl.c 27 Mar 2002 10:40:41 -0000
@@ -33,9 +33,9 @@
#include <netinet/tcp.h>
#include <netinet/tcpip.h>
#include <net/if.h>
-#include "ipl.h"
-#include "ip_compat.h"
-#include "ip_fil.h"
+#include "netinet/ipl.h"
+#include "netinet/ip_compat.h"
+#include "netinet/ip_fil.h"
#if !defined(lint)
Index: contrib/ipfilter/opt.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/opt.c,v
retrieving revision 1.1.1.7
diff -u -p -u -r1.1.1.7 opt.c
--- contrib/ipfilter/opt.c 19 Mar 2002 11:45:06 -0000 1.1.1.7
+++ contrib/ipfilter/opt.c 27 Mar 2002 10:40:41 -0000
@@ -21,9 +21,9 @@
#include <netinet/tcp.h>
#include <net/if.h>
#include <arpa/inet.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include <netinet/tcpip.h>
-#include "ip_fil.h"
+#include "netinet/ip_fil.h"
#include "ipf.h"
#if !defined(lint)
Index: contrib/ipfilter/parse.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/parse.c,v
retrieving revision 1.1.1.15
diff -u -p -u -r1.1.1.15 parse.c
--- contrib/ipfilter/parse.c 19 Mar 2002 11:45:07 -0000 1.1.1.15
+++ contrib/ipfilter/parse.c 27 Mar 2002 10:40:41 -0000
@@ -35,8 +35,8 @@
#include <resolv.h>
#include <ctype.h>
#include <syslog.h>
-#include "ip_compat.h"
-#include "ip_fil.h"
+#include "netinet/ip_compat.h"
+#include "netinet/ip_fil.h"
#include "ipf.h"
#include "facpri.h"
Index: contrib/ipfilter/relay.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/relay.c,v
retrieving revision 1.1.1.4
diff -u -p -u -r1.1.1.4 relay.c
--- contrib/ipfilter/relay.c 28 Jul 2001 11:59:22 -0000 1.1.1.4
+++ contrib/ipfilter/relay.c 27 Mar 2002 10:40:41 -0000
@@ -16,7 +16,7 @@
#include <netinet/in.h>
#include <net/if.h>
#include <sys/socket.h>
-#include "ip_nat.h"
+#include "netinet/ip_nat.h"
#define RELAY_BUFSZ 8192
Index: contrib/ipfilter/solaris.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/solaris.c,v
retrieving revision 1.1.1.15
diff -u -p -u -r1.1.1.15 solaris.c
--- contrib/ipfilter/solaris.c 19 Mar 2002 11:45:07 -0000 1.1.1.15
+++ contrib/ipfilter/solaris.c 27 Mar 2002 10:40:41 -0000
@@ -45,11 +45,11 @@
#include <netinet/ip_icmp.h>
#include <sys/ddi.h>
#include <sys/sunddi.h>
-#include "ip_compat.h"
-#include "ipl.h"
-#include "ip_fil.h"
-#include "ip_nat.h"
-#include "ip_state.h"
+#include "netinet/ip_compat.h"
+#include "netinet/ipl.h"
+#include "netinet/ip_fil.h"
+#include "netinet/ip_nat.h"
+#include "netinet/ip_state.h"
char _depends_on[] = "drv/ip";
Index: contrib/ipfilter/iplang/iplang_l.l
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/iplang/iplang_l.l,v
retrieving revision 1.1.1.5
diff -u -p -u -r1.1.1.5 iplang_l.l
--- contrib/ipfilter/iplang/iplang_l.l 24 May 2000 02:14:18 -0000 1.1.1.5
+++ contrib/ipfilter/iplang/iplang_l.l 27 Mar 2002 10:40:41 -0000
@@ -18,7 +18,7 @@
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include "y.tab.h"
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include "ipf.h"
#ifndef __P
Index: contrib/ipfilter/iplang/iplang_y.y
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/iplang/iplang_y.y,v
retrieving revision 1.4
diff -u -p -u -r1.4 iplang_y.y
--- contrib/ipfilter/iplang/iplang_y.y 19 Mar 2002 11:48:14 -0000 1.4
+++ contrib/ipfilter/iplang/iplang_y.y 27 Mar 2002 10:40:41 -0000
@@ -48,7 +48,7 @@
#include <resolv.h>
#include <ctype.h>
#include "ipsend.h"
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include "ipf.h"
#include "iplang.h"
Index: contrib/ipfilter/ipsd/ipsd.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipsd/ipsd.c,v
retrieving revision 1.1.1.4
diff -u -p -u -r1.1.1.4 ipsd.c
--- contrib/ipfilter/ipsd/ipsd.c 28 Jul 2001 11:59:25 -0000 1.1.1.4
+++ contrib/ipfilter/ipsd/ipsd.c 27 Mar 2002 10:40:41 -0000
@@ -26,7 +26,7 @@
#include <netinet/ip_var.h>
#include <netinet/tcpip.h>
#endif
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#ifdef linux
#include <linux/sockios.h>
#include "tcpip.h"
Index: contrib/ipfilter/ipsd/ipsdr.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipsd/ipsdr.c,v
retrieving revision 1.1.1.4
diff -u -p -u -r1.1.1.4 ipsdr.c
--- contrib/ipfilter/ipsd/ipsdr.c 28 Jul 2001 11:59:26 -0000 1.1.1.4
+++ contrib/ipfilter/ipsd/ipsdr.c 27 Mar 2002 10:40:41 -0000
@@ -27,7 +27,7 @@
#include <netinet/ip_var.h>
#include <netinet/tcpip.h>
#endif
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#ifdef linux
#include <linux/sockios.h>
#include "tcpip.h"
Index: contrib/ipfilter/ipsd/linux.h
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipsd/linux.h,v
retrieving revision 1.1.1.4
diff -u -p -u -r1.1.1.4 linux.h
--- contrib/ipfilter/ipsd/linux.h 28 Jul 2001 11:59:26 -0000 1.1.1.4
+++ contrib/ipfilter/ipsd/linux.h 27 Mar 2002 10:40:41 -0000
@@ -12,4 +12,4 @@
#include <linux/version.h>
#endif /* MODULE */
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
Index: contrib/ipfilter/ipsd/sbpf.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipsd/sbpf.c,v
retrieving revision 1.1.1.4
diff -u -p -u -r1.1.1.4 sbpf.c
--- contrib/ipfilter/ipsd/sbpf.c 28 Jul 2001 11:59:26 -0000 1.1.1.4
+++ contrib/ipfilter/ipsd/sbpf.c 27 Mar 2002 10:40:41 -0000
@@ -33,7 +33,7 @@
#include <netinet/udp_var.h>
#include <netinet/tcp.h>
#include <netinet/tcpip.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#ifndef lint
static char sbpf[] = "@(#)sbpf.c 1.2 12/3/95 (C)1995 Darren Reed";
Index: contrib/ipfilter/ipsd/sdlpi.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipsd/sdlpi.c,v
retrieving revision 1.1.1.4
diff -u -p -u -r1.1.1.4 sdlpi.c
--- contrib/ipfilter/ipsd/sdlpi.c 28 Jul 2001 11:59:26 -0000 1.1.1.4
+++ contrib/ipfilter/ipsd/sdlpi.c 27 Mar 2002 10:40:41 -0000
@@ -34,7 +34,7 @@
#include <netinet/tcp.h>
#include <netinet/tcpip.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#ifndef lint
static char snitid[] = "%W% %G% (C)1995 Darren Reed";
Index: contrib/ipfilter/ipsd/slinux.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipsd/slinux.c,v
retrieving revision 1.1.1.4
diff -u -p -u -r1.1.1.4 slinux.c
--- contrib/ipfilter/ipsd/slinux.c 28 Jul 2001 11:59:26 -0000 1.1.1.4
+++ contrib/ipfilter/ipsd/slinux.c 27 Mar 2002 10:40:41 -0000
@@ -25,7 +25,7 @@
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include "tcpip.h"
#ifndef lint
Index: contrib/ipfilter/ipsend/ipsend.h
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipsend/ipsend.h,v
retrieving revision 1.1.1.4
diff -u -p -u -r1.1.1.4 ipsend.h
--- contrib/ipfilter/ipsend/ipsend.h 28 Jul 2001 11:59:27 -0000 1.1.1.4
+++ contrib/ipfilter/ipsend/ipsend.h 27 Mar 2002 10:40:41 -0000
@@ -17,7 +17,7 @@
# endif
#endif
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#ifdef linux
#include <linux/sockios.h>
#endif
Index: contrib/ipfilter/ipsend/larp.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipsend/larp.c,v
retrieving revision 1.1.1.4
diff -u -p -u -r1.1.1.4 larp.c
--- contrib/ipfilter/ipsend/larp.c 28 Jul 2001 11:59:27 -0000 1.1.1.4
+++ contrib/ipfilter/ipsend/larp.c 27 Mar 2002 10:40:41 -0000
@@ -17,7 +17,7 @@ static const char rcsid[] = "@(#)$Id: la
#include <net/if.h>
#include <net/if_arp.h>
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
#include "iplang/iplang.h"
/*
Index: contrib/ipfilter/ipsend/linux.h
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/ipsend/linux.h,v
retrieving revision 1.1.1.4
diff -u -p -u -r1.1.1.4 linux.h
--- contrib/ipfilter/ipsend/linux.h 28 Jul 2001 11:59:27 -0000 1.1.1.4
+++ contrib/ipfilter/ipsend/linux.h 27 Mar 2002 10:40:41 -0000
@@ -12,4 +12,4 @@
#include <linux/version.h>
#endif /* MODULE */
-#include "ip_compat.h"
+#include "netinet/ip_compat.h"
Index: contrib/ipfilter/l4check/l4check.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/l4check/l4check.c,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 l4check.c
--- contrib/ipfilter/l4check/l4check.c 24 May 2000 02:14:19 -0000 1.1.1.1
+++ contrib/ipfilter/l4check/l4check.c 27 Mar 2002 10:40:41 -0000
@@ -22,9 +22,9 @@
#include <errno.h>
#include <stdlib.h>
-#include "ip_compat.h"
-#include "ip_fil.h"
-#include "ip_nat.h"
+#include "netinet/ip_compat.h"
+#include "netinet/ip_fil.h"
+#include "netinet/ip_nat.h"
#include "ipf.h"
Index: contrib/ipfilter/samples/userauth.c
===================================================================
RCS file: /home/ncvs/src/contrib/ipfilter/samples/userauth.c,v
retrieving revision 1.1.1.3
diff -u -p -u -r1.1.1.3 userauth.c
--- contrib/ipfilter/samples/userauth.c 4 Feb 2001 14:25:37 -0000 1.1.1.3
+++ contrib/ipfilter/samples/userauth.c 27 Mar 2002 10:40:41 -0000
@@ -6,9 +6,9 @@
#include <stdlib.h>
#include <netinet/in.h>
#include <net/if.h>
-#include "ip_compat.h"
-#include "ip_fil.h"
-#include "ip_auth.h"
+#include "netinet/ip_compat.h"
+#include "netinet/ip_fil.h"
+#include "netinet/ip_auth.h"
extern int errno;
Index: sbin/ipf/Makefile
===================================================================
RCS file: /home/ncvs/src/sbin/ipf/Makefile,v
retrieving revision 1.12
diff -u -p -u -r1.12 Makefile
--- sbin/ipf/Makefile 20 Mar 2002 09:02:48 -0000 1.12
+++ sbin/ipf/Makefile 27 Mar 2002 10:40:41 -0000
@@ -6,9 +6,7 @@ PROG= ipf
MAN= ipf.4 ipf.5 ipf.8
SRCS= ipf.c parse.c opt.c facpri.c common.c
CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\"
-CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter
-CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
WARNS= 0
MAINTAINER= [EMAIL PROTECTED]
Index: sbin/ipfs/Makefile
===================================================================
RCS file: /home/ncvs/src/sbin/ipfs/Makefile,v
retrieving revision 1.3
diff -u -p -u -r1.3 Makefile
--- sbin/ipfs/Makefile 26 Mar 2002 10:09:09 -0000 1.3
+++ sbin/ipfs/Makefile 27 Mar 2002 10:40:41 -0000
@@ -6,9 +6,7 @@ PROG= ipfs
MAN= ipfs.8
SRCS= ipfs.c
CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\"
-CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter
-CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
WARNS= 0
MAINTAINER= [EMAIL PROTECTED]
Index: sbin/ipfstat/Makefile
===================================================================
RCS file: /home/ncvs/src/sbin/ipfstat/Makefile,v
retrieving revision 1.17
diff -u -p -u -r1.17 Makefile
--- sbin/ipfstat/Makefile 19 Mar 2002 22:51:53 -0000 1.17
+++ sbin/ipfstat/Makefile 27 Mar 2002 10:40:41 -0000
@@ -6,9 +6,7 @@ PROG= ipfstat
MAN= ipfstat.8
SRCS= fils.c parse.c opt.c kmem.c facpri.c common.c printstate.c
CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DSTATETOP
-CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter
-CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
WARNS= 0
DPADD= ${LIBNCURSES} ${LIBKVM}
Index: sbin/ipmon/Makefile
===================================================================
RCS file: /home/ncvs/src/sbin/ipmon/Makefile,v
retrieving revision 1.11
diff -u -p -u -r1.11 Makefile
--- sbin/ipmon/Makefile 20 Mar 2002 09:04:34 -0000 1.11
+++ sbin/ipmon/Makefile 27 Mar 2002 10:40:41 -0000
@@ -8,7 +8,6 @@ SRCS= ipmon.c
CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\"
CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter
-CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
WARNS= 0
MAINTAINER= [EMAIL PROTECTED]
Index: sbin/ipnat/Makefile
===================================================================
RCS file: /home/ncvs/src/sbin/ipnat/Makefile,v
retrieving revision 1.14
diff -u -p -u -r1.14 Makefile
--- sbin/ipnat/Makefile 20 Mar 2002 09:01:48 -0000 1.14
+++ sbin/ipnat/Makefile 27 Mar 2002 10:40:41 -0000
@@ -7,9 +7,7 @@ MAN= ipnat.1 ipnat.4 ipnat.5
MLINKS= ipnat.5 ipnat.conf.5
SRCS= ipnat.c kmem.c natparse.c common.c printnat.c
CFLAGS+=-DUSE_INET6 -DIPL_NAME=\"/dev/ipl\"
-CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter/netinet
CFLAGS+=-I${.CURDIR}/../../sys/contrib/ipfilter
-CFLAGS+=-I${.CURDIR}/../../contrib/ipfilter
WARNS= 0
DPADD= ${LIBKVM}
Index: usr.sbin/ipftest/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ipftest/Makefile,v
retrieving revision 1.12
diff -u -p -u -r1.12 Makefile
--- usr.sbin/ipftest/Makefile 20 Mar 2002 08:57:10 -0000 1.12
+++ usr.sbin/ipftest/Makefile 27 Mar 2002 10:40:41 -0000
@@ -12,7 +12,6 @@ SRCS= ipt.c parse.c fil.c ipft_sn.c ipft
printstate.c printnat.c
CFLAGS+= -DUSE_INET6 -DIPL_NAME=\"/dev/ipl\" -DIPFILTER_LOG
-CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter/netinet
CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter
CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter
Index: usr.sbin/ipresend/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ipresend/Makefile,v
retrieving revision 1.10
diff -u -p -u -r1.10 Makefile
--- usr.sbin/ipresend/Makefile 20 Jul 2001 06:19:51 -0000 1.10
+++ usr.sbin/ipresend/Makefile 27 Mar 2002 10:40:41 -0000
@@ -10,8 +10,7 @@ SRCS= ipresend.c ip.c resend.c opt.c ipf
ipft_tx.c sbpf.c 44arp.c ipft_pc.c
CFLAGS+= -DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6
-CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter/netinet
-CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter/ipsend \
- -I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter
+CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter
.include <bsd.prog.mk>
Index: usr.sbin/ipsend/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/ipsend/Makefile,v
retrieving revision 1.14
diff -u -p -u -r1.14 Makefile
--- usr.sbin/ipsend/Makefile 20 Jul 2001 06:19:51 -0000 1.14
+++ usr.sbin/ipsend/Makefile 27 Mar 2002 10:40:41 -0000
@@ -12,9 +12,8 @@ SRCS= ipsend.c ip.c ipsopt.c sbpf.c sock
y.tab.h
CFLAGS+= -DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6
-CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter/netinet
+CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter
CFLAGS+= -I. -I${.CURDIR}/../../contrib/ipfilter/ipsend \
- -I${.CURDIR}/../../contrib/ipfilter/iplang \
-I${.CURDIR}/../../contrib/ipfilter
DPADD= ${LIBL}
Index: usr.sbin/iptest/Makefile
===================================================================
RCS file: /home/ncvs/src/usr.sbin/iptest/Makefile,v
retrieving revision 1.10
diff -u -p -u -r1.10 Makefile
--- usr.sbin/iptest/Makefile 20 Jul 2001 06:19:51 -0000 1.10
+++ usr.sbin/iptest/Makefile 27 Mar 2002 10:40:41 -0000
@@ -9,8 +9,7 @@ PROG= iptest
SRCS= iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c
CFLAGS+= -DDOSOCKET -DIPL_NAME=\"/dev/ipl\" -DUSE_INET6
-CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter/netinet
-CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter/ipsend \
- -I${.CURDIR}/../../contrib/ipfilter
+CFLAGS+= -I${.CURDIR}/../../sys/contrib/ipfilter
+CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter
.include <bsd.prog.mk>
