From b936eeb39ddebd2dd21440a77901dc032bd0f608 Mon Sep 17 00:00:00 2001
From: rwatson <rwatson@FreeBSD.org>
Date: Wed, 13 Jun 2007 18:07:59 +0000
Subject: 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>
---
 sbin/ifconfig/af_ipx.c   | 10 ----------
 sbin/ifconfig/ifconfig.c |  2 --
 sbin/ifconfig/ifconfig.h |  1 -
 3 files changed, 13 deletions(-)

(limited to 'sbin')

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 *);
 
-- 
cgit v1.1