git: 9d38d2203b32 - main - pf: unused arguments at pf_normalize_tcp_init()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 09 Apr 2025 09:51:42 UTC
The branch main has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=9d38d2203b3281a8f5921c27cccd32186cbf9cee
commit 9d38d2203b3281a8f5921c27cccd32186cbf9cee
Author: Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2025-04-08 15:45:49 +0000
Commit: Kristof Provost <kp@FreeBSD.org>
CommitDate: 2025-04-09 08:18:20 +0000
pf: unused arguments at pf_normalize_tcp_init()
OK deraadt.
Obtained from: OpenBSD, sashan <sashan@openbsd.org>, eaed871b13
Sponsored by: Rubicon Communications, LLC ("Netgate")
---
sys/net/pfvar.h | 2 +-
sys/netpfil/pf/pf.c | 4 ++--
sys/netpfil/pf/pf_norm.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index c511d61d6cc1..74926581e247 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -2475,7 +2475,7 @@ void pf_normalize_cleanup(void);
int pf_normalize_tcp(struct pf_pdesc *);
void pf_normalize_tcp_cleanup(struct pf_kstate *);
int pf_normalize_tcp_init(struct pf_pdesc *,
- struct tcphdr *, struct pf_state_peer *, struct pf_state_peer *);
+ struct tcphdr *, struct pf_state_peer *);
int pf_normalize_tcp_stateful(struct pf_pdesc *,
u_short *, struct tcphdr *, struct pf_kstate *,
struct pf_state_peer *, struct pf_state_peer *, int *);
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index 5f5f2403e448..3d22b6750c34 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -6182,7 +6182,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a,
if (pd->proto == IPPROTO_TCP) {
if (s->state_flags & PFSTATE_SCRUB_TCP &&
- pf_normalize_tcp_init(pd, th, &s->src, &s->dst)) {
+ pf_normalize_tcp_init(pd, th, &s->src)) {
REASON_SET(&reason, PFRES_MEMORY);
goto csfailed;
}
@@ -6438,7 +6438,7 @@ pf_tcp_track_full(struct pf_kstate *state, struct pf_pdesc *pd,
if ((state->state_flags & PFSTATE_SCRUB_TCP || dst->scrub) &&
src->scrub == NULL) {
- if (pf_normalize_tcp_init(pd, th, src, dst)) {
+ if (pf_normalize_tcp_init(pd, th, src)) {
REASON_SET(reason, PFRES_MEMORY);
return (PF_DROP);
}
diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c
index be8ba939e5d9..382f876234da 100644
--- a/sys/netpfil/pf/pf_norm.c
+++ b/sys/netpfil/pf/pf_norm.c
@@ -1429,7 +1429,7 @@ pf_normalize_tcp(struct pf_pdesc *pd)
int
pf_normalize_tcp_init(struct pf_pdesc *pd, struct tcphdr *th,
- struct pf_state_peer *src, struct pf_state_peer *dst)
+ struct pf_state_peer *src)
{
u_int32_t tsval, tsecr;
u_int8_t hdr[60];