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
Unknown Object (File)
Sat, Jul 4, 12:30 PM
Unknown Object (File)
Tue, Jun 30, 3:40 PM
Unknown Object (File)
Mon, Jun 29, 11:06 PM
Unknown Object (File)
Fri, Jun 26, 2:47 PM
Unknown Object (File)
Thu, Jun 25, 7:26 AM
Unknown Object (File)
Mon, Jun 22, 5:14 PM
Unknown Object (File)
Jun 15 2026, 7:51 AM
Unknown Object (File)
Jun 6 2026, 12:43 AM

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 Not Applicable
Unit
Tests Not Applicable

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