<netinet/in.h> before <net/pfvar.h>

This commit is contained in:
naddy 2015-01-23 13:01:16 +00:00
parent d14cd26a88
commit 29704fbaad
12 changed files with 174 additions and 6 deletions

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-read_pcap_c,v 1.3 2015/01/23 13:01:16 naddy Exp $
--- read_pcap.c.orig Wed Mar 12 15:09:48 2003
+++ read_pcap.c Fri Jan 23 13:54:16 2015
@@ -36,9 +36,6 @@
#include <sys/socket.h>
#include <sys/queue.h>
#include <net/if.h>
-#ifdef __OpenBSD__
-#include <net/if_pflog.h>
-#endif
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/if_ether.h>
@@ -46,6 +43,9 @@
#include <netinet/udp.h>
#ifdef INET6
#include <netinet/ip6.h>
+#endif
+#ifdef __OpenBSD__
+#include <net/if_pflog.h>
#endif
#include <arpa/inet.h>
#include <stdio.h>

View File

@ -0,0 +1,16 @@
$OpenBSD: patch-cnupm_datalinks_c,v 1.1 2015/01/23 13:01:16 naddy Exp $
--- cnupm/datalinks.c.orig Fri Aug 12 13:58:59 2005
+++ cnupm/datalinks.c Fri Jan 23 13:29:44 2015
@@ -30,11 +30,11 @@
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#ifdef HAVE_PFLOG
#include <net/if.h>
#include <net/if_pflog.h>
#endif
-#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <pcap.h>

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-dnsfilter_h,v 1.1 2015/01/23 13:01:16 naddy Exp $
--- dnsfilter.h.orig Fri Jan 23 01:55:19 2015
+++ dnsfilter.h Fri Jan 23 13:14:24 2015
@@ -20,6 +20,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/uio.h>
+#include <netinet/in.h>
#include <net/if.h>
#include <net/pfvar.h>
#include <netinet/in.h>

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-pf_if_c,v 1.1 2015/01/23 13:01:16 naddy Exp $
--- pf_if.c.orig Sat Nov 10 15:07:43 2012
+++ pf_if.c Fri Jan 23 13:19:07 2015
@@ -18,12 +18,12 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>
-#include <net/pfvar.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/ip_var.h>
#include <netinet/udp.h>
+#include <net/pfvar.h>
#include <arpa/inet.h>
#include <err.h>
#include <fcntl.h>

View File

@ -1,6 +1,17 @@
$OpenBSD: patch-filter_c,v 1.2 2010/01/22 14:42:11 sthen Exp $
--- filter.c.orig Tue Oct 5 13:12:22 2004
+++ filter.c Mon Jan 18 13:57:49 2010
$OpenBSD: patch-filter_c,v 1.3 2015/01/23 13:01:16 naddy Exp $
--- filter.c.orig Tue Oct 5 14:12:22 2004
+++ filter.c Fri Jan 23 13:55:53 2015
@@ -19,9 +19,9 @@
#include <sys/socket.h>
#include <net/if.h>
-#include <net/pfvar.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
+#include <net/pfvar.h>
#include <arpa/inet.h>
#include <err.h>
@@ -34,7 +34,6 @@
#include "filter.h"

View File

@ -1,6 +1,19 @@
$OpenBSD: patch-ftpsesame_c,v 1.1 2015/01/16 19:29:02 sthen Exp $
--- ftpsesame.c.orig Fri Jan 16 19:28:21 2015
+++ ftpsesame.c Fri Jan 16 19:28:31 2015
$OpenBSD: patch-ftpsesame_c,v 1.2 2015/01/23 13:01:16 naddy Exp $
--- ftpsesame.c.orig Tue Oct 5 14:07:24 2004
+++ ftpsesame.c Fri Jan 23 13:58:08 2015
@@ -19,10 +19,10 @@
#include <sys/ioctl.h>
#include <net/if.h>
-#include <net/pfvar.h>
#include <net/ppp_defs.h>
-#include <netinet/if_ether.h>
#include <netinet/in.h>
+#include <net/pfvar.h>
+#include <netinet/if_ether.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
@@ -34,6 +34,7 @@
#include <errno.h>
#include <pcap.h>

View File

@ -0,0 +1,17 @@
$OpenBSD: patch-state_c,v 1.1 2015/01/23 13:01:16 naddy Exp $
--- state.c.orig Tue Oct 5 14:07:04 2004
+++ state.c Fri Jan 23 13:58:56 2015
@@ -19,12 +19,12 @@
#include <sys/tree.h>
#include <net/if.h>
-#include <net/pfvar.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <netinet/tcp_fsm.h>
+#include <net/pfvar.h>
#include <stdlib.h>
#include <string.h>

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_pf_c,v 1.1 2015/01/23 13:01:16 naddy Exp $
--- src/pf.c.orig Sun Jan 26 09:09:14 2014
+++ src/pf.c Fri Jan 23 13:22:31 2015
@@ -29,6 +29,7 @@
# include <net/if.h>
#endif
+#include <netinet/in.h>
#include <net/pfvar.h>
#ifndef FCNT_NAMES

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-parse_y,v 1.1 2015/01/23 13:01:16 naddy Exp $
--- parse.y.orig Thu Dec 18 23:03:05 2014
+++ parse.y Fri Jan 23 13:50:26 2015
@@ -31,9 +31,9 @@
#include <sys/queue.h>
#include <sys/ioctl.h>
+#include <netinet/in.h>
#include <net/if.h>
#include <net/pfvar.h>
-#include <netinet/in.h>
#include <arpa/inet.h>
#include <arpa/nameser.h>
#include <net/route.h>

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile,v 1.1 2015/01/23 13:01:16 naddy Exp $
--- Makefile.orig Sat Apr 14 08:26:17 2007
+++ Makefile Fri Jan 23 13:52:10 2015
@@ -6,7 +6,7 @@ SRCS= tabled.c pickup.c imsg.c buffer.c pftable.c soc
SUBDIR= tablec
-CFLAGS+= -Wall -I{.CURDIR}
+CFLAGS+= -Wall -I${.CURDIR}
YFLAGS= -d
LFLAGS= -olex.yy.c

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-pftable_c,v 1.1 2015/01/23 13:01:16 naddy Exp $
--- pftable.c.orig Mon Nov 13 13:07:35 2006
+++ pftable.c Fri Jan 23 13:46:37 2015
@@ -21,6 +21,7 @@
#include <sys/socket.h>
#include <sys/queue.h>
+#include <netinet/in.h>
#include <net/if.h>
#include <net/pfvar.h>

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-tablec_Makefile,v 1.1 2015/01/23 13:01:16 naddy Exp $
--- tablec/Makefile.orig Sat Apr 14 08:25:57 2007
+++ tablec/Makefile Fri Jan 23 13:52:15 2015
@@ -3,7 +3,7 @@
PROG= tablec
SRCS= tablec.c
-CFLAGS+= -Wall -I{.CURDIR}
+CFLAGS+= -Wall -I${.CURDIR}
LINTFLAGS+= -u