From nobody Tue Oct 18 09:11:26 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 4Ms7Qb1bPYz4gVL2 for ; Tue, 18 Oct 2022 09:11:35 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4Ms7Qb1314z3sWF; Tue, 18 Oct 2022 09:11:35 +0000 (UTC) (envelope-from meta@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666084295; 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=3ni6lZXTIxd6d+o5rwSEtpfieKQ2pwW6b1dpZujGhNg=; b=JlLDKSqIuLhLA4k99JfTw2BCQXOQ4VdVun5kLJAcd4JX7/4lusJyNvZs1G7KxD5Wg4KjFg clVDOBy5l5jPT7faywWvWRzoutSMlJF2NQ4oUssAJ9yF+ni7E84D1iRO5IAiVwpB+P1DZG xKnzwAJ1Pq2VnrmAF/ltvdUSeUXDLBjDjBqW6R0TLTrth2D7KwVtZYVj3i9e6jlWWR7hx/ 3LcKotjg32BcCQIUh1JtHxRPK+zJPEPVPKXGGAW+r2dNTyv09boNcEReQqKrsAqRJoOc+h WA7JUQj51Ry+eJpjy9w/pd/pHhyWcCtCTZoram5mbXp90mTWMb7Fe1TvktAfqQ== Received: from icepick.vmeta.jp (unknown [IPv6:2405:6586:2280:1200:c1d5:ff79:76c1:b6bf]) (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 4Ms7QY6vBlz1Xbn; Tue, 18 Oct 2022 09:11:33 +0000 (UTC) (envelope-from meta@FreeBSD.org) Date: Tue, 18 Oct 2022 18:11:26 +0900 From: Koichiro Iwao To: Hans Petter Selasky Cc: freebsd-net@freebsd.org Subject: Re: Help wanted with MFC 256820 Message-ID: <20221018091126.ev65nuhiyic5hwjw@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="rffehsrr2dr4gyzo" Content-Disposition: inline In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666084295; 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=3ni6lZXTIxd6d+o5rwSEtpfieKQ2pwW6b1dpZujGhNg=; b=x0t/WdIFV8Tl0JIJKn+wprWZMYFNLvT0nBGPk6JUwnij1irtNYTnUXu3R28TlNCW1lfcvY xrYdl5D0S+4H0RzWVry9ZXdpQDuuz8Ih5DFdVHtGXVdjBfrqSHYpUOIteDGB0wNKyGBbBw RkeNPxyBU6vg2jExvriEaDGNock66HkIac524PFOPBX6VBtoI5gWY3d+88geuj76p74aTk GTUz/OVmHa5MME+qsojBgwTSRejT5RH3+ITMpSiMI3wOoE05a7ayj96XQb4IPtKb25vOsw z73IDyundbEhRv/0Mn0EwHsvwiwq43Z7Fk2MAKKJ5sb7hehFE5rnVsiOp1aN7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666084295; a=rsa-sha256; cv=none; b=mXaVeDou9HOeMt2Rhx9/FlDRVo5lTT/O3WRCy3Q5Ib94nJV/W/+JbxLAk3XXfPg5V6Up4V w/HAwm0lD4jYoWFm2dshtzn2avLpcCKowoMCmAgjw26kqkiTRmKdLFfX8BcJCuTNL08gA0 yMqBXzHzx5FDm2wPYEG5goUS8C0i1R+j/1a8RL6QLfLm6Rqgij9k2VxM8t3iyzWpqr7erK YILTEENmYTlNq6REgOK7+ZcU7R0Hi/hsI9l/XVFZX8Kts02VGMu1jYLrAWw45GpUAdqGZu MvqRMdEdPe31Zn3wtOm7F8IENIlmRA5dLEMCDSwosUqC1DAK6Ef1KDYHiUfD+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N --rffehsrr2dr4gyzo 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 Here it is. See attached file. -- meta --rffehsrr2dr4gyzo Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="patch.diff" commit d91bc94ef5f1514213cb8d507beb3174dea42a73 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 (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, --rffehsrr2dr4gyzo--