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

Return PFIL_CONSUMED if packet was consumed. While here gather all

Browse Source 
the identical endings of pf_check_*() into single function.

PR:		235411
This commit is contained in:
Gleb Smirnoff 2019-02-02 05:49:05 +00:00
parent d49fc192c1
commit d38ca3297c
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sys/netpfil/pf/pf_ioctl.c
View File

@ -4002,6 +4002,26 @@ shutdown_pf(void)
return (error);
}
static pfil_return_t
pf_check_return(int chk, struct mbuf **m)
{
switch (chk) {
case PF_PASS:
if (*m == NULL)
return (PFIL_CONSUMED);
else
return (PFIL_PASS);
break;
default:
if (*m != NULL) {
m_freem(*m);
*m = NULL;
}
return (PFIL_DROPPED);
}
}
#ifdef INET
static pfil_return_t
pf_check_in(struct mbuf **m, struct ifnet *ifp, int flags,
@ -4010,12 +4030,8 @@ pf_check_in(struct mbuf **m, struct ifnet *ifp, int flags,
int chk;
chk = pf_test(PF_IN, flags, ifp, m, inp);
if (chk && *m) {
m_freem(*m);
*m = NULL;
}
return (chk == PF_PASS ? PFIL_PASS : PFIL_DROPPED);
return (pf_check_return(chk, m));
}
static pfil_return_t
@ -4025,12 +4041,8 @@ pf_check_out(struct mbuf **m, struct ifnet *ifp, int flags,
int chk;
chk = pf_test(PF_OUT, flags, ifp, m, inp);
if (chk && *m) {
m_freem(*m);
*m = NULL;
}
return (chk == PF_PASS ? PFIL_PASS : PFIL_DROPPED);
return (pf_check_return(chk, m));
}
#endif
@ -4049,12 +4061,8 @@ pf_check6_in(struct mbuf **m, struct ifnet *ifp, int flags,
CURVNET_SET(ifp->if_vnet);
chk = pf_test6(PF_IN, flags, (*m)->m_flags & M_LOOP ? V_loif : ifp, m, inp);
CURVNET_RESTORE();
if (chk && *m) {
m_freem(*m);
*m = NULL;
}
return (chk == PF_PASS ? PFIL_PASS : PFIL_DROPPED);
return (pf_check_return(chk, m));
}
static pfil_return_t
@ -4066,12 +4074,8 @@ pf_check6_out(struct mbuf **m, struct ifnet *ifp, int flags,
CURVNET_SET(ifp->if_vnet);
chk = pf_test6(PF_OUT, flags, ifp, m, inp);
CURVNET_RESTORE();
if (chk && *m) {
m_freem(*m);
*m = NULL;
}
return (chk == PF_PASS ? PFIL_PASS : PFIL_DROPPED);
return (pf_check_return(chk, m));
}
#endif /* INET6 */