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>
This commit is contained in:
parent
9156605d19
commit
b936eeb39d
@ -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 = {
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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 *);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user