summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2007-06-13 18:07:59 +0000
committerrwatson <rwatson@FreeBSD.org>2007-06-13 18:07:59 +0000
commitb936eeb39ddebd2dd21440a77901dc032bd0f608 (patch)
tree98fb7c4ffa2afe3d88771757ae161ff33fcae39c /sbin
parent9156605d1956d8c6eb3d35a32e906f368ca7a2b5 (diff)
downloadFreeBSD-src-b936eeb39ddebd2dd21440a77901dc032bd0f608.zip
FreeBSD-src-b936eeb39ddebd2dd21440a77901dc032bd0f608.tar.gz
Remove IPX over IP tunneling pieces from ifconfig(8), omitted portion of
previous commit: Remove IPX over IP tunneling support, which allows IPX routing over IP tunnels, and was not MPSAFE. The code can be easily restored in the event that someone with an IPX over IP tunnel configuration can work with me to test patches. This removes one of five remaining consumers of NET_NEEDS_GIANT. Approved by: re (kensmith) Spotted by: Artem Naluzhny <tutat nhamon dot com dot ua>
Diffstat (limited to 'sbin')
-rw-r--r--sbin/ifconfig/af_ipx.c10
-rw-r--r--sbin/ifconfig/ifconfig.c2
-rw-r--r--sbin/ifconfig/ifconfig.h1
3 files changed, 0 insertions, 13 deletions
diff --git a/sbin/ifconfig/af_ipx.c b/sbin/ifconfig/af_ipx.c
index dd98d7e..bc5d500 100644
--- a/sbin/ifconfig/af_ipx.c
+++ b/sbin/ifconfig/af_ipx.c
@@ -44,7 +44,6 @@ static const char rcsid[] =
#include <ifaddrs.h>
#include <net/if_var.h>
-#define IPXIP
#define IPTUNNEL
#include <netipx/ipx.h>
#include <netipx/ipx_if.h>
@@ -97,16 +96,7 @@ ipx_getaddr(const char *addr, int which)
static void
ipx_postproc(int s, const struct afswtch *afp)
{
- if (setipdst) {
- struct ipxip_req rq;
- int size = sizeof(rq);
- rq.rq_ipx = ipx_addreq.ifra_addr;
- rq.rq_ip = ipx_addreq.ifra_dstaddr;
-
- if (setsockopt(s, 0, SO_IPXIP_ROUTE, &rq, size) < 0)
- Perror("Encapsulation Routing");
- }
}
static struct afswtch af_ipx = {
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index f072ea8..153147c 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -83,7 +83,6 @@ struct ifreq ifr;
char name[IFNAMSIZ];
int setaddr;
-int setipdst;
int setmask;
int doalias;
int clearaddr;
@@ -616,7 +615,6 @@ setifipdst(const char *addr, int dummy __unused, int s,
if (inet == NULL)
return;
inet->af_getaddr(addr, DSTADDR);
- setipdst++;
clearaddr = 0;
newaddr = 0;
}
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index d14d240..5ef36c9 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -129,7 +129,6 @@ extern int supmedia;
extern int printkeys;
extern int newaddr;
extern int verbose;
-extern int setipdst;
void setifcap(const char *, int value, int s, const struct afswtch *);
OpenPOWER on IntegriCloud