From owner-dev-commits-src-all@freebsd.org Fri Sep 24 08:28:31 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1F0E6668674; Fri, 24 Sep 2021 08:28:31 +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 4HG4tQ71x3z4XLL; Fri, 24 Sep 2021 08:28:30 +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 CD19F130EA; Fri, 24 Sep 2021 08:28:30 +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 18O8SURU075242; Fri, 24 Sep 2021 08:28:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18O8SU4l075240; Fri, 24 Sep 2021 08:28:30 GMT (envelope-from git) Date: Fri, 24 Sep 2021 08:28:30 GMT Message-Id: <202109240828.18O8SU4l075240@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: 4f3376951d70 - main - ipsec: Add PMTUD support for IPsec IPv4 over IPv6 tunnel MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f3376951d7024d1c3446af2260cef9e4d3404a6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Sep 2021 08:28:31 -0000 The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=4f3376951d7024d1c3446af2260cef9e4d3404a6 commit 4f3376951d7024d1c3446af2260cef9e4d3404a6 Author: Bartlomiej Grzesik AuthorDate: 2021-09-24 08:17:11 +0000 Commit: Wojciech Macek CommitDate: 2021-09-24 08:17:11 +0000 ipsec: Add PMTUD support for IPsec IPv4 over IPv6 tunnel Add support for checking PMTU for IPv4 packets encapsulated in IPv6 tunnels. Differential revision: https://reviews.freebsd.org/D31769 Sponsored by: Stormshield Obtained from: Semihalf --- sys/netipsec/ipsec_output.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c index 2f8cc12c526b..50bbd72f0589 100644 --- a/sys/netipsec/ipsec_output.c +++ b/sys/netipsec/ipsec_output.c @@ -305,7 +305,6 @@ ipsec4_check_pmtu(struct mbuf *m, struct secpolicy *sp, int forwarding) uint32_t idx; int error; - /* Don't check PMTU if the frame won't have DF bit set. */ if (!V_ip4_ipsec_dfbit) return (0); @@ -335,15 +334,22 @@ setdf: } dst = &sav->sah->saidx.dst; - - /* Final header is not ipv4. */ - if (dst->sa.sa_family != AF_INET) { + memset(&inc, 0, sizeof(inc)); + switch (dst->sa.sa_family) { + case AF_INET: + inc.inc_faddr = satosin(&dst->sa)->sin_addr; + break; +#ifdef INET6 + case AF_INET6: + inc.inc6_faddr = satosin6(&dst->sa)->sin6_addr; + inc.inc_flags |= INC_ISIPV6; + break; +#endif + default: key_freesav(&sav); return (0); } - memset(&inc, 0, sizeof(inc)); - inc.inc_faddr = satosin(&dst->sa)->sin_addr; key_freesav(&sav); pmtu = tcp_hc_getmtu(&inc); /* No entry in hostcache. */