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

use encapcheck.

Browse Source 
Obtained from:	KAME
MFC after:	3 weeks
This commit is contained in:
Hajimu UMEMOTO 2002-10-16 20:16:49 +00:00
parent a91db09ec0
commit ab94625826
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/netinet/in_gif.c
View File

@ -380,22 +380,8 @@ int
in_gif_attach(sc)
struct gif_softc *sc;
{
#ifndef USE_ENCAPCHECK
struct sockaddr_in mask4;
bzero(&mask4, sizeof(mask4));
mask4.sin_len = sizeof(struct sockaddr_in);
mask4.sin_addr.s_addr = ~0;
if (!sc->gif_psrc || !sc->gif_pdst)
return EINVAL;
sc->encap_cookie4 = encap_attach(AF_INET, -1, sc->gif_psrc,
(struct sockaddr *)&mask4, sc->gif_pdst, (struct sockaddr *)&mask4,
(struct protosw *)&in_gif_protosw, sc);
#else
sc->encap_cookie4 = encap_attach_func(AF_INET, -1, gif_encapcheck,
&in_gif_protosw, sc);
#endif
if (sc->encap_cookie4 == NULL)
return EEXIST;
return 0;

16
sys/netinet6/in6_gif.c
View File

@ -379,24 +379,8 @@ int
in6_gif_attach(sc)
struct gif_softc *sc;
{
#ifndef USE_ENCAPCHECK
struct sockaddr_in6 mask6;
bzero(&mask6, sizeof(mask6));
mask6.sin6_len = sizeof(struct sockaddr_in6);
mask6.sin6_addr.s6_addr32[0] = mask6.sin6_addr.s6_addr32[1] =
mask6.sin6_addr.s6_addr32[2] = mask6.sin6_addr.s6_addr32[3] = ~0;
mask6.sin6_scope_id = ~0;
if (!sc->gif_psrc || !sc->gif_pdst)
return EINVAL;
sc->encap_cookie6 = encap_attach(AF_INET6, -1, sc->gif_psrc,
(struct sockaddr *)&mask6, sc->gif_pdst, (struct sockaddr *)&mask6,
(struct protosw *)&in6_gif_protosw, sc);
#else
sc->encap_cookie6 = encap_attach_func(AF_INET6, -1, gif_encapcheck,
(struct protosw *)&in6_gif_protosw, sc);
#endif
if (sc->encap_cookie6 == NULL)
return EEXIST;
return 0;