aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet6
diff options
context:
space:
mode:
authorHajimu UMEMOTO <ume@FreeBSD.org>2002-10-16 20:16:49 +0000
committerHajimu UMEMOTO <ume@FreeBSD.org>2002-10-16 20:16:49 +0000
commitab94625826127118de82643f457dd0b7370df04f (patch)
treed0ebcfbaadb72dfc8cded482ff7096cc7e5502ab /sys/netinet6
parenta91db09ec069e962dd16f4ae050f13beefab2830 (diff)
downloadsrc-ab94625826127118de82643f457dd0b7370df04f.tar.gz
src-ab94625826127118de82643f457dd0b7370df04f.zip
use encapcheck.
Obtained from: KAME MFC after: 3 weeks
Notes
Notes: svn path=/head/; revision=105295
Diffstat (limited to 'sys/netinet6')
-rw-r--r--sys/netinet6/in6_gif.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index 83a2fe6263d1..50e37c392a2b 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -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;