Page MenuHomeFreeBSD

pf: Use pf_map_addr() only once when choosing source port and address
ClosedPublic

Authored by vegeta_tuxpowered.net on Feb 3 2025, 7:13 PM.
Tags
None
Referenced Files
F115907390: D48821.diff
Wed, Apr 30, 6:47 AM
Unknown Object (File)
Sat, Apr 19, 8:53 PM
Unknown Object (File)
Sat, Apr 19, 7:19 AM
Unknown Object (File)
Sat, Apr 19, 5:52 AM
Unknown Object (File)
Thu, Apr 17, 9:30 PM
Unknown Object (File)
Thu, Apr 17, 6:25 PM
Unknown Object (File)
Thu, Apr 17, 5:42 PM
Unknown Object (File)
Thu, Apr 17, 3:50 PM

Details

Summary

When choosing source port and address for NAT operations the proper order of
operations is:

  1. Try to get them from udp_mapping if rule has PF_POOL_ENDPI. This might be enough to return.
  2. Get IP address from pf_map_addr_sn()
  3. Look for free ports for the IP address
  4. Get another IP address from pf_map_addr() if no ports are free

Calling pf_map_addr_sn() before checking udp_mappings is not necessary,
remove the first call. Since now a rule can have multiple pools, don't
hardcode pools anymore, always use the pool given in pf_get_sport() call.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

Approved too, but make sure to use your @FreeBSD.org e-mail address as author, otherwise the pre-commit triggers will complain.

This revision is now accepted and ready to land.Feb 4 2025, 5:00 PM