From nobody Sat Dec 04 14:34:39 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 2CB2218B7C49; Sat, 4 Dec 2021 14:34:42 +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 4J5sf83xSYz3DZ1; Sat, 4 Dec 2021 14:34:40 +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 D7B0C26109; Sat, 4 Dec 2021 14:34:39 +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 1B4EYdFr077999; Sat, 4 Dec 2021 14:34:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B4EYdM4077998; Sat, 4 Dec 2021 14:34:39 GMT (envelope-from git) Date: Sat, 4 Dec 2021 14:34:39 GMT Message-Id: <202112041434.1B4EYdM4077998@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 1ca73c39a547 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 1ca73c39a54750a4a2f584efd7c57f453bf7dbbe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638628480; 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=YYQUD2y53+fyZ7V4DhlslFwxf9C8QbJUlmBnN6sa0Jw=; b=tfP8nFnlKn1YwnncSPk0QP/P5lpe/fTnbPdFJVSwjZPOrP+q8DhYkOHDWUBjB0kw9B/IMX UZLUuaZzzu80XsxwcQbdnrAj3vEmVwMowpkLUuDd9WW+SJKB058N/81dyvtK4XAVwlPCv+ 5s0cNn+TlTnwkDGpItDKxD0PCQBIN0mvVR+F7M77EhvzseLWvfwbib8EFx/ioqIhlTlrcy ufYDLCHovqLAe/QgQqLlz8iLK6NY77XSfEH3eOlsB1mefOdKJPJxk9WNX1LX1Rya6t6Te1 SmgKcMjqtl5cilduym7+jkouhzHGppoP83Jwzqe+OruIzRJuaVEvWBo8SvSvtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638628480; a=rsa-sha256; cv=none; b=k5kqOiKKr1UCy6Gdoe2Ob+JwektEJ5ZqqNaNZbCHdvQl8JOKKH7yxG6MhB4g8P2LgMM9Uc iS8nYsm9livBAxQTI0CxV0qLPOK1GaZ6CAh+dj/xQeX4dJtG3FozvHAjo/bo0XOi5fCdH8 01rCm4XQM/tA0YbR1TianzlA3pHaaxJS2WN51XnXdWFbJHN8N2Jg1gT4mYeA0Ej0Vh/sJc +LdG+FZoRkwi8pg//1LU2otT0XTXQNULxf2ec+zFNNrjN4N6v+Xu7JLt9BjmtNWmvs/bDC VWD1u2iS0DHnOxNwWcsBUJts8yWnEY+2ghflfPWv4dcLoFZ/5WtaxlAOzlQUGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1ca73c39a54750a4a2f584efd7c57f453bf7dbbe commit 1ca73c39a54750a4a2f584efd7c57f453bf7dbbe Author: Cy Schubert AuthorDate: 2021-10-20 02:33:02 +0000 Commit: Cy Schubert CommitDate: 2021-12-04 14:33:13 +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. MFC after: 3 days --- 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);