diff options
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/bridgestp.c | 7 | ||||
| -rw-r--r-- | sys/net/if.c | 13 | ||||
| -rw-r--r-- | sys/net/if_bridge.c | 8 |
3 files changed, 6 insertions, 22 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index 89dd6a352a7..f84e8f5016b 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bridgestp.c,v 1.5 2001/03/22 03:48:29 jason Exp $ */ +/* $OpenBSD: bridgestp.c,v 1.6 2001/05/30 02:12:23 deraadt Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -63,11 +63,6 @@ #include <netinet/in_var.h> #include <netinet/ip.h> #include <netinet/if_ether.h> - -#ifdef IPFILTER -#include <netinet/ip_fil_compat.h> -#include <netinet/ip_fil.h> -#endif #endif #if NBPFILTER > 0 diff --git a/sys/net/if.c b/sys/net/if.c index 578e8dcf327..71d2c36572c 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if.c,v 1.43 2001/02/20 13:50:53 itojun Exp $ */ +/* $OpenBSD: if.c,v 1.44 2001/05/30 02:12:24 deraadt Exp $ */ /* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */ /* @@ -103,12 +103,6 @@ #include <netinet6/in6_var.h> #endif -#ifdef IPFILTER -#include <netinet/ip_fil_compat.h> -#include <netinet/ip_fil.h> -#include <netinet/ip_nat.h> -#endif - #if NBPFILTER > 0 #include <net/bpf.h> #endif @@ -381,11 +375,6 @@ if_detach(ifp) /* Remove the interface from the list of all interfaces. */ TAILQ_REMOVE(&ifnet, ifp, if_list); -#ifdef IPFILTER - /* XXX More ipf & ipnat cleanup needed. */ - nat_clearlist(); -#endif - /* Deallocate private resources. */ for (ifa = TAILQ_FIRST(&ifp->if_addrlist); ifa; ifa = TAILQ_FIRST(&ifp->if_addrlist)) { diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index dc2fe6c6511..f6599495097 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.55 2001/05/11 04:56:15 jason Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.56 2001/05/30 02:12:24 deraadt Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -141,7 +141,7 @@ u_int8_t bridge_filterrule __P((struct brl_head *, struct ether_header *)); (a)->ether_addr_octet[2] == 0x5e) -#if defined(INET) && (defined(IPFILTER) || defined(IPFILTER_LKM)) +#if defined(INET) && defined(IPFILTER) /* * Filter hooks */ @@ -1002,7 +1002,7 @@ bridgeintr_frame(sc, m) return; } -#if defined(INET) && (defined(IPFILTER) || defined(IPFILTER_LKM)) +#if defined(INET) && defined(IPFILTER) m = bridge_filter(sc, src_if, &eh, m); if (m == NULL) return; @@ -1847,7 +1847,7 @@ bridge_flushrule(bif) return (0); } -#if defined(INET) && (defined(IPFILTER) || defined(IPFILTER_LKM)) +#if defined(INET) && defined(IPFILTER) /* * Filter IP packets by peeking into the ethernet frame. This violates |