From ad3a4ab114b0cb905de1e3d30e4905b365d553cb Mon Sep 17 00:00:00 2001 From: sobomax Date: Mon, 9 Sep 2002 09:36:47 +0000 Subject: [PATCH] Since from now on encap_input() also catches IPPROTO_MOBILE and IPPROTO_GRE packets in addition to IPPROTO_IPV4 and IPPROTO_IPV6, explicitly specify IPPROTO_IPV4 or IPPROTO_IPV6 instead of -1 when calling encap_attach(). MFC after: 28 days (along with other if_gre changes) --- sys/net/if_gif.c | 4 ++-- sys/netinet/ip_mroute.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c index fb81960d1c60..c5da47c9c523 100644 --- a/sys/net/if_gif.c +++ b/sys/net/if_gif.c @@ -169,7 +169,7 @@ gif_clone_create(ifc, unit) sc->encap_cookie4 = sc->encap_cookie6 = NULL; #ifdef INET - sc->encap_cookie4 = encap_attach_func(AF_INET, -1, + sc->encap_cookie4 = encap_attach_func(AF_INET, IPPROTO_IPV4, gif_encapcheck, (struct protosw*)&in_gif_protosw, sc); if (sc->encap_cookie4 == NULL) { printf("%s: unable to attach encap4\n", if_name(&sc->gif_if)); @@ -178,7 +178,7 @@ gif_clone_create(ifc, unit) } #endif #ifdef INET6 - sc->encap_cookie6 = encap_attach_func(AF_INET6, -1, + sc->encap_cookie6 = encap_attach_func(AF_INET6, IPPROTO_IPV6, gif_encapcheck, (struct protosw *)&in6_gif_protosw, sc); if (sc->encap_cookie6 == NULL) { if (sc->encap_cookie4) { diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 8da8339e2ad6..b0f2eab882db 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -768,7 +768,7 @@ add_vif(vifcp) * to encapsulated packets. */ if (encap_cookie == NULL) { - encap_cookie = encap_attach_func(AF_INET, -1, + encap_cookie = encap_attach_func(AF_INET, IPPROTO_IPV4, mroute_encapcheck, (struct protosw *)&mroute_encap_protosw, NULL);