d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Since from now on encap_input() also catches IPPROTO_MOBILE and IPPROTO_GRE

Browse Source 
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)
This commit is contained in:
sobomax 2002-09-09 09:36:47 +00:00
parent cc821b1535
commit ad3a4ab114
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/net/if_gif.c
View File

@ -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) {

2
sys/netinet/ip_mroute.c
View File

@ -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);