From nobody Wed Oct 19 03:24:14 2022 X-Original-To: dev-commits-src-branches@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 4MsbgL6HPKz4gZx0; Wed, 19 Oct 2022 03:24:14 +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 4MsbgL5gHsz3cb6; Wed, 19 Oct 2022 03:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666149854; 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=80GuR7N3Gd2EPy4mGqK6AVQ05bu1+ddqtmiVeBKQJ4g=; b=YJR9L0WOdDyHo9BP5QbWTnKfuCf3eVXX3lRt2EHGTWVjHbq3HkkMIYp7pBGUK7CBJdG4Gw VABgTITImuhF/a8bdxhf6szENgnTmSjIvAOpHIiD2XF8ahmwyvQYGnan0hJMEfiEfKlT2g QlXdFf+A9yN+DvmJUqFYtjD9qZYYLp+XDdjm+DVkrg2hkzzV2O/fj7AlhlUnakgyOTVZWB cx4GAwwqxT6/o4J6DFEoPOE9yEIohi/pZ75y/7q7fs0BkWcSP0TQTm/3WrfMeiGhx/4Vjp +vhPWeg3kyz0KqfPDIzAsD4Rvb++U6KUPlqHdRnLttL+4+EQSWY73QqRtYY9Eg== 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 4MsbgL4jS8zPFd; Wed, 19 Oct 2022 03:24:14 +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 29J3OEbR094014; Wed, 19 Oct 2022 03:24:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29J3OESQ094013; Wed, 19 Oct 2022 03:24:14 GMT (envelope-from git) Date: Wed, 19 Oct 2022 03:24:14 GMT Message-Id: <202210190324.29J3OESQ094013@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: 3b1dbf19f9c0 - stable/13 - inet6(4): add a missing IPPROTO_ETHERIP entry List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 3b1dbf19f9c051a325774ba5c0d7cc460cc82c7f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666149854; 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=80GuR7N3Gd2EPy4mGqK6AVQ05bu1+ddqtmiVeBKQJ4g=; b=J6tbWu1AKqW09HmhfQSi/J+3o2bnSNU7Pu/Dt3mNuh9yIAtCVCebgsxR6hQcm7JBFKiD7d eRl1BwbeOoIgBFqZxtBBN1rqRbiqnCw7eZyUTUvPML5WlIML3s+TO1R8SoCcAzj2cj0mzg 2LvX8kCs2pU7lxjJlcoY89Ng6ExS375ii9/ZZEesrOOJ8KNYX1h0bpuaagG5EvC/YYuvZO EhjN+7JYpmuQqYtt4Cfroa1kdyWS9T7uJI0Jq4Eyb0eSUEuqf/U3q3iCMsrNaltl+k8q5i uZz5jW0VDZo9YA0iog4+M36UIktm3EDxCddLC+CQnSVYxjDDeB9ixaDZJrwqUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666149854; a=rsa-sha256; cv=none; b=WHWNkHb6NGhivgQpiLMJSwY3GIqUqy4LF2tQ9lep0SPSBt8kFKzGMPAxi6kVm9qYbyMZm8 Ec/oKzr9lbNfP5KtAcUB/HWlePoNv4J3c4bIWlsxNUgeWzxIRgZ8ry1xqiyypovappEThs qX8lNyb3khxiFtA2W5nueQ18CvRs1DUpVIlcJdixK/zILNkT6s3HKZyKwDZrvJWH/izsQe a0nub1BmCbocwT6hCh6HEn3jZs1dXA2GjH7i87fguJO8xMBa+rEIgyaRd4p3xRKLFd7Uvp 5SCedLHWnZl3xodZIE1RcH1Advm0+H8Z3F3wakVs9JYWxrHuCecWo8CtlTp3tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by meta (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=3b1dbf19f9c051a325774ba5c0d7cc460cc82c7f commit 3b1dbf19f9c051a325774ba5c0d7cc460cc82c7f Author: Hiroki Sato AuthorDate: 2021-08-27 08:14:35 +0000 Commit: Koichiro Iwao CommitDate: 2022-10-19 03:23:16 +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 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,