Remove unimplemented IP-in-IPX encapsulation support (options IPTUNNEL).
This commit is contained in:
parent
471eab1868
commit
a7246ed45b
@ -378,7 +378,6 @@ options IPSEC_DEBUG #debug for IP security
|
||||
|
||||
options IPX #IPX/SPX communications protocols
|
||||
options IPXIP #IPX in IP encapsulation (not available)
|
||||
options IPTUNNEL #IP in IPX encapsulation (not available)
|
||||
|
||||
#options NCP #NetWare Core protocol
|
||||
|
||||
|
@ -1401,7 +1401,6 @@ netipx/ipx_ip.c optional ipx
|
||||
netipx/ipx_outputfl.c optional ipx
|
||||
netipx/ipx_pcb.c optional ipx
|
||||
netipx/ipx_proto.c optional ipx
|
||||
netipx/ipx_tun.c optional ipx
|
||||
netipx/ipx_usrreq.c optional ipx
|
||||
netipx/spx_debug.c optional ipx
|
||||
netipx/spx_usrreq.c optional ipx
|
||||
|
@ -349,7 +349,6 @@ IPV6FIREWALL_DEFAULT_TO_ACCEPT opt_ip6fw.h
|
||||
IPSTEALTH
|
||||
IPX opt_ipx.h
|
||||
IPXIP opt_ipx.h
|
||||
IPTUNNEL opt_ipx.h
|
||||
LIBMCHAIN
|
||||
NCP opt_ncp.h
|
||||
NETATALK opt_atalk.h
|
||||
|
@ -90,16 +90,6 @@ static struct protosw ipxsw[] = {
|
||||
0, 0, 0, 0,
|
||||
&ripx_usrreqs
|
||||
},
|
||||
#ifdef IPTUNNEL
|
||||
#if 0
|
||||
{ SOCK_RAW, &ipxdomain, IPPROTO_IPX, PR_ATOMIC|PR_ADDR,
|
||||
iptun_input, rip_output, iptun_ctlinput, 0,
|
||||
0,
|
||||
0, 0, 0, 0,
|
||||
&rip_usrreqs
|
||||
},
|
||||
#endif
|
||||
#endif
|
||||
};
|
||||
|
||||
static struct domain ipxdomain =
|
||||
|
@ -1,42 +0,0 @@
|
||||
/*
|
||||
* Modifications Copyright (c) 1995, Mike Mitchell
|
||||
* Copyright (c) 1984, 1985, 1986, 1987, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. All advertising materials mentioning features or use of this software
|
||||
* must display the following acknowledgement:
|
||||
* This product includes software developed by the University of
|
||||
* California, Berkeley and its contributors.
|
||||
* 4. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_tun.c
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
/*
|
||||
* Software interface driver for encapsulating IP in IPX.
|
||||
* XXX not implemented.
|
||||
*/
|
@ -404,13 +404,6 @@ ipx_ctloutput(so, sopt)
|
||||
error = ipxip_route(so, sopt);
|
||||
break;
|
||||
#endif /* IPXIP */
|
||||
#ifdef IPTUNNEL
|
||||
#if 0
|
||||
case SO_IPXTUNNEL_ROUTE:
|
||||
error = ipxtun_route(so, sopt);
|
||||
break;
|
||||
#endif
|
||||
#endif
|
||||
default:
|
||||
error = EINVAL;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user