Remove AppleTalk support

Prepare update to FreeBSD 11.

3 files changed, 0 insertions, 245 deletions

diff --git a/freebsd/sbin/ifconfig/af_atalk.c b/freebsd/sbin/ifconfig/af_atalk.c
deleted file mode 100644
index 21af7fb5..00000000
--- a/freebsd/sbin/ifconfig/af_atalk.c
+++ /dev/null
@@ -1,192 +0,0 @@
-#include <machine/rtems-bsd-user-space.h>
-
-/*
- * Copyright (c) 1983, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <net/if.h>
-
-#include <netatalk/at.h>
-
-#include <err.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ifaddrs.h>
-
-#include <arpa/inet.h>
-
-#include "ifconfig.h"
-
-static struct netrange at_nr;		/* AppleTalk net range */
-static struct ifaliasreq at_addreq;
-
-/* XXX  FIXME -- should use strtoul for better parsing. */
-static void
-setatrange(const char *range, int dummy __unused, int s, 
-    const struct afswtch *afp)
-{
-	u_int	first = 123, last = 123;
-
-	if (sscanf(range, "%u-%u", &first, &last) != 2
-	    || first == 0 || first > 0xffff
-	    || last == 0 || last > 0xffff || first > last)
-		errx(1, "%s: illegal net range: %u-%u", range, first, last);
-	at_nr.nr_firstnet = htons(first);
-	at_nr.nr_lastnet = htons(last);
-}
-
-static void
-setatphase(const char *phase, int dummy __unused, int s, 
-    const struct afswtch *afp)
-{
-	if (!strcmp(phase, "1"))
-		at_nr.nr_phase = 1;
-	else if (!strcmp(phase, "2"))
-		at_nr.nr_phase = 2;
-	else
-		errx(1, "%s: illegal phase", phase);
-}
-
-static void
-at_status(int s __unused, const struct ifaddrs *ifa)
-{
-	struct sockaddr_at *sat, null_sat;
-	struct netrange *nr;
-
-	memset(&null_sat, 0, sizeof(null_sat));
-
-	sat = (struct sockaddr_at *)ifa->ifa_addr;
-	if (sat == NULL)
-		return;
-	nr = &sat->sat_range.r_netrange;
-	printf("\tatalk %d.%d range %d-%d phase %d",
-		ntohs(sat->sat_addr.s_net), sat->sat_addr.s_node,
-		ntohs(nr->nr_firstnet), ntohs(nr->nr_lastnet), nr->nr_phase);
-	if (ifa->ifa_flags & IFF_POINTOPOINT) {
-		sat = (struct sockaddr_at *)ifa->ifa_dstaddr;
-		if (sat == NULL)
-			sat = &null_sat;
-		printf("--> %d.%d",
-			ntohs(sat->sat_addr.s_net), sat->sat_addr.s_node);
-	}
-	if (ifa->ifa_flags & IFF_BROADCAST) {
-		sat = (struct sockaddr_at *)ifa->ifa_broadaddr;
-		if (sat != NULL)
-			printf(" broadcast %d.%d",
-				ntohs(sat->sat_addr.s_net),
-				sat->sat_addr.s_node);
-	}
-
-	putchar('\n');
-}
-
-static void
-at_getaddr(const char *addr, int which)
-{
-	struct sockaddr_at *sat = (struct sockaddr_at *) &at_addreq.ifra_addr;
-	u_int net, node;
-
-	sat->sat_family = AF_APPLETALK;
-	sat->sat_len = sizeof(*sat);
-	if (which == MASK)
-		errx(1, "AppleTalk does not use netmasks");
-	if (sscanf(addr, "%u.%u", &net, &node) != 2
-	    || net > 0xffff || node > 0xfe)
-		errx(1, "%s: illegal address", addr);
-	sat->sat_addr.s_net = htons(net);
-	sat->sat_addr.s_node = node;
-}
-
-static void
-at_postproc(int s, const struct afswtch *afp)
-{
-	struct sockaddr_at *sat = (struct sockaddr_at *) &at_addreq.ifra_addr;
-
-	if (at_nr.nr_phase == 0)
-		at_nr.nr_phase = 2;	/* Default phase 2 */
-	if (at_nr.nr_firstnet == 0)
-		at_nr.nr_firstnet =	/* Default range of one */
-		at_nr.nr_lastnet = sat->sat_addr.s_net;
-	printf("\tatalk %d.%d range %d-%d phase %d\n",
-		ntohs(sat->sat_addr.s_net), sat->sat_addr.s_node,
-		ntohs(at_nr.nr_firstnet), ntohs(at_nr.nr_lastnet),
-		at_nr.nr_phase);
-	if ((u_short) ntohs(at_nr.nr_firstnet) >
-			(u_short) ntohs(sat->sat_addr.s_net)
-		    || (u_short) ntohs(at_nr.nr_lastnet) <
-			(u_short) ntohs(sat->sat_addr.s_net))
-		errx(1, "AppleTalk address is not in range");
-	sat->sat_range.r_netrange = at_nr;
-}
-
-static struct cmd atalk_cmds[] = {
-	DEF_CMD_ARG("range",	setatrange),
-	DEF_CMD_ARG("phase",	setatphase),
-};
-
-static struct afswtch af_atalk = {
-	.af_name	= "atalk",
-	.af_af		= AF_APPLETALK,
-	.af_status	= at_status,
-	.af_getaddr	= at_getaddr,
-	.af_postproc	= at_postproc,
-	.af_difaddr	= SIOCDIFADDR,
-	.af_aifaddr	= SIOCAIFADDR,
-	.af_ridreq	= &at_addreq,
-	.af_addreq	= &at_addreq,
-};
-
-#ifndef __rtems__
-static __constructor void
-#else /* __rtems__ */
-void
-#endif /* __rtems__ */
-atalk_ctor(void)
-{
-#ifdef __rtems__
-	memset(&at_nr, 0, sizeof(at_nr));
-	memset(&at_addreq, 0, sizeof(at_addreq));
-#endif /* __rtems__ */
-#define	N(a)	(sizeof(a) / sizeof(a[0]))
-	size_t i;
-
-	for (i = 0; i < N(atalk_cmds);  i++)
-		cmd_register(&atalk_cmds[i]);
-	af_register(&af_atalk);
-#undef N
-}
diff --git a/freebsd/sbin/ifconfig/ifconfig.c b/freebsd/sbin/ifconfig/ifconfig.c
index 8090261e..041e53d0 100644
--- a/freebsd/sbin/ifconfig/ifconfig.c
+++ b/freebsd/sbin/ifconfig/ifconfig.c
@@ -171,7 +171,6 @@ int rtems_bsd_command_ifconfig(int argc, char *argv[])
 
 	ifconfig_ctor();
 
-	atalk_ctor();
 	bridge_ctor();
 	carp_ctor();
 	clone_ctor();
diff --git a/freebsd/sbin/route/route.c b/freebsd/sbin/route/route.c
index c5585f5c..f2d73587 100644
--- a/freebsd/sbin/route/route.c
+++ b/freebsd/sbin/route/route.c
@@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if_dl.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netatalk/at.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 
@@ -110,7 +109,6 @@ struct rt_ctx {
 #ifdef INET6
 		struct	sockaddr_in6 sin6;
 #endif
-		struct	sockaddr_at sat;
 		struct	sockaddr_dl sdl;
 		struct	sockaddr_inarp sinarp;
 		struct	sockaddr_storage ss; /* added to avoid memory overrun */
@@ -144,8 +142,6 @@ struct rt_ctx rt_ctx;
 
 typedef union sockunion *sup;
 
-static int	atalk_aton(const char *, struct at_addr *);
-static char	*atalk_ntoa(struct at_addr, char [20]);
 static void	bprintf(FILE *, int, const char *);
 static void	flushroutes(struct rt_ctx *, int argc, char *argv[]);
 static int	flushroutes_fib(struct rt_ctx *, int);
@@ -637,7 +633,6 @@ static const char *
 routename(struct rt_ctx *c, struct sockaddr *sa)
 {
 	const char *cp;
-	char atalk_buf[20];
 	struct hostent *hp;
 	int n;
 
@@ -714,11 +709,6 @@ routename(struct rt_ctx *c, struct sockaddr *sa)
 	}
 #endif
 
-	case AF_APPLETALK:
-		(void) snprintf(c->rt_line, sizeof(c->rt_line), "atalk %s",
-			atalk_ntoa(((struct sockaddr_at *)sa)->sat_addr, atalk_buf));
-		break;
-
 	case AF_LINK:
 		return (link_ntoa((struct sockaddr_dl *)sa));
 
@@ -748,7 +738,6 @@ const char *
 netname(struct rt_ctx *c, struct sockaddr *sa)
 {
 	const char *cp = NULL;
-	char atalk_buf[20];
 	struct netent *np = NULL;
 	u_long net, mask;
 	u_long i;
@@ -840,11 +829,6 @@ netname(struct rt_ctx *c, struct sockaddr *sa)
 	}
 #endif
 
-	case AF_APPLETALK:
-		(void) snprintf(c->net_line, sizeof(c->net_line), "atalk %s",
-			atalk_ntoa(((struct sockaddr_at *)sa)->sat_addr, atalk_buf));
-		break;
-
 	case AF_LINK:
 		return (link_ntoa((struct sockaddr_dl *)sa));
 
@@ -942,10 +926,6 @@ newroute(struct rt_ctx *c, int argc, char **argv)
 				c->aflen = sizeof(struct sockaddr_in6);
 				break;
 #endif
-			case K_ATALK:
-				c->af = AF_APPLETALK;
-				c->aflen = sizeof(struct sockaddr_at);
-				break;
 			case K_SA:
 				c->af = PF_ROUTE;
 				c->aflen = sizeof(union sockunion);
@@ -1423,12 +1403,6 @@ getaddr(struct rt_ctx *c, int which, char *str, struct hostent **hpp, int nrflag
 	}
 #endif /* INET6 */
 
-	case AF_APPLETALK:
-		if (!atalk_aton(str, &su->sat.sat_addr))
-			errx(EX_NOHOST, "bad address: %s", str);
-		c->rtm_addrs |= RTA_NETMASK;
-		return(c->forcehost || su->sat.sat_addr.s_node != 0);
-
 	case AF_LINK:
 		link_addr(str, &su->sdl);
 		return (1);
@@ -2034,8 +2008,6 @@ keyword(const char *cp)
 static void
 sodump(sup su, const char *which)
 {
-	char atalk_buf[20];
-
 	switch (su->sa.sa_family) {
 	case AF_LINK:
 		(void) printf("%s: link %s; ",
@@ -2045,10 +2017,6 @@ sodump(sup su, const char *which)
 		(void) printf("%s: inet %s; ",
 		    which, inet_ntoa(su->sin.sin_addr));
 		break;
-	case AF_APPLETALK:
-		(void) printf("%s: atalk %s; ",
-		    which, atalk_ntoa(su->sat.sat_addr, atalk_buf));
-		break;
 	}
 	(void) fflush(stdout);
 }
@@ -2103,23 +2071,3 @@ sockaddr(char *addr, struct sockaddr *sa)
 	} while (cp < cplim);
 	sa->sa_len = cp - (char *)sa;
 }
-
-static int
-atalk_aton(const char *text, struct at_addr *addr)
-{
-	u_int net, node;
-
-	if (sscanf(text, "%u.%u", &net, &node) != 2
-	    || net > 0xffff || node > 0xff)
-		return(0);
-	addr->s_net = htons(net);
-	addr->s_node = node;
-	return(1);
-}
-
-static char *
-atalk_ntoa(struct at_addr at, char buf[20])
-{
-	(void) snprintf(buf, sizeof(buf), "%u.%u", ntohs(at.s_net), at.s_node);
-	return(buf);
-}