upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-13 10:40:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pf: Cut down on if statements around pf_icmp_state_lookup

Browse source 
Checked with blambert@, OK millert, henning

Obtained from:	OpenBSD, mikeb <mikeb@openbsd.org>, 12e5d1443d
Sponsored by:	Rubicon Communications, LLC ("Netgate")
This commit is contained in:
Kristof Provost 2025-02-21 11:52:26 +01:00
parent 5dad98d562
commit dbbcbaae1d
1 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
sys/netpfil/pf/pf.c
View file

@ -7659,19 +7659,16 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd,
*/
ret = pf_icmp_state_lookup(&key, pd, state, virtual_id,
virtual_type, icmp_dir, &iidx, 0, 0);
/* IPv6? try matching a multicast address */
if (ret == PF_DROP && pd->af == AF_INET6 && icmp_dir == PF_OUT) {
MPASS(*state == NULL);
ret = pf_icmp_state_lookup(&key, pd, state,
virtual_id, virtual_type,
icmp_dir, &iidx, 1, 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,
virtual_id, virtual_type,
icmp_dir, &iidx, 1, 0);
if (ret >= 0) {
MPASS(*state == NULL);
return (ret);
}
} else
return (ret);
return (ret);
}
(*state)->expire = pf_get_uptime();
@ -8422,19 +8419,17 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd,
ret = pf_icmp_state_lookup(&key, &pd2, state,
virtual_id, virtual_type, icmp_dir, &iidx, 0, 1);
/* IPv6? try matching a multicast address */
if (ret == PF_DROP && pd2.af == AF_INET6 &&
icmp_dir == PF_OUT) {
MPASS(*state == NULL);
ret = pf_icmp_state_lookup(&key, &pd2,
state, virtual_id, virtual_type,
icmp_dir, &iidx, 1, 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, virtual_id, virtual_type,
icmp_dir, &iidx, 1, 1);
if (ret >= 0) {
MPASS(*state == NULL);
return (ret);
}
} else
return (ret);
return (ret);
}
/* translate source/destination address, if necessary */