git: 9823a0c0acf4 - main - inet6(4): add a missing IPPROTO_ETHERIP entry

Hiroki Sato hrs at FreeBSD.org
Fri Aug 27 08:15:15 UTC 2021


The branch main has been updated by hrs:

URL: https://cgit.FreeBSD.org/src/commit/?id=9823a0c0acf4fc277a71336ea737e1de7c65742f

commit 9823a0c0acf4fc277a71336ea737e1de7c65742f
Author:     Hiroki Sato <hrs at FreeBSD.org>
AuthorDate: 2021-08-27 08:14:35 +0000
Commit:     Hiroki Sato <hrs at FreeBSD.org>
CommitDate: 2021-08-27 08:14:35 +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
    MFC after:      3 days
---
 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 56ef41a27e88..909564b8c7e5 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -293,6 +293,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,


More information about the dev-commits-src-all mailing list