d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change IP Filter hooks to match new 3.1.8 patches for FreeBSD

Browse Source
This commit is contained in:
Darren Reed 1997-02-19 14:02:27 +00:00
parent 655c4c9dab
commit f1743588c7
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/netinet/ip_input.c
View File

@ -348,16 +348,17 @@ ip_input(struct mbuf *m)
#endif
#if defined(IPFILTER) || defined(IPFILTER_LKM)
{
struct mbuf *m0 = m;
/*
* Check if we want to allow this packet to be processed.
* Consider it to be bad if not.
*/
if (fr_checkp && (*fr_checkp)(ip, hlen, m->m_pkthdr.rcvif, 0, &m0))
goto next;
ip = mtod(m = m0, struct ip *);
}
if (fr_check) {
struct mbuf *m1 = m;
if ((*fr_checkp)(ip, hlen, m->m_pkthdr.rcvif, 0, &m1) || !m1)
goto next;
ip = mtod(m = m1, struct ip *);
}
#endif
/*

18
sys/netinet/ip_output.c
View File

@ -337,21 +337,21 @@ ip_output(m0, opt, ro, flags, imo)
m->m_flags &= ~M_BCAST;
}
sendit:
#if defined(IPFILTER) || defined(IPFILTER_LKM)
{
struct mbuf *m0 = m;
/*
* looks like most checking has been done now...do a filter check
*/
if (fr_checkp && (*fr_checkp)(ip, hlen, ifp, 1, &m0))
{
error = EHOSTUNREACH;
goto done;
if (fr_checkp) {
struct mbuf *m1 = m;
if ((*fr_checkp)(ip, hlen, ifp, 1, &m1))
error = EHOSTUNREACH;
if (error || !m1)
goto done;
ip = mtod(m = m1, struct ip *);
}
ip = mtod(m = m0, struct ip *);
}
#endif
sendit:
/*
* IpHack's section.
* - Xlate: translate packet's addr/port (NAT).