Date: Fri, 21 Feb 2025 12:43:21 GMT From: Kristof Provost <kp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 5dad98d56282 - main - pf: remove redundant argument from pf_icmp_state_lookup() Message-ID: <202502211243.51LChLpG082968@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5dad98d56282d5ea752375dbdfb1d4a57ec5ae23 commit 5dad98d56282d5ea752375dbdfb1d4a57ec5ae23 Author: Kristof Provost <kp@FreeBSD.org> AuthorDate: 2025-02-21 10:38:33 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2025-02-21 10:38:33 +0000 pf: remove redundant argument from pf_icmp_state_lookup() We already pass struct pf_pdesc to pf_icmp_state_lookup(). There's no need to also pass the direction. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index f9715cd18166..610e65026c28 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -358,8 +358,7 @@ static int pf_test_state(struct pf_kstate **, struct pf_pdesc *, u_short *); int pf_icmp_state_lookup(struct pf_state_key_cmp *, struct pf_pdesc *, struct pf_kstate **, - int, u_int16_t, u_int16_t, - int, int *, int, int); + u_int16_t, u_int16_t, int, int *, int, int); static int pf_test_state_icmp(struct pf_kstate **, struct pf_pdesc *, u_short *); static int pf_sctp_track(struct pf_kstate *, struct pf_pdesc *, @@ -7568,10 +7567,11 @@ pf_multihome_scan_asconf(int start, int len, struct pf_pdesc *pd) int pf_icmp_state_lookup(struct pf_state_key_cmp *key, struct pf_pdesc *pd, - struct pf_kstate **state, int direction, - u_int16_t icmpid, u_int16_t type, int icmp_dir, + struct pf_kstate **state, u_int16_t icmpid, u_int16_t type, int icmp_dir, int *iidx, int multi, int inner) { + int direction = pd->dir; + key->af = pd->af; key->proto = pd->proto; if (icmp_dir == PF_IN) { @@ -7657,15 +7657,14 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, * ICMP query/reply message not related to a TCP/UDP/SCTP * packet. Search for an ICMP state. */ - ret = pf_icmp_state_lookup(&key, pd, state, pd->dir, - virtual_id, virtual_type, icmp_dir, &iidx, - 0, 0); + ret = pf_icmp_state_lookup(&key, pd, state, virtual_id, + virtual_type, icmp_dir, &iidx, 0, 0); if (ret >= 0) { MPASS(*state == NULL); if (ret == PF_DROP && pd->af == AF_INET6 && icmp_dir == PF_OUT) { ret = pf_icmp_state_lookup(&key, pd, state, - pd->dir, virtual_id, virtual_type, + virtual_id, virtual_type, icmp_dir, &iidx, 1, 0); if (ret >= 0) { MPASS(*state == NULL); @@ -8318,8 +8317,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, &icmp_dir, &virtual_id, &virtual_type); ret = pf_icmp_state_lookup(&key, &pd2, state, - pd2.dir, virtual_id, virtual_type, - icmp_dir, &iidx, 0, 1); + virtual_id, virtual_type, icmp_dir, &iidx, 0, 1); if (ret >= 0) { MPASS(*state == NULL); return (ret); @@ -8423,15 +8421,13 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, &icmp_dir, &virtual_id, &virtual_type); ret = pf_icmp_state_lookup(&key, &pd2, state, - pd->dir, virtual_id, virtual_type, - icmp_dir, &iidx, 0, 1); + virtual_id, virtual_type, icmp_dir, &iidx, 0, 1); if (ret >= 0) { MPASS(*state == NULL); if (ret == PF_DROP && pd2.af == AF_INET6 && icmp_dir == PF_OUT) { ret = pf_icmp_state_lookup(&key, &pd2, - state, pd->dir, - virtual_id, virtual_type, + state, virtual_id, virtual_type, icmp_dir, &iidx, 1, 1); if (ret >= 0) { MPASS(*state == NULL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502211243.51LChLpG082968>