summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorjoerg <joerg@FreeBSD.org>1997-11-05 20:17:23 +0000
committerjoerg <joerg@FreeBSD.org>1997-11-05 20:17:23 +0000
commit0bc9255aaad71db6321c5ff6bcc2dea8ada0b3a6 (patch)
treec961732fc66e9c63bbe8c8d01df2ed5c38003426 /sys
parent81b353e477784f72590cd6a3e632045fa9c0e95d (diff)
downloadFreeBSD-src-0bc9255aaad71db6321c5ff6bcc2dea8ada0b3a6.zip
FreeBSD-src-0bc9255aaad71db6321c5ff6bcc2dea8ada0b3a6.tar.gz
Make IPDIVERT a supported option. Alas, in_var.h depends on it, i
hope i've found out all files that actually depend on this dependancy. IMHO, it's not very good practice to change the size of internal structs depending on kernel options.
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/options3
-rw-r--r--sys/netinet/in_proto.c4
-rw-r--r--sys/netinet/ip_fw.c3
-rw-r--r--sys/netinet/ip_input.c3
-rw-r--r--sys/netinet/ip_output.c4
5 files changed, 12 insertions, 5 deletions
diff --git a/sys/conf/options b/sys/conf/options
index ef25076..e89580c 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $Id: options,v 1.35 1997/09/22 21:23:57 joerg Exp $
+# $Id: options,v 1.36 1997/10/18 01:15:32 peter Exp $
# Format:
# Option name filename
@@ -96,6 +96,7 @@ OPEN_MAX opt_defunct.h
ARP_PROXYALL opt_defunct.h
GATEWAY opt_defunct.h
MROUTING opt_mrouting.h
+IPDIVERT
IPFIREWALL opt_ipfw.h
IPFIREWALL_VERBOSE opt_ipfw.h
IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index 9356624..a96fa67 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -31,9 +31,11 @@
* SUCH DAMAGE.
*
* @(#)in_proto.c 8.2 (Berkeley) 2/9/95
- * $Id: in_proto.c,v 1.42 1997/09/16 18:36:04 joerg Exp $
+ * $Id: in_proto.c,v 1.43 1997/10/28 15:58:43 bde Exp $
*/
+#include "opt_ipdivert.h"
+
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/socket.h>
diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c
index 2151820..c343238 100644
--- a/sys/netinet/ip_fw.c
+++ b/sys/netinet/ip_fw.c
@@ -12,7 +12,7 @@
*
* This software is provided ``AS IS'' without any warranties of any kind.
*
- * $Id: ip_fw.c,v 1.63 1997/09/10 03:07:14 peter Exp $
+ * $Id: ip_fw.c,v 1.64 1997/10/12 20:25:25 phk Exp $
*/
/*
@@ -21,6 +21,7 @@
#ifndef IPFIREWALL_MODULE
#include "opt_ipfw.h"
+#include "opt_ipdivert.h"
#endif
#include <sys/param.h>
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 3929e4d..c395d9e 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,13 +31,14 @@
* SUCH DAMAGE.
*
* @(#)ip_input.c 8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.69 1997/10/28 18:55:21 guido Exp $
+ * $Id: ip_input.c,v 1.70 1997/11/05 02:51:32 julian Exp $
* $ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
*/
#define _IP_VHL
#include "opt_ipfw.h"
+#include "opt_ipdivert.h"
#include <stddef.h>
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index ef996c2..8c3d0f1 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,11 +31,13 @@
* SUCH DAMAGE.
*
* @(#)ip_output.c 8.3 (Berkeley) 1/21/94
- * $Id: ip_output.c,v 1.59 1997/10/11 18:31:32 phk Exp $
+ * $Id: ip_output.c,v 1.60 1997/10/12 20:25:26 phk Exp $
*/
#define _IP_VHL
+#include "opt_ipdivert.h"
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
OpenPOWER on IntegriCloud