Page MenuHomeFreeBSD
Files F156497923

D51799.id.diff
No OneTemporary
Actions

D51799.id.diff
View Options

diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -2449,8 +2449,7 @@
int pf_test_eth(int, int, struct ifnet *, struct mbuf **, struct inpcb *);
int pf_scan_sctp(struct pf_pdesc *);
#if defined(INET) || defined(INET6)
-int pf_test(sa_family_t, int, int, struct ifnet *, struct mbuf **, struct inpcb *,
- struct pf_rule_actions *);
+int pf_test(sa_family_t, int, int, struct ifnet *, struct mbuf **, struct inpcb *);
#endif
#ifdef INET
int pf_normalize_ip(u_short *, struct pf_pdesc *);
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -10220,8 +10220,7 @@
static int
pf_setup_pdesc(sa_family_t af, int dir, struct pf_pdesc *pd, struct mbuf **m0,
- u_short *action, u_short *reason, struct pfi_kkif *kif,
- struct pf_rule_actions *default_actions)
+ u_short *action, u_short *reason, struct pfi_kkif *kif)
{
pd->dir = dir;
pd->kif = kif;
@@ -10637,7 +10636,7 @@
#if defined(INET) || defined(INET6)
int
pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0,
- struct inpcb *inp, struct pf_rule_actions *default_actions)
+ struct inpcb *inp)
{
struct pfi_kkif *kif;
u_short action, reason = 0;
@@ -10712,8 +10711,7 @@
PF_RULES_RLOCK();
- if (pf_setup_pdesc(af, dir, &pd, m0, &action, &reason,
- kif, default_actions) == -1) {
+ if (pf_setup_pdesc(af, dir, &pd, m0, &action, &reason, kif) == -1) {
if (action != PF_PASS)
pd.act.log |= PF_LOG_FORCE;
goto done;
@@ -10816,8 +10814,7 @@
break;
}
- action = pf_test(af, dir, pflags, ifp, &msyn, inp,
- &pd.act);
+ action = pf_test(af, dir, pflags, ifp, &msyn, inp);
m_freem(msyn);
if (action != PF_PASS)
break;
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -6615,7 +6615,7 @@
CURVNET_ASSERT_SET();
- chk = pf_test(AF_INET, PF_IN, flags, ifp, m, inp, NULL);
+ chk = pf_test(AF_INET, PF_IN, flags, ifp, m, inp);
return (pf_check_return(chk, m));
}
@@ -6628,7 +6628,7 @@
CURVNET_ASSERT_SET();
- chk = pf_test(AF_INET, PF_OUT, flags, ifp, m, inp, NULL);
+ chk = pf_test(AF_INET, PF_OUT, flags, ifp, m, inp);
return (pf_check_return(chk, m));
}
@@ -6649,7 +6649,7 @@
* filtering we have change this to lo0 as it is the case in IPv4.
*/
chk = pf_test(AF_INET6, PF_IN, flags, (*m)->m_flags & M_LOOP ? V_loif : ifp,
- m, inp, NULL);
+ m, inp);
return (pf_check_return(chk, m));
}
@@ -6662,7 +6662,7 @@
CURVNET_ASSERT_SET();
- chk = pf_test(AF_INET6, PF_OUT, flags, ifp, m, inp, NULL);
+ chk = pf_test(AF_INET6, PF_OUT, flags, ifp, m, inp);
return (pf_check_return(chk, m));
}

File Metadata

Mime Type
text/plain
Expires
Fri, May 15, 3:40 AM (7 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33071971
Default Alt Text
D51799.id.diff (2 KB)

Event Timeline