diff options
| author | peter <peter@FreeBSD.org> | 1999-04-20 13:32:06 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-04-20 13:32:06 +0000 |
| commit | f9bc841320c631b24281c6561466509a4771b0f0 (patch) | |
| tree | cf383e55c2da8227f5f29a904f4e3686a7cf73c5 /sys/netinet/raw_ip.c | |
| parent | 5bfc6b1d275f04b0232db26413bbd022a3b535bd (diff) | |
| download | FreeBSD-src-f9bc841320c631b24281c6561466509a4771b0f0.zip FreeBSD-src-f9bc841320c631b24281c6561466509a4771b0f0.tar.gz | |
Tidy up some stray / unused stuff in the IPFW package and friends.
- unifdef -DCOMPAT_IPFW (this was on by default already)
- remove traces of in-kernel ip_nat package, it was never committed.
- Make IPFW and DUMMYNET initialize themselves rather than depend on
compiled-in hooks in ip_init(). This means they initialize the same
way both in-kernel and as kld modules. (IPFW initializes now :-)
Diffstat (limited to 'sys/netinet/raw_ip.c')
| -rw-r--r-- | sys/netinet/raw_ip.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index 1dd3618..57da1d3 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.55 1998/08/23 03:07:14 wollman Exp $ + * $Id: raw_ip.c,v 1.56 1998/12/14 18:09:13 luigi Exp $ */ #include <sys/param.h> @@ -65,12 +65,6 @@ #ifdef DUMMYNET #include <netinet/ip_dummynet.h> #endif -#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; @@ -249,7 +243,6 @@ rip_ctloutput(so, sopt) error = sooptcopyout(sopt, &optval, sizeof optval); break; -#ifdef COMPAT_IPFW case IP_FW_GET: if (ip_fw_ctl_ptr == 0) error = ENOPROTOOPT; @@ -257,12 +250,6 @@ rip_ctloutput(so, sopt) error = ip_fw_ctl_ptr(sopt); break; - case IP_NAT: - if (ip_nat_ctl_ptr == 0) - error = ENOPROTOOPT; - else - error = ip_nat_ctl_ptr(sopt); - break; #ifdef DUMMYNET case IP_DUMMYNET_GET: if (ip_dn_ctl_ptr == NULL) @@ -271,7 +258,6 @@ rip_ctloutput(so, sopt) error = ip_dn_ctl_ptr(sopt); break ; #endif /* DUMMYNET */ -#endif /* COMPAT_IPFW */ case MRT_INIT: case MRT_DONE: @@ -303,7 +289,6 @@ rip_ctloutput(so, sopt) inp->inp_flags &= ~INP_HDRINCL; break; -#ifdef COMPAT_IPFW case IP_FW_ADD: case IP_FW_DEL: case IP_FW_FLUSH: @@ -314,12 +299,6 @@ rip_ctloutput(so, sopt) error = ip_fw_ctl_ptr(sopt); break; - case IP_NAT: - if (ip_nat_ctl_ptr == 0) - error = ENOPROTOOPT; - else - error = ip_nat_ctl_ptr(sopt); - break; #ifdef DUMMYNET case IP_DUMMYNET_CONFIGURE: case IP_DUMMYNET_DEL: @@ -330,7 +309,6 @@ rip_ctloutput(so, sopt) error = ip_dn_ctl_ptr(sopt); break ; #endif -#endif /* COMPAT_IPFW */ case IP_RSVP_ON: error = ip_rsvp_init(so); |
