From nobody Fri Dec 20 17:42:39 2024 X-Original-To: dev-commits-src-all@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 4YFF9q1pFQz5X2gh; Fri, 20 Dec 2024 17:42:39 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YFF9q1GXbz4DPL; Fri, 20 Dec 2024 17:42:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734716559; 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=tctJjgnN9OTWkPuYlt55irW+pa4KbqXUusaGa21+IjQ=; b=hU5k+IBjEOpsMuLDhXc9PvGUdbZq2C8JrZVwKBUIG1GSWrs9sXNHb6b3Nn5q8HNmYWgVzn f+toejk2Z/cOYGEmpaw8pschMD97PVMorjepKPWniLeq4IqyNtbmDei22onzpLghrcKZON zBG35dBYigE8gw/fNGdH4NLfw+i9eY1ubk6FKQPtrZ6dWPULWKxW0BFS5ggSIaOLaPFT8b zmaWZLrwT6m8aqnYS6hg8xC194UobCf98tYBm7ZD39r+qiMz2dBEkCiPWOBSMFdENyFj7P PmNPd4Pfw6UWo2wzWBolGvo1+TbHJ6x1V8I3uvL7lp0TMb3oAoNwHK6WkNfmkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734716559; 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=tctJjgnN9OTWkPuYlt55irW+pa4KbqXUusaGa21+IjQ=; b=Kksq1VOzADvVm54X7HZwRh1wITOPVKD/X6FMf2xyGv91enT4dJxOKuomdafTHdtrVwSS2X 2D8GdXKtSWr5N6xgTlUgDF40mRfW4m++hX+RuL5A6B2rlOPLxouFoKQuaQLoThWDfSI/IM gSdkKccQAPGwMNxxS2gu0Vq5thBOWXyruKM2rWRS1iF6ro7z4NeDncB8Rxw9QHNrhHw4Ok km/HORdDj5P/TaM/duXc5dzHLmfmo82hjbuujXniOG6x+36Fpx86SZqCLAamnKIPOfjW6+ w7b8cSxPWI/CESCIZg99DEQmDw5ajDFB1PLd9eZ4uKZCdrUIsUSwRru2d0AdNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734716559; a=rsa-sha256; cv=none; b=ealE8AgKzhQft2eXlrjLA3zeIZWRslI3w5uuaez8yoL6kvn+msfpAVxwfYhiXS/Xg6t/S9 n/er/KYSZwo9ZEvPM3s6U9THjiI3vfYVjCqjjc5ux3bTdtVxrFvavACEmjyczW9SaCHBGp 1iPhu2Y2XRupZyiDdG7Xvj9X4a0sULFXFK05iChRnVX1+29ub9D9OEvqlYtf+Uc+Er5WBn nreSo/deBXv1brSgImx2pk7GarYo3by3er8/PUFn2nCK/qL1wt1GmFtmXXFyoHvCSFoVsp zvrT8orDCA5Q1FN0gKdjvzHyEXbbsCn/cgy3dOQoQendbAn2Bszcd5QcfWrZ3g== 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 4YFF9q0sNfznyR; Fri, 20 Dec 2024 17:42:39 +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 4BKHgduQ050734; Fri, 20 Dec 2024 17:42:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BKHgdCS050731; Fri, 20 Dec 2024 17:42:39 GMT (envelope-from git) Date: Fri, 20 Dec 2024 17:42:39 GMT Message-Id: <202412201742.4BKHgdCS050731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 725003da5302 - main - pf.conf.5: Fix endpoint-independent description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 725003da53021c15b1d2274d5c4440c7c6e6602a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=725003da53021c15b1d2274d5c4440c7c6e6602a commit 725003da53021c15b1d2274d5c4440c7c6e6602a Author: Ed Maste AuthorDate: 2024-12-20 01:33:53 +0000 Commit: Ed Maste CommitDate: 2024-12-20 17:39:55 +0000 pf.conf.5: Fix endpoint-independent description The description of the endpoint-independent option accidentally ended up in the middle of map-e-portset's text. Fixes: 390dc369efaa ("pf: Add support for endpoint independent NAT bindings for UDP") Reviewed by: kp Sponsored by: Tailscale Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48158 --- share/man/man5/pf.conf.5 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 2bedceed6fe7..138fb5e7f82b 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -2341,16 +2341,6 @@ from modifying the source port on TCP and UDP packets. With .Ar nat rules, the -.It Ar endpoint-independent -With -.Ar nat -rules, the -.Ar endpoint-independent -option caues -.Xr pf 4 -to always map connections from a UDP source address and port to the same -NAT address and port. -This feature implements "full-cone" NAT behavior. .Ar map-e-portset option enables the source port translation of MAP-E (RFC 7597) Customer Edge. In order to make the host act as a MAP-E Customer Edge, setting up a tunneling @@ -2364,6 +2354,16 @@ nat on $gif_mape_if from $int_if:network to any \e .Ed .Pp sets PSID offset 6, PSID length 8, PSID 0x34. +.It Ar endpoint-independent +With +.Ar nat +rules, the +.Ar endpoint-independent +option caues +.Xr pf 4 +to always map connections from a UDP source address and port to the same +NAT address and port. +This feature implements "full-cone" NAT behavior. .El .Pp Additionally, the