From nobody Thu Feb 06 13:19:32 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ypd454n94z5mR65; Thu, 06 Feb 2025 13:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ypd446yR7z3QRm; Thu, 06 Feb 2025 13:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738847973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LOP7c0+IM8iPIosiQSG5JRSnDHgb5RMGWki7gKQDFNw=; b=me3aEbw8Wxe6LMDAAkYQdZBU+3kXpOMJ1Ckxfh7ZhEhY2OCgMRjxFuusAJ2BzMul7MsVTh TnJ7tWG9iKc9zVIQ1aL9HMDl85mkBZ7q6X7fpdKG6P/iOAVaonkknQrypBZMSE3Sbs+IDf Jy3hDs1RQTKdmJLCu2LTL2kohnArAgxbgp1dtKbvTq1yLgMp6OFWEFEJcrL+CxHvw2IsWB 7KDO9e4d5TFDFGJKxhmho5tweg8q+ead02+zXU6Z2XjTM5CfZmVMEDuwq104jkzh1MNDBW 4oikSeRXMFi3dv1lYJXoxAD8VBjTHU8s9MCeWMy/27n7+LERATzcktbno+Hpjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738847973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LOP7c0+IM8iPIosiQSG5JRSnDHgb5RMGWki7gKQDFNw=; b=gsZFZQ2DD6dNTX1P+SF3DDSmJqOzG+71ftMhKXp10sVHfIG5gY2XvuTcqPg0xiE3AprVFW m0dm+OqBn20R6pyic1KfS+z8RxGk9FftpdUabC+go2Of5MmyS6jirzTb9TQhDfuQrhA+Zf aYBb56g3NyeIqBlw/ZTdsS0T2NtCw6SH5JcPKdb1D0zzUoUbJCFYmTBAZAP1CuEMCR/BH1 bWWUlwng81wI/TvFoQaT7UrTAzAH7q82IO7WMrxRfEYgP09czjonSntE5tm9M8Pw/ubuxF 5SdOKI4XSvanEHq1UNo07TgfDTxs4gZJVuDEfAaKs1te193tdVlS5gBsN95JqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738847973; a=rsa-sha256; cv=none; b=denkQ3eIw7fS3CuYLaY/1orKeswe7C9a4CUMOzXatJjQttdiquPeg8DpyNnYrLu1MG1Zd1 YHRKZ0he2BNxjUaOipBPKT81xCsVn9F/HG4OExT+wkv1fRpWk0G+k5qpYtWKRBbCKo317w NjbMMOAYrngLRSUUz37qb216CO7F7pP7js4WefX9KCXssksttJz/RpOxbTsMVdrFyUYGVU E+iIPYl9jY0/O8cjaeglDbu5KAJc7yaN15ZUHI047n8T/p0kO5zyyLfeWRIKzDcgR2QHqe VVGfPgAvtZLJVR1nK7KsfFa5VY9pHQjFJoTGn7HuBboCCjWe/WkZcxgv4AIeiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ypd443BMnzg8m; Thu, 06 Feb 2025 13:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 516DJWBe038960; Thu, 6 Feb 2025 13:19:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 516DJWPv038957; Thu, 6 Feb 2025 13:19:32 GMT (envelope-from git) Date: Thu, 6 Feb 2025 13:19:32 GMT Message-Id: <202502061319.516DJWPv038957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kajetan Staszkiewicz Subject: git: daea703963f5 - main - pf: Use pf_map_addr() only once when choosing source port and address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: daea703963f53b5530c2957f72bed57b10151810 Auto-Submitted: auto-generated The branch main has been updated by ks: URL: https://cgit.FreeBSD.org/src/commit/?id=daea703963f53b5530c2957f72bed57b10151810 commit daea703963f53b5530c2957f72bed57b10151810 Author: Kajetan Staszkiewicz AuthorDate: 2025-02-03 16:41:03 +0000 Commit: Kajetan Staszkiewicz CommitDate: 2025-02-06 13:14:33 +0000 pf: Use pf_map_addr() only once when choosing source port and address 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. Reviewed by: kp Approved by: kp (mentor) Sponsored by: InnoGames GmbH Differential Revision: https://reviews.freebsd.org/D48821 --- sys/netpfil/pf/pf_lb.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index cb92c724a541..6251ddee7d19 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -238,11 +238,6 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, bzero(&init_addr, sizeof(init_addr)); - if (! TAILQ_EMPTY(&r->nat.list) && - pf_map_addr_sn(pd->naf, r, &pd->nsaddr, naddr, NULL, &init_addr, - sn, sh, &r->nat)) - return (1); - if (udp_mapping) { MPASS(*udp_mapping == NULL); } @@ -252,7 +247,7 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, * from the mapping. In this case we have to look up the src_node as * pf_map_addr would. */ - if (pd->proto == IPPROTO_UDP && (r->rdr.opts & PF_POOL_ENDPI)) { + if (pd->proto == IPPROTO_UDP && (rpool->opts & PF_POOL_ENDPI)) { struct pf_udp_endpoint_cmp udp_source; bzero(&udp_source, sizeof(udp_source)); @@ -265,8 +260,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, PF_ACPY(naddr, &(*udp_mapping)->endpoints[1].addr, pd->af); *nport = (*udp_mapping)->endpoints[1].port; /* Try to find a src_node as per pf_map_addr(). */ - if (*sn == NULL && r->rdr.opts & PF_POOL_STICKYADDR && - (r->rdr.opts & PF_POOL_TYPEMASK) != PF_POOL_NONE) + if (*sn == NULL && rpool->opts & PF_POOL_STICKYADDR && + (rpool->opts & PF_POOL_TYPEMASK) != PF_POOL_NONE) *sn = pf_find_src_node(&pd->nsaddr, r, pd->af, sh, false); if (*sn != NULL) PF_SRC_NODE_UNLOCK(*sn); @@ -280,7 +275,7 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, } } - if (pf_map_addr_sn(pd->af, r, &pd->nsaddr, naddr, NULL, &init_addr, + if (pf_map_addr_sn(pd->naf, r, &pd->nsaddr, naddr, NULL, &init_addr, sn, sh, rpool)) goto failed; @@ -379,7 +374,7 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, tmp = cut; for (tmp -= 1; tmp >= low && tmp <= 0xffff; --tmp) { if (pd->proto == IPPROTO_UDP && - (r->rdr.opts & PF_POOL_ENDPI && + (rpool->opts & PF_POOL_ENDPI && udp_mapping != NULL)) { (*udp_mapping)->endpoints[1].port = htons(tmp); if (pf_udp_mapping_insert(*udp_mapping) == 0) { @@ -396,7 +391,7 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, } } - switch (r->rdr.opts & PF_POOL_TYPEMASK) { + switch (rpool->opts & PF_POOL_TYPEMASK) { case PF_POOL_RANDOM: case PF_POOL_ROUNDROBIN: /* @@ -404,8 +399,8 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_krule *r, * of free port choices for the current one. */ (*sn) = NULL; - if (pf_map_addr_sn(pd->af, r, &pd->nsaddr, naddr, NULL, - &init_addr, sn, sh, &r->rdr)) + if (pf_map_addr_sn(pd->naf, r, &pd->nsaddr, naddr, NULL, + &init_addr, sn, sh, rpool)) return (1); break; case PF_POOL_NONE: @@ -658,8 +653,8 @@ pf_map_addr_sn(sa_family_t af, struct pf_krule *r, struct pf_addr *saddr, * Request the sh to be unlocked if sn was not found, as we never * insert a new sn when parsing the ruleset. */ - if (r->rdr.opts & PF_POOL_STICKYADDR && - (r->rdr.opts & PF_POOL_TYPEMASK) != PF_POOL_NONE) + if (rpool->opts & PF_POOL_STICKYADDR && + (rpool->opts & PF_POOL_TYPEMASK) != PF_POOL_NONE) *sn = pf_find_src_node(saddr, r, af, sh, false); if (*sn != NULL) {