From 66e55756b5bd323c56281347591612906728fb45 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 20 Apr 1999 13:32:06 +0000
Subject: 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 :-)

---
 sys/netinet/raw_ip.c | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

(limited to 'sys/netinet/raw_ip.c')

diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index 1dd361822dd2..57da1d301c50 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);
-- 
cgit v1.2.3