mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-30 21:54:50 +00:00
Remove option IPFILTER_KLD. In case you wanted to kldload ipfilter,
the module would only work in kernels built with this option. Approved by: jkh
This commit is contained in:
parent
7830d3c3a1
commit
6d37c73e26
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=57401
|
@ -180,9 +180,7 @@ int fw_enable = 1 ;
|
|||
ip_dn_ctl_t *ip_dn_ctl_ptr;
|
||||
#endif
|
||||
|
||||
#if defined(IPFILTER_LKM) || defined(IPFILTER)
|
||||
int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **)) = NULL;
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
|
@ -380,7 +378,6 @@ ip_input(struct mbuf *m)
|
|||
#if defined(IPFIREWALL) && defined(DUMMYNET)
|
||||
iphack:
|
||||
#endif
|
||||
#if defined(IPFILTER) || defined(IPFILTER_LKM)
|
||||
/*
|
||||
* Check if we want to allow this packet to be processed.
|
||||
* Consider it to be bad if not.
|
||||
|
@ -392,7 +389,6 @@ ip_input(struct mbuf *m)
|
|||
return;
|
||||
ip = mtod(m = m1, struct ip *);
|
||||
}
|
||||
#endif
|
||||
if (fw_enable && ip_fw_chk_ptr) {
|
||||
#ifdef IPFIREWALL_FORWARD
|
||||
/*
|
||||
|
|
|
@ -105,12 +105,8 @@ static int ip_pcbopts __P((int, struct mbuf **, struct mbuf *));
|
|||
static int ip_setmoptions
|
||||
__P((struct sockopt *, struct ip_moptions **));
|
||||
|
||||
#if defined(IPFILTER_LKM) || defined(IPFILTER)
|
||||
int ip_optcopy __P((struct ip *, struct ip *));
|
||||
extern int (*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **));
|
||||
#else
|
||||
static int ip_optcopy __P((struct ip *, struct ip *));
|
||||
#endif
|
||||
|
||||
|
||||
extern struct protosw inetsw[];
|
||||
|
@ -449,7 +445,6 @@ ip_output(m0, opt, ro, flags, imo)
|
|||
* - Wrap: fake packet's addr/port <unimpl.>
|
||||
* - Encapsulate: put it in another IP and send out. <unimp.>
|
||||
*/
|
||||
#if defined(IPFILTER) || defined(IPFILTER_LKM)
|
||||
if (fr_checkp) {
|
||||
struct mbuf *m1 = m;
|
||||
|
||||
|
@ -457,7 +452,6 @@ ip_output(m0, opt, ro, flags, imo)
|
|||
goto done;
|
||||
ip = mtod(m = m1, struct ip *);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Check with the firewall...
|
||||
|
@ -958,9 +952,6 @@ ip_insertoptions(m, opt, phlen)
|
|||
* Copy options from ip to jp,
|
||||
* omitting those not copied during fragmentation.
|
||||
*/
|
||||
#if !defined(IPFILTER) && !defined(IPFILTER_LKM)
|
||||
static
|
||||
#endif
|
||||
int
|
||||
ip_optcopy(ip, jp)
|
||||
struct ip *ip, *jp;
|
||||
|
|
Loading…
Reference in a new issue