From nobody Tue Oct 18 15:16:24 2022 X-Original-To: freebsd-net@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 4MsHWb6rnYz4g2Hd for ; Tue, 18 Oct 2022 15:16:27 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MsHWb6NPnz3RSL; Tue, 18 Oct 2022 15:16:27 +0000 (UTC) (envelope-from meta@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666106187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=o+dAomDFXm65aPb5PZlOEo2Q0JMH5TDFFY2KYPNhamU=; b=yPAOFun3VHc7d6pYcyt0L5CWnQe92JonB0ab8auMye1F56W9CrCuHcSqSIm5p/rlW7t0tt AXaxe9IEyTAK63D+Dg4BoamFoN5Jm+3Hw+EQ/yBGTWli9V0/Vwq1YJVZntYQMSy5p/jkM+ q7YsRnukJm14poWF5RmXdKJH3Fs6aXKujzK1GVnsAFq9eHoxjGA3FVX9aoqlimiAauDqGd Cs/2AtdIIAfWir7X8aIr8oWugdqpDugj2vIN9qAVtFZot17A+nPCS+ZYB0qtPq1JCfodqB HFYG33WCWb0mOwN4ubyjyoyPWE9LLGCq5QsvYCUAH5KLs8koFOa3dmG2eChEhA== Received: from icepick.vmeta.jp (unknown [IPv6:2405:6586:2280:1200:29c3:266:b6ab:c30b]) (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) (Authenticated sender: meta/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4MsHWZ5WFhz1YXM; Tue, 18 Oct 2022 15:16:26 +0000 (UTC) (envelope-from meta@FreeBSD.org) Date: Wed, 19 Oct 2022 00:16:24 +0900 From: Koichiro Iwao To: Hans Petter Selasky Cc: freebsd-net@freebsd.org Subject: Re: Help wanted with MFC 256820 Message-ID: <20221018151624.buee3gcs77rc3smo@icepick.vmeta.jp> X-Operating-System: FreeBSD 13.1-STABLE amd64 References: <558b6dd1a98fdb81df0443202695172c@freebsd.org> <20221016235900.juemalq6mal7oiua@icepick.vmeta.jp> List-Id: Networking and TCP/IP with FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-net List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-net@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="xkcxtklda43gn6q7" Content-Disposition: inline In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666106187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=o+dAomDFXm65aPb5PZlOEo2Q0JMH5TDFFY2KYPNhamU=; b=AsxZviuTugFDV0JAcGlnZwawNeAq97JtVO+g/MN1UI1yUc59vuyKBTRM7viEJ0L26EJ2oy JOrL/bgMQKhyF30gPXdMmcFcI3v0UOgW0kxXDyI2nUQDtPGTdIv6/gfQ/+uYHFBqIYrlQN Avf6w7Cs7b08mw0qJlAba38KUtxaolxl/5ZIaNClZzaGlgylpyBYiiQMOQz0AMexw+l6Im 7HaNQvw9DBOHSI7XQVeeR1oZvnwGnOc2Ti6zQiw95JfzkvAU9lMRKy2oYqqP+0Ig/JTeEZ yEarjCrcp7iOg97QSdKuVJwVsSeSq4EZ1AfogvWCIhgU+LaOMR2Qm7CQzaW31Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666106187; a=rsa-sha256; cv=none; b=tO5fpGjqEjPjFv+mnvvWOO9mUBtMHUoMR0hQOw20wUfapufhu8btNmc0Es4GCAZYe0XOpU unSfVcyk1U8Mlan+tYEkGUcgTg5zIxekKvlzzSWZnsKFa0HShV8PODc5J0J6W/5LpXR3iR QcphFM4kgeZrniIkxHSqG5ae2aZhN6sboaucl3S1fLYRtGx1FAAqJdap9hZp7VQBxD/O9s p3iqtqq23Q5A30UOFkEJNG1LBvgV5CNLcT3gd+W1fnmFLBtjHGnwOAdMjSNf4I5mOwGcCE mG30s/Y8cm1Zv+9fXNtSjuvODAEnq+12POQz6HyH0uillwt39pY1dXvU1PJKEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --xkcxtklda43gn6q7 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline On Mon, Oct 17, 2022 at 09:16:12AM +0200, Hans Petter Selasky wrote: > Send me the "git show" output of the commit before you push it, and I'll > review it for you. > > --HPS I would like to MFC it to stable/12, too. See attached patches for both branch. -- meta --xkcxtklda43gn6q7 Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="12-stable.patch" commit a57f2b202fa26bc5c3ed6390fcc4dc2b30e178c1 Author: Hiroki Sato Date: Fri Aug 27 17:14:35 2021 +0900 inet6(4): add a missing IPPROTO_ETHERIP entry bridge(4) + gif(4) did not work when the outer protocol was IPv6. Submitted by: Masahiro Kozuka PR: 256820 Approved by: to-be-filled (to cherry-pick) (cherry picked from commit 9823a0c0acf4fc277a71336ea737e1de7c65742f) diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index b5270394d9f3..43d99e484fb8 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -295,6 +295,15 @@ struct protosw inet6sw[] = { .pr_ctloutput = rip6_ctloutput, .pr_usrreqs = &rip6_usrreqs }, +{ + .pr_type = SOCK_RAW, + .pr_domain = &inet6domain, + .pr_protocol = IPPROTO_ETHERIP, + .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR, + .pr_input = encap6_input, + .pr_ctloutput = rip6_ctloutput, + .pr_usrreqs = &rip6_usrreqs +}, { .pr_type = SOCK_RAW, .pr_domain = &inet6domain, --xkcxtklda43gn6q7 Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="13-stable.patch" commit 3a60c1392ba49525ce47a55477bd6a2dc27e3ab7 Author: Hiroki Sato Date: Fri Aug 27 17:14:35 2021 +0900 inet6(4): add a missing IPPROTO_ETHERIP entry bridge(4) + gif(4) did not work when the outer protocol was IPv6. Submitted by: Masahiro Kozuka PR: 256820 Approved by: to-be-filled (to cherry-pick) (cherry picked from commit 9823a0c0acf4fc277a71336ea737e1de7c65742f) diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index 21b7d660676f..fb4f76dd698c 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -291,6 +291,15 @@ struct protosw inet6sw[] = { .pr_ctloutput = rip6_ctloutput, .pr_usrreqs = &rip6_usrreqs }, +{ + .pr_type = SOCK_RAW, + .pr_domain = &inet6domain, + .pr_protocol = IPPROTO_ETHERIP, + .pr_flags = PR_ATOMIC|PR_ADDR|PR_LASTHDR, + .pr_input = encap6_input, + .pr_ctloutput = rip6_ctloutput, + .pr_usrreqs = &rip6_usrreqs +}, { .pr_type = SOCK_RAW, .pr_domain = &inet6domain, --xkcxtklda43gn6q7--