diff options
| author | wollman <wollman@FreeBSD.org> | 1996-05-22 17:23:09 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1996-05-22 17:23:09 +0000 |
| commit | 1ef953a26951c7ee5884ef7f7d97e26347e43e1a (patch) | |
| tree | 50abd834e2c6e48d4b0ef4e379823254fac36c72 /sys/netinet/raw_ip.c | |
| parent | 7a59b55013c5ede2b25108913910ef62554839b9 (diff) | |
| download | FreeBSD-src-1ef953a26951c7ee5884ef7f7d97e26347e43e1a.zip FreeBSD-src-1ef953a26951c7ee5884ef7f7d97e26347e43e1a.tar.gz | |
Conditionalize calls to IPFW code on COMPAT_IPFW. This is done slightly
unconventionally:
If COMPAT_IPFW is not defined, or if it is defined to 1, enable;
otherwise, disable.
This means that these changes actually have no effect on anyone at the
moment. (It just makes it easier for me to keep my code in sync.)
In the future, the `not defined' part of the hack should be eliminated,
but doing this now would require everyone to change their config files.
The same conditionals need to be made in ip_input.c as well for this to
ave any useful effect, but I'm not ready to do that right now.
Diffstat (limited to 'sys/netinet/raw_ip.c')
| -rw-r--r-- | sys/netinet/raw_ip.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 3aed00b..4f87951 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 - * $Id: raw_ip.c,v 1.29 1996/03/13 08:02:45 pst Exp $ + * $Id: raw_ip.c,v 1.30 1996/03/26 19:16:46 fenner Exp $ */ #include <sys/param.h> @@ -57,6 +57,13 @@ #include <netinet/ip_fw.h> +#if !defined(COMPAT_IPFW) || COMPAT_IPFW == 1 +#undef COMPAT_IPFW +#define COMPAT_IPFW 1 +#else +#undef COMPAT_IPFW +#endif + static struct inpcbhead ripcb; static struct inpcbinfo ripcbinfo; @@ -224,6 +231,7 @@ rip_ctloutput(op, so, level, optname, m) } return (error); +#ifdef COMPAT_IPFW case IP_FW_GET: if (ip_fw_ctl_ptr==NULL || op == PRCO_SETOPT) { if (*m) (void)m_free(*m); @@ -241,6 +249,7 @@ rip_ctloutput(op, so, level, optname, m) return (*ip_fw_ctl_ptr)(optname, m); return(error); +#endif case IP_RSVP_ON: return ip_rsvp_init(so); |
