diff options
author | glebius <glebius@FreeBSD.org> | 2014-03-14 02:58:48 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2014-03-14 02:58:48 +0000 |
commit | d494babace1c51efd0d2c4582515a1e1ae5fa9d2 (patch) | |
tree | 289644ca4a3bc9d349466888b297c5a34d00e321 /sbin | |
parent | a4fb4957a59109b80df9cabe72982fd067c6f5d1 (diff) | |
download | FreeBSD-src-d494babace1c51efd0d2c4582515a1e1ae5fa9d2.zip FreeBSD-src-d494babace1c51efd0d2c4582515a1e1ae5fa9d2.tar.gz |
Remove IPX support.
IPX was a network transport protocol in Novell's NetWare network operating
system from late 80s and then 90s. The NetWare itself switched to TCP/IP
as default transport in 1998. Later, in this century the Novell Open
Enterprise Server became successor of Novell NetWare. The last release
that claimed to still support IPX was OES 2 in 2007. Routing equipment
vendors (e.g. Cisco) discontinued support for IPX in 2011.
Thus, IPX won't be supported in FreeBSD 11.0-RELEASE.
Diffstat (limited to 'sbin')
-rw-r--r-- | sbin/ifconfig/Makefile | 5 | ||||
-rw-r--r-- | sbin/ifconfig/af_ipx.c | 118 | ||||
-rw-r--r-- | sbin/ifconfig/ifconfig.8 | 10 | ||||
-rw-r--r-- | sbin/ifconfig/ifconfig.c | 15 | ||||
-rw-r--r-- | sbin/route/route.8 | 1 |
5 files changed, 0 insertions, 149 deletions
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile index a10d1fb..7393da4 100644 --- a/sbin/ifconfig/Makefile +++ b/sbin/ifconfig/Makefile @@ -53,11 +53,6 @@ CFLAGS+= -DINET6 .if ${MK_INET_SUPPORT} != "no" CFLAGS+= -DINET .endif -.if ${MK_IPX_SUPPORT} != "no" && !defined(RELEASE_CRUNCH) -SRCS+= af_ipx.c # IPX support -DPADD+= ${LIBIPX} -LDADD+= -lipx -.endif .if ${MK_JAIL} != "no" && !defined(RELEASE_CRUNCH) && !defined(RESCUE) CFLAGS+= -DJAIL DPADD+= ${LIBJAIL} diff --git a/sbin/ifconfig/af_ipx.c b/sbin/ifconfig/af_ipx.c deleted file mode 100644 index bc5d500..0000000 --- a/sbin/ifconfig/af_ipx.c +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (c) 1983, 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. - * 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. - */ - -#ifndef lint -static const char rcsid[] = - "$FreeBSD$"; -#endif /* not lint */ - -#include <sys/types.h> -#include <sys/ioctl.h> -#include <sys/socket.h> -#include <net/if.h> - -#include <err.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <ifaddrs.h> - -#include <net/if_var.h> -#define IPTUNNEL -#include <netipx/ipx.h> -#include <netipx/ipx_if.h> - -#include "ifconfig.h" - -static struct ifaliasreq ipx_addreq; -static struct ifreq ipx_ridreq; - -static void -ipx_status(int s __unused, const struct ifaddrs *ifa) -{ - struct sockaddr_ipx *sipx, null_sipx; - - sipx = (struct sockaddr_ipx *)ifa->ifa_addr; - if (sipx == NULL) - return; - - printf("\tipx %s ", ipx_ntoa(sipx->sipx_addr)); - - if (ifa->ifa_flags & IFF_POINTOPOINT) { - sipx = (struct sockaddr_ipx *)ifa->ifa_dstaddr; - if (sipx == NULL) { - memset(&null_sipx, 0, sizeof(null_sipx)); - sipx = &null_sipx; - } - printf("--> %s ", ipx_ntoa(sipx->sipx_addr)); - } - putchar('\n'); -} - -#define SIPX(x) ((struct sockaddr_ipx *) &(x)) -struct sockaddr_ipx *sipxtab[] = { - SIPX(ipx_ridreq.ifr_addr), SIPX(ipx_addreq.ifra_addr), - SIPX(ipx_addreq.ifra_mask), SIPX(ipx_addreq.ifra_broadaddr) -}; - -static void -ipx_getaddr(const char *addr, int which) -{ - struct sockaddr_ipx *sipx = sipxtab[which]; - - sipx->sipx_family = AF_IPX; - sipx->sipx_len = sizeof(*sipx); - sipx->sipx_addr = ipx_addr(addr); - if (which == MASK) - printf("Attempt to set IPX netmask will be ineffectual\n"); -} - -static void -ipx_postproc(int s, const struct afswtch *afp) -{ - -} - -static struct afswtch af_ipx = { - .af_name = "ipx", - .af_af = AF_IPX, - .af_status = ipx_status, - .af_getaddr = ipx_getaddr, - .af_postproc = ipx_postproc, - .af_difaddr = SIOCDIFADDR, - .af_aifaddr = SIOCAIFADDR, - .af_ridreq = &ipx_ridreq, - .af_addreq = &ipx_addreq, -}; - -static __constructor void -ipx_ctor(void) -{ - af_register(&af_ipx); -} diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index 83065f1..0bf92d7 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -159,12 +159,8 @@ supported are .Dq inet , .Dq inet6 , .Dq atalk , -.Dq ipx , -.\" .Dq iso , and .Dq link . -.\" and -.\" .Dq ns . The default if available is .Dq inet or otherwise @@ -309,12 +305,6 @@ using the kernel configuration option, or the .Va net.fibs tunable. -.It Cm ipdst -This is used to specify an Internet host who is willing to receive -IP packets encapsulating IPX packets bound for a remote network. -An apparent point to point link is constructed, and -the address specified will be taken as the IPX address and network -of the destination. .It Cm maclabel Ar label If Mandatory Access Control support is enabled in the kernel, set the MAC label to diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index eb16aec..d2ddeca 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -741,20 +741,6 @@ setifbroadaddr(const char *addr, int dummy __unused, int s, } static void -setifipdst(const char *addr, int dummy __unused, int s, - const struct afswtch *afp) -{ - const struct afswtch *inet; - - inet = af_getbyname("inet"); - if (inet == NULL) - return; - inet->af_getaddr(addr, DSTADDR); - clearaddr = 0; - newaddr = 0; -} - -static void notealias(const char *addr, int param, int s, const struct afswtch *afp) { #define rqtosa(x) (&(((struct ifreq *)(afp->x))->ifr_addr)) @@ -1176,7 +1162,6 @@ static struct cmd basic_cmds[] = { DEF_CMD_ARG("netmask", setifnetmask), DEF_CMD_ARG("metric", setifmetric), DEF_CMD_ARG("broadcast", setifbroadaddr), - DEF_CMD_ARG("ipdst", setifipdst), DEF_CMD_ARG2("tunnel", settunnel), DEF_CMD("-tunnel", 0, deletetunnel), DEF_CMD("deletetunnel", 0, deletetunnel), diff --git a/sbin/route/route.8 b/sbin/route/route.8 index 2240038..ecfeac6 100644 --- a/sbin/route/route.8 +++ b/sbin/route/route.8 @@ -487,7 +487,6 @@ The next-hop gateway should be reachable through a different route. .Xr netintro 4 , .Xr route 4 , .Xr arp 8 , -.Xr IPXrouted 8 , .Xr routed 8 .\".Xr XNSrouted 8 .Sh HISTORY |