summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sbin/ifconfig/ifconfig.c72
-rw-r--r--sbin/route/route.c110
2 files changed, 0 insertions, 182 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)
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 8d9a0ff..7cdd7ce 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -58,9 +58,6 @@ static const char rcsid[] =
#include <netinet/in.h>
#include <netinet/if_ether.h>
#include <netatalk/at.h>
-#ifdef NS
-#include <netns/ns.h>
-#endif
#include <arpa/inet.h>
#include <netdb.h>
@@ -91,9 +88,6 @@ union sockunion {
struct sockaddr_in6 sin6;
#endif
struct sockaddr_at sat;
-#ifdef NS
- struct sockaddr_ns sns;
-#endif
struct sockaddr_dl sdl;
struct sockaddr_inarp sinarp;
struct sockaddr_storage ss; /* added to avoid memory overrun */
@@ -238,11 +232,6 @@ flushroutes(argc, argv)
case K_ATALK:
af = AF_APPLETALK;
break;
-#ifdef NS
- case K_XNS:
- af = AF_NS;
- break;
-#endif
case K_LINK:
af = AF_LINK;
break;
@@ -314,9 +303,6 @@ routename(sa)
struct hostent *hp;
static char domain[MAXHOSTNAMELEN + 1];
static int first = 1, n;
-#ifdef NS
- char *ns_print();
-#endif
if (first) {
first = 0;
@@ -396,11 +382,6 @@ routename(sa)
atalk_ntoa(((struct sockaddr_at *)sa)->sat_addr));
break;
-#ifdef NS
- case AF_NS:
- return (ns_print((struct sockaddr_ns *)sa));
-#endif
-
case AF_LINK:
return (link_ntoa((struct sockaddr_dl *)sa));
@@ -435,9 +416,6 @@ netname(sa)
u_long net, mask;
u_long i;
int n, subnetshift;
-#ifdef NS
- char *ns_print();
-#endif
switch (sa->sa_family) {
@@ -532,12 +510,6 @@ netname(sa)
atalk_ntoa(((struct sockaddr_at *)sa)->sat_addr));
break;
-#ifdef NS
- case AF_NS:
- return (ns_print((struct sockaddr_ns *)sa));
- break;
-#endif
-
case AF_LINK:
return (link_ntoa((struct sockaddr_dl *)sa));
@@ -627,12 +599,6 @@ newroute(argc, argv)
af = PF_ROUTE;
aflen = sizeof(union sockunion);
break;
-#ifdef NS
- case K_XNS:
- af = AF_NS;
- aflen = sizeof(struct sockaddr_ns);
- break;
-#endif
case K_IFACE:
case K_INTERFACE:
iflag++;
@@ -1032,22 +998,6 @@ getaddr(which, s, hpp)
}
#endif /* INET6 */
-#ifdef NS
- case AF_NS:
- if (which == RTA_DST) {
- extern short ns_bh[3];
- struct sockaddr_ns *sms = &(so_mask.sns);
- memset(sms, 0, sizeof(*sms));
- sms->sns_family = 0;
- sms->sns_len = 6;
- sms->sns_addr.x_net = *(union ns_net *)ns_bh;
- rtm_addrs |= RTA_NETMASK;
- }
- su->sns.sns_addr = ns_addr(s);
- return (!ns_nullhost(su->sns.sns_addr));
-#endif
-
-
case AF_APPLETALK:
if (!atalk_aton(s, &su->sat.sat_addr))
errx(EX_NOHOST, "bad address: %s", s);
@@ -1158,57 +1108,6 @@ prefixlen(s)
return len;
}
-#ifdef NS
-short ns_nullh[] = {0,0,0};
-short ns_bh[] = {-1,-1,-1};
-
-char *
-ns_print(sns)
- struct sockaddr_ns *sns;
-{
- struct ns_addr work;
- union { union ns_net net_e; u_long long_e; } net;
- u_short port;
- static char mybuf[50+MAXHOSTNAMELEN], cport[10], chost[25];
- char *host = "";
- char *p;
- u_char *q;
-
- work = sns->sns_addr;
- port = ntohs(work.x_port);
- work.x_port = 0;
- net.net_e = work.x_net;
- if (ns_nullhost(work) && net.long_e == 0) {
- if (!port)
- return ("*.*");
- (void) sprintf(mybuf, "*.%XH", port);
- return (mybuf);
- }
-
- if (memcmp(ns_bh, work.x_host.c_host, 6) == 0)
- host = "any";
- else if (memcmp(ns_nullh, work.x_host.c_host, 6) == 0)
- host = "*";
- else {
- q = work.x_host.c_host;
- (void) sprintf(chost, "%02X%02X%02X%02X%02X%02XH",
- q[0], q[1], q[2], q[3], q[4], q[5]);
- for (p = chost; *p == '0' && p < chost + 12; p++)
- /* void */;
- host = p;
- }
- if (port)
- (void) sprintf(cport, ".%XH", htons(port));
- else
- *cport = 0;
-
- (void) snprintf(mybuf, sizeof(mybuf), "%lxH.%s%s",
- (unsigned long)ntohl(net.long_e),
- host, cport);
- return (mybuf);
-}
-#endif
-
void
interfaces()
{
@@ -1344,9 +1243,6 @@ mask_addr()
if ((rtm_addrs & RTA_DST) == 0)
return;
switch (so_dst.sa.sa_family) {
-#ifdef NS
- case AF_NS:
-#endif
case AF_INET:
#ifdef INET6
case AF_INET6:
@@ -1661,12 +1557,6 @@ sodump(su, which)
(void) printf("%s: atalk %s; ",
which, atalk_ntoa(su->sat.sat_addr));
break;
-#ifdef NS
- case AF_NS:
- (void) printf("%s: xns %s; ",
- which, ns_ntoa(su->sns.sns_addr));
- break;
-#endif
}
(void) fflush(stdout);
}
OpenPOWER on IntegriCloud