From nobody Wed Oct 19 03:30:36 2022 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 4Msbph32Bnz4fMSF; Wed, 19 Oct 2022 03:30:36 +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 4Msbph2XYNz3dyd; Wed, 19 Oct 2022 03:30:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666150236; 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=Rhle8MN0zsvhmQuN3Es+8QuyNMtNTzqnDwDHGhhj8Ng=; b=tE1kjIRdrEZocfzw+/3yT8MFExr7u1j035WJ2TssCkugYoboe0HqIViCFXO3zMC7h/++D9 5hHkPW2NcMZw1hrBnX5/Juq6DtLaK5O1DufB42lrT5ozKzpH79Uea9gmyK8JEbBGEWY2YI 95NabWhAVbMIhj9ZdahVa3RfpYxnxdNu+1Yoy/RSkXV6esxeXYQeXX2LU/MJ+SwqgK9vV8 s7WfWdCU4ctYc67nuDQDLQxglEdRaCwxkvxe73uTN6D35AxKh2juLNzNhgt61hO6+koJsf XesFfVDTgtgAmCynMTGDj7cZik8Kx1p7D+ynXBEaX8A+Uy9t9AzDIn5/0Ug+7w== 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 4Msbph1ZBvzP4B; Wed, 19 Oct 2022 03:30:36 +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 29J3UaJ2003749; Wed, 19 Oct 2022 03:30:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29J3Ua6V003748; Wed, 19 Oct 2022 03:30:36 GMT (envelope-from git) Date: Wed, 19 Oct 2022 03:30:36 GMT Message-Id: <202210190330.29J3Ua6V003748@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Koichiro Iwao Subject: git: a0e9703f57cb - stable/12 - inet6(4): add a missing IPPROTO_ETHERIP entry 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: meta X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a0e9703f57cb2ba2bcf8a765f42f8fe702a3cca8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666150236; 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=Rhle8MN0zsvhmQuN3Es+8QuyNMtNTzqnDwDHGhhj8Ng=; b=dOijSbY9zkjEaKsETdxkiBSTARbm5e4DPcgW21ClhNYf3Qnrm9FD7yf41Sd1dqetJaIBxz uw2EDQwtGAC3jX3PMleNZaJoRd+bOiSGfsHZ91T3KStbqFeP/IVk6a2h3LZmJkrlCOnFdv wBfYwqiO1FO+nUwlYLaJEV/E/HLrtcPGxZ57zKo12n02Sln6Lrxtda9P9PHHrcOuKswVp+ KH0Cn70zY6jYbN6XXeaG8FheQsXq951X7yrfLYLWDuspE3rTn3i2E41NBAZCWB99InE8mt vxfwNjMm1mjgYU8xHGPfzZisevyHcSqfsRkJwzMCT8+v6SD6Qrimkp80CJg99A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666150236; a=rsa-sha256; cv=none; b=LqEFrLXfb2ev85lxOCQnAUuHl5PaYvaKxYsdTIpnM7cTQW+UP1n413A1zri/++JBMzio3F 2tjbKl24yCA8ITLIN4Xnl6S53g+Rl/cmErIw2iEjHmeYk6SuUbsMvIWjkBVsYXyNryUi3G /HEBdp6fTEllLjqlqvNXfZqN8n6vUrgEZgHWiSaPVAfZMOQfLQBMuNKh2cRj+gNf9M8l5D W9Lqab6ae56D7IwfpLkDYHV5ENesRijNofKa9LdlfWltuNbdWCmcp/UH5CdzmOk2KHefrf lHwqVegy6iDdhvtKlGUqwnUH9fx9cf4gguYowIU+l2Q6bMHPMCo3BXoOdEniNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by meta (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=a0e9703f57cb2ba2bcf8a765f42f8fe702a3cca8 commit a0e9703f57cb2ba2bcf8a765f42f8fe702a3cca8 Author: Hiroki Sato AuthorDate: 2021-08-27 08:14:35 +0000 Commit: Koichiro Iwao CommitDate: 2022-10-19 03:29:39 +0000 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: hps (to cherry-pick) (cherry picked from commit 9823a0c0acf4fc277a71336ea737e1de7c65742f) --- sys/netinet6/in6_proto.c | 9 +++++++++ 1 file changed, 9 insertions(+) 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,