diff options
Diffstat (limited to 'sbin/ifconfig/ifconfig.c')
-rw-r--r-- | sbin/ifconfig/ifconfig.c | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 1c0101d..1522450 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -81,15 +81,6 @@ static const char rcsid[] = /* Appletalk */ #include <netatalk/at.h> -/* XNS */ -#ifdef NS -#define NSIP -#include <netns/ns.h> -#include <netns/ns_if.h> -#endif - -/* OSI */ - #include <ctype.h> #include <err.h> #include <errno.h> @@ -317,10 +308,6 @@ af_status in6_status; af_getaddr in6_getaddr; af_getprefix in6_getprefix; #endif /*INET6*/ -#ifdef NS -af_status xns_status; -af_getaddr xns_getaddr; -#endif /* Known address families */ const @@ -349,10 +336,6 @@ struct afswtch { #endif { "atalk", AF_APPLETALK, at_status, at_getaddr, NULL, SIOCDIFADDR, SIOCAIFADDR, C(addreq), C(addreq) }, -#ifdef NS - { "ns", AF_NS, xns_status, xns_getaddr, NULL, - SIOCDIFADDR, SIOCAIFADDR, C(ridreq), C(addreq) }, -#endif { "link", AF_LINK, link_status, link_getaddr, NULL, 0, SIOCSIFLLADDR, NULL, C(ridreq) }, { "ether", AF_LINK, link_status, link_getaddr, NULL, @@ -708,18 +691,6 @@ ifconfig(int argc, char *const *argv, const struct afswtch *afp) #endif if (ifr.ifr_addr.sa_family == AF_APPLETALK) checkatrange((struct sockaddr_at *) &addreq.ifra_addr); -#ifdef NS - if (setipdst && ifr.ifr_addr.sa_family == AF_NS) { - struct nsip_req rq; - int size = sizeof(rq); - - rq.rq_ns = addreq.ifra_addr; - rq.rq_ip = addreq.ifra_dstaddr; - - if (setsockopt(s, 0, SO_NSIP_ROUTE, &rq, size) < 0) - Perror("Encapsulation Routing"); - } -#endif if (clearaddr) { if (afp->af_ridreq == NULL || afp->af_difaddr == 0) { warnx("interface %s cannot change %s addresses!", @@ -1472,30 +1443,6 @@ at_status(int s __unused, struct rt_addrinfo * info) putchar('\n'); } -#ifdef NS -void -xns_status(int s __unused, struct rt_addrinfo * info) -{ - struct sockaddr_ns *sns, null_sns; - - memset(&null_sns, 0, sizeof(null_sns)); - - sns = (struct sockaddr_ns *)info->rti_info[RTAX_IFA]; - printf("\tns %s ", ns_ntoa(sns->sns_addr)); - - if (flags & IFF_POINTOPOINT) { - sns = (struct sockaddr_ns *)info->rti_info[RTAX_BRD]; - if (!sns) - sns = &null_sns; - printf("--> %s ", ns_ntoa(sns->sns_addr)); - } - - putchar('\n'); - close(s); -} -#endif - - void link_status(int s __unused, struct rt_addrinfo *info) { @@ -1778,25 +1725,6 @@ printf("\tatalk %d.%d range %d-%d phase %d\n", sat->sat_range.r_netrange = at_nr; } -#ifdef NS -#define SNS(x) ((struct sockaddr_ns *) &(x)) -struct sockaddr_ns *snstab[] = { -SNS(ridreq.ifr_addr), SNS(addreq.ifra_addr), -SNS(addreq.ifra_mask), SNS(addreq.ifra_broadaddr)}; - -void -xns_getaddr(const char *addr, int which) -{ - struct sockaddr_ns *sns = snstab[which]; - - sns->sns_family = AF_NS; - sns->sns_len = sizeof(*sns); - sns->sns_addr = ns_addr(addr); - if (which == MASK) - printf("Attempt to set XNS netmask will be ineffectual\n"); -} -#endif - #ifdef INET6 int prefix(void *val, int size) |