Page MenuHomeFreeBSD
Files F107290402

D46593.diff
No OneTemporary
Actions

D46593.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
@@ -2641,10 +2641,10 @@
int pf_normalize_mss(struct mbuf *m, int off,
struct pf_pdesc *pd);
#ifdef INET
-void pf_scrub_ip(struct mbuf **, struct pf_pdesc *);
+void pf_scrub_ip(struct mbuf *, struct pf_pdesc *);
#endif /* INET */
#ifdef INET6
-void pf_scrub_ip6(struct mbuf **, struct pf_pdesc *);
+void pf_scrub_ip6(struct mbuf *, struct pf_pdesc *);
#endif /* INET6 */
struct pfi_kkif *pf_kkif_create(int);
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
@@ -9221,7 +9221,7 @@
REASON_SET(&reason, PFRES_MEMORY);
}
- pf_scrub_ip(&m, &pd);
+ pf_scrub_ip(m, &pd);
if (pd.proto == IPPROTO_TCP && pd.act.max_mss)
pf_normalize_mss(m, off, &pd);
@@ -9676,7 +9676,7 @@
REASON_SET(&reason, PFRES_MEMORY);
}
- pf_scrub_ip6(&m, &pd);
+ pf_scrub_ip6(m, &pd);
if (pd.proto == IPPROTO_TCP && pd.act.max_mss)
pf_normalize_mss(m, off, &pd);
diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c
--- a/sys/netpfil/pf/pf_norm.c
+++ b/sys/netpfil/pf/pf_norm.c
@@ -2269,9 +2269,8 @@
#ifdef INET
void
-pf_scrub_ip(struct mbuf **m0, struct pf_pdesc *pd)
+pf_scrub_ip(struct mbuf *m, struct pf_pdesc *pd)
{
- struct mbuf *m = *m0;
struct ip *h = mtod(m, struct ip *);
/* Clear IP_DF if no-df was requested */
@@ -2313,9 +2312,8 @@
#ifdef INET6
void
-pf_scrub_ip6(struct mbuf **m0, struct pf_pdesc *pd)
+pf_scrub_ip6(struct mbuf *m, struct pf_pdesc *pd)
{
- struct mbuf *m = *m0;
struct ip6_hdr *h = mtod(m, struct ip6_hdr *);
/* Enforce a minimum ttl, may cause endless packet loops */

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 13, 1:47 AM (20 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15774757
Default Alt Text
D46593.diff (1 KB)

Event Timeline