From nobody Thu Dec 09 18:59:01 2021 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 1D45E18C6BE8; Thu, 9 Dec 2021 18:59:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J93Gs3y3cz4THj; Thu, 9 Dec 2021 18:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 45A8E42A6; Thu, 9 Dec 2021 18:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B9Ix1sj046211; Thu, 9 Dec 2021 18:59:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B9Ix1s3046210; Thu, 9 Dec 2021 18:59:01 GMT (envelope-from git) Date: Thu, 9 Dec 2021 18:59:01 GMT Message-Id: <202112091859.1B9Ix1s3046210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 2d120650d3d8 - stable/13 - ipfilter: Correct a comment and add notation 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2d120650d3d8d79a9ae8ef7fb5deba99015a11cf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639076341; 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=s6uF/SZ7HKeD53mtg0V8OzI06AsD2N37nmEwqQjOZEg=; b=mVCnvgctfeddYC4vo8xYtmiX0DoDvNq5NcOUumm0Biwem3xropmUJRtUPW/WCgqJBfW4mB s6U0OIkOUQe7erIB9Hj2uEz2XuVEfxIH4yv3k3N5nvM4uL86DqErPqB6C6u6jedAmWKC6o tLLSZVziXawqN1n7HUSNraKXsgXSixlWH+9c7cH2YdVeWxJdj6a2LvoPxuMOlGak/fwilW TVLl7/sMRoyQUetS1g91BtMxVnnKRjUfuQUoBdV1BunmX0IwmnBTwYdGKRjWp1h1gZavzd 5fuO3m1Y0Fpu6ueIKf4NGi3ViHzUFBYXiA8uddXFYeYFAn1JYiE/A8lOmzPG5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639076341; a=rsa-sha256; cv=none; b=kI6IehrEKCa7AXVQ/I/Sba3I692WQ8VVtPrx7LDuO6tCitJR184VtoWyTWt9HIT/RoB9jr jICTMaUnYAdzpDfk45vtoz8Hlukufutjc478b180yjy/Q+g/HrQsmPP/bNGsi2oYpebV7U rGfWMepGxrs+sTFM3p1sOva6N448CUla9Y1bGXoMT6P4s734tGXN7DFAF0iz+wLrbIX8TI RO6uJfr8lAP3ixu0qc4PS5am5xSfZRSUtNW6h/IAz0BA0u5xP/nq9ww5nnpiN0W3nupStq elsg32rC/jVwj/5oDK4vzfCcOcxe2Qv9Svf+IgfcY83WvKmcCqE1FOT52wwOug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2d120650d3d8d79a9ae8ef7fb5deba99015a11cf commit 2d120650d3d8d79a9ae8ef7fb5deba99015a11cf Author: Cy Schubert AuthorDate: 2021-10-20 02:33:02 +0000 Commit: Cy Schubert CommitDate: 2021-12-09 18:50:22 +0000 ipfilter: Correct a comment and add notation Correct a comment to accurately reflect what is being done. While we're at it document the next step in the process. (cherry picked from commit 1ca73c39a54750a4a2f584efd7c57f453bf7dbbe) --- sys/contrib/ipfilter/netinet/ip_ftp_pxy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c index 4ac7ffc7e5b1..a495292687d9 100644 --- a/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c +++ b/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c @@ -516,8 +516,7 @@ ipf_p_ftp_addport(softf, fin, ip, nat, ftp, dlen, nport, inc) #endif /* - * Add skeleton NAT entry for connection which will come back the - * other way. + * If an existing entry already exists, use it instead. */ #ifdef USE_INET6 if (nat->nat_v[0] == 6) { @@ -550,6 +549,9 @@ ipf_p_ftp_addport(softf, fin, ip, nat, ftp, dlen, nport, inc) if (nat2 != NULL) return APR_INC(inc); + /* + * An existing entry doesn't exist. Let's make one. + */ ipn = ipf_proxy_rule_rev(nat); if (ipn == NULL) return APR_ERR(1);