diff options
| -rw-r--r-- | sys/net/route.c | 33 | ||||
| -rw-r--r-- | sys/net/route.h | 11 |
2 files changed, 7 insertions, 37 deletions
diff --git a/sys/net/route.c b/sys/net/route.c index a1a4539ece2..111efeb4d01 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route.c,v 1.20 2000/12/09 03:06:55 itojun Exp $ */ +/* $OpenBSD: route.c,v 1.21 2000/12/09 03:15:25 itojun Exp $ */ /* $NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $ */ /* @@ -157,7 +157,7 @@ okaytoclone(flags, howstrict) { if (howstrict == ALL_CLONING) return 1; - if (howstrict == ONNET_CLONING && !(flags & (RTF_GATEWAY|RTF_TUNNEL))) + if (howstrict == ONNET_CLONING && !(flags & RTF_GATEWAY)) return 1; return 0; } @@ -456,7 +456,7 @@ ifa_ifwithroute(flags, dst, gateway) return (NULL); rt->rt_refcnt--; /* The gateway must be local if the same address family. */ - if (!(flags & RTF_TUNNEL) && (rt->rt_flags & RTF_GATEWAY) && + if ((rt->rt_flags & RTF_GATEWAY) && rt_key(rt)->sa_family == dst->sa_family) return (0); if ((ifa = rt->rt_ifa) == NULL) @@ -572,22 +572,6 @@ if (!rt->rt_rmx.rmx_mtu && !(rt->rt_rmx.rmx_locks & RTV_MTU)) { /* XXX */ *ret_nrt = rt; rt->rt_refcnt++; } -#ifdef INET6 - /* If we have a v4_in_v4 or a v4_in_v6 tunnel route - * then do some tunnel state (e.g. security state) - * initialization. - * - * Since IPV6 packets flow down this path, we don't - * want it using ipv4_tunnelsetup(rt) (since they - * have their own ipv6_tunnel_parent/child() - * routines which are called ipv6_rtrequest().) - * - * Thus, we check to see if the packet is to a v4 - * destination. - */ - if (dst->sa_family == AF_INET && (rt->rt_flags & RTF_TUNNEL)) - ipv4_tunnelsetup(rt); -#endif /* INET6 */ break; } bad: @@ -595,17 +579,6 @@ bad: return (error); } -/* - * Set up any tunnel states (e.g. security) information - * for v4_in_v4 or v4_in_v6 tunnel routes. - */ -void -ipv4_tunnelsetup(rt) - register struct rtentry *rt; -{ - /* XXX */ -} - int rt_setgate(rt0, dst, gate) struct rtentry *rt0; diff --git a/sys/net/route.h b/sys/net/route.h index 088213cdd95..43850470ff3 100644 --- a/sys/net/route.h +++ b/sys/net/route.h @@ -1,4 +1,4 @@ -/* $OpenBSD: route.h,v 1.9 2000/12/09 03:06:55 itojun Exp $ */ +/* $OpenBSD: route.h,v 1.10 2000/12/09 03:15:25 itojun Exp $ */ /* $NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $ */ /* @@ -141,12 +141,10 @@ struct ortentry { #define RTF_PROTO2 0x4000 /* protocol specific routing flag */ #define RTF_PROTO1 0x8000 /* protocol specific routing flag */ -/* - * New IPv6 routing flags. - * - * PROTO1 and PROTO2 are used, and defined in netinet6/ipv6_var.h. - */ +#ifndef _KERNEL +/* obsoleted */ #define RTF_TUNNEL 0x100000 /* Tunnelling bit. */ +#endif /* * Routing statistics. @@ -323,5 +321,4 @@ void rtredirect __P((struct sockaddr *, struct sockaddr *, int rtrequest __P((int, struct sockaddr *, struct sockaddr *, struct sockaddr *, int, struct rtentry **)); -void ipv4_tunnelsetup __P((struct rtentry *)); #endif /* _KERNEL */ |