svn commit: r263152 - in head: . etc/mtree include sbin/ifconfig sbin/route share/man/man4 share/man/man7 share/man/man9 sys sys/amd64/amd64 sys/conf sys/i386/i386 sys/kern sys/modules/if_gre sys/m...
Gleb Smirnoff
glebius at FreeBSD.org
Fri Mar 14 06:29:51 UTC 2014
Author: glebius
Date: Fri Mar 14 06:29:43 2014
New Revision: 263152
URL: http://svnweb.freebsd.org/changeset/base/263152
Log:
Remove AppleTalk support.
AppleTalk was a network transport protocol for Apple Macintosh devices
in 80s and then 90s. Starting with Mac OS X in 2000 the AppleTalk was
a legacy protocol and primary networking protocol is TCP/IP. The last
Mac OS X release to support AppleTalk happened in 2009. The same year
routing equipment vendors (namely Cisco) end their support.
Thus, AppleTalk won't be supported in FreeBSD 11.0-RELEASE.
Deleted:
head/sbin/ifconfig/af_atalk.c
head/sys/netatalk/
head/sys/security/mac/mac_atalk.c
head/tools/regression/netatalk/
head/usr.bin/netstat/atalk.c
Modified:
head/ObsoleteFiles.inc
head/etc/mtree/BSD.include.dist
head/include/Makefile
head/sbin/ifconfig/Makefile
head/sbin/ifconfig/ifconfig.8
head/sbin/route/keywords
head/sbin/route/route.8
head/sbin/route/route.c
head/share/man/man4/gre.4
head/share/man/man4/netgraph.4
head/share/man/man4/ng_iface.4
head/share/man/man7/hier.7
head/share/man/man9/netisr.9
head/sys/Makefile
head/sys/amd64/amd64/machdep.c
head/sys/conf/NOTES
head/sys/conf/files
head/sys/conf/options
head/sys/i386/i386/machdep.c
head/sys/kern/Make.tags.inc
head/sys/kern/kern_jail.c
head/sys/kern/subr_witness.c
head/sys/modules/if_gre/Makefile
head/sys/modules/if_tun/Makefile
head/sys/modules/netgraph/iface/Makefile
head/sys/net/if_ethersubr.c
head/sys/net/if_fddisubr.c
head/sys/net/if_gre.c
head/sys/net/if_loop.c
head/sys/net/if_spppfr.c
head/sys/net/if_tun.c
head/sys/net/netisr.h
head/sys/netgraph/ng_cisco.c
head/sys/netgraph/ng_iface.c
head/sys/netgraph/ng_iface.h
head/sys/netgraph/ng_ksocket.c
head/sys/netinet/ip_gre.c
head/sys/pc98/pc98/machdep.c
head/sys/security/mac/mac_framework.h
head/sys/security/mac/mac_policy.h
head/sys/security/mac_biba/mac_biba.c
head/sys/security/mac_lomac/mac_lomac.c
head/sys/security/mac_mls/mac_mls.c
head/sys/security/mac_stub/mac_stub.c
head/sys/security/mac_test/mac_test.c
head/sys/sys/param.h
head/sys/sys/priv.h
head/tools/regression/README
head/tools/tools/net80211/wlanwatch/wlanwatch.c
head/tools/tools/net80211/wlanwds/wlanwds.c
head/usr.bin/kdump/kdump.c
head/usr.bin/netstat/Makefile
head/usr.bin/netstat/if.c
head/usr.bin/netstat/main.c
head/usr.bin/netstat/netstat.1
head/usr.bin/netstat/netstat.h
head/usr.bin/netstat/route.c
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Fri Mar 14 04:35:18 2014 (r263151)
+++ head/ObsoleteFiles.inc Fri Mar 14 06:29:43 2014 (r263152)
@@ -38,6 +38,18 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20140314: AppleTalk
+OLD_DIRS+=usr/include/netatalk
+OLD_FILES+=usr/include/netatalk/aarp.h
+OLD_FILES+=usr/include/netatalk/at.h
+OLD_FILES+=usr/include/netatalk/at_extern.h
+OLD_FILES+=usr/include/netatalk/at_var.h
+OLD_FILES+=usr/include/netatalk/ddp.h
+OLD_FILES+=usr/include/netatalk/ddp_pcb.h
+OLD_FILES+=usr/include/netatalk/ddp_var.h
+OLD_FILES+=usr/include/netatalk/endian.h
+OLD_FILES+=usr/include/netatalk/phase2.h
+
# 20140314: Remove IPX/SPX
OLD_LIBS+=lib/libipx.so.5
OLD_FILES+=usr/include/netipx/ipx.h
Modified: head/etc/mtree/BSD.include.dist
==============================================================================
--- head/etc/mtree/BSD.include.dist Fri Mar 14 04:35:18 2014 (r263151)
+++ head/etc/mtree/BSD.include.dist Fri Mar 14 06:29:43 2014 (r263152)
@@ -257,8 +257,6 @@
..
net80211
..
- netatalk
- ..
netgraph
atm
..
Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile Fri Mar 14 04:35:18 2014 (r263151)
+++ head/include/Makefile Fri Mar 14 06:29:43 2014 (r263152)
@@ -36,7 +36,7 @@ PHDRS= sched.h _semaphore.h
LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdatomic.h stdint.h \
syslog.h ucontext.h
-LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \
+LDIRS= bsm cam geom net net80211 netgraph netinet netinet6 \
netipsec netnatm netsmb nfs nfsclient nfsserver sys vm
LSUBDIRS= cam/ata cam/scsi \
Modified: head/sbin/ifconfig/Makefile
==============================================================================
--- head/sbin/ifconfig/Makefile Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sbin/ifconfig/Makefile Fri Mar 14 06:29:43 2014 (r263152)
@@ -21,7 +21,6 @@ SRCS+= af_inet.c # IPv4 support
.if ${MK_INET6_SUPPORT} != "no"
SRCS+= af_inet6.c # IPv6 support
.endif
-SRCS+= af_atalk.c # AppleTalk support
.if ${MK_INET6_SUPPORT} != "no"
SRCS+= af_nd6.c # ND6 support
.endif
Modified: head/sbin/ifconfig/ifconfig.8
==============================================================================
--- head/sbin/ifconfig/ifconfig.8 Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sbin/ifconfig/ifconfig.8 Fri Mar 14 06:29:43 2014 (r263152)
@@ -158,7 +158,6 @@ The address or protocol families current
supported are
.Dq inet ,
.Dq inet6 ,
-.Dq atalk ,
and
.Dq link .
The default if available is
@@ -562,42 +561,6 @@ The prefix can also be specified using t
See the
.Ar address
option above for more information.
-.\" see
-.\" Xr eon 5 .
-.\" .It Cm nsellength Ar n
-.\" .Pf ( Tn ISO
-.\" only)
-.\" This specifies a trailing number of bytes for a received
-.\" .Tn NSAP
-.\" used for local identification, the remaining leading part of which is
-.\" taken to be the
-.\" .Tn NET
-.\" (Network Entity Title).
-.\" The default value is 1, which is conformant to US
-.\" .Tn GOSIP .
-.\" When an ISO address is set in an ifconfig command,
-.\" it is really the
-.\" .Tn NSAP
-.\" which is being specified.
-.\" For example, in
-.\" .Tn US GOSIP ,
-.\" 20 hex digits should be
-.\" specified in the
-.\" .Tn ISO NSAP
-.\" to be assigned to the interface.
-.\" There is some evidence that a number different from 1 may be useful
-.\" for
-.\" .Tn AFI
-.\" 37 type addresses.
-.It Cm range Ar netrange
-Under appletalk, set the interface to respond to a
-.Ar netrange
-of the form
-.Ar startnet Ns - Ns Ar endnet .
-Appletalk uses this scheme instead of
-netmasks though
-.Fx
-implements it internally as a set of netmasks.
.It Cm remove
Another name for the
.Fl alias
@@ -605,10 +568,6 @@ parameter.
Introduced for compatibility
with
.Bsx .
-.It Cm phase
-The argument following this specifies the version (phase) of the
-Appletalk network attached to the interface.
-Values of 1 or 2 are permitted.
.Sm off
.It Cm link Op Cm 0 No - Cm 2
.Sm on
Modified: head/sbin/route/keywords
==============================================================================
--- head/sbin/route/keywords Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sbin/route/keywords Fri Mar 14 06:29:43 2014 (r263152)
@@ -4,7 +4,6 @@
4
6
add
-atalk
blackhole
change
cloning
Modified: head/sbin/route/route.8
==============================================================================
--- head/sbin/route/route.8 Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sbin/route/route.8 Fri Mar 14 06:29:43 2014 (r263152)
@@ -144,7 +144,6 @@ will ``flush'' the routing tables of all
When the address family may is specified by any of the
.Fl osi ,
.Fl xns ,
-.Fl atalk ,
.Fl inet6 ,
or
.Fl inet
@@ -255,14 +254,12 @@ if the local or remote addresses change.
The optional modifiers
.Fl xns ,
.Fl osi ,
-.Fl atalk ,
and
.Fl link
specify that all subsequent addresses are in the
-.Tn XNS ,
-.Tn OSI ,
+.Tn XNS
or
-.Tn AppleTalk
+.Tn OSI
address families,
or are specified as link-level addresses,
and the names must be numeric specifications rather than
Modified: head/sbin/route/route.c
==============================================================================
--- head/sbin/route/route.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sbin/route/route.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -55,7 +55,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>
@@ -72,8 +71,6 @@ __FBSDID("$FreeBSD$");
#include <unistd.h>
#include <ifaddrs.h>
-#define ATALK_BUF_SIZE 20
-
struct fibl {
TAILQ_ENTRY(fibl) fl_next;
@@ -114,8 +111,6 @@ static struct {
static TAILQ_HEAD(fibl_head_t, fibl) fibl_head;
-static int atalk_aton(const char *, struct at_addr *);
-static char *atalk_ntoa(struct at_addr, char [ATALK_BUF_SIZE]);
static void printb(int, const char *);
static void flushroutes(int argc, char *argv[]);
static int flushroutes_fib(int);
@@ -409,9 +404,6 @@ flushroutes(int argc, char *argv[])
af = AF_INET6;
break;
#endif
- case K_ATALK:
- af = AF_APPLETALK;
- break;
case K_LINK:
af = AF_LINK;
break;
@@ -526,7 +518,6 @@ routename(struct sockaddr *sa)
{
struct sockaddr_dl *sdl;
const char *cp;
- char atalk_buf[ATALK_BUF_SIZE];
int n;
if (!domain_initialized) {
@@ -604,12 +595,6 @@ routename(struct sockaddr *sa)
break;
}
#endif
- case AF_APPLETALK:
- (void)snprintf(rt_line, sizeof(rt_line), "atalk %s",
- atalk_ntoa(((struct sockaddr_at *)(void *)sa)->sat_addr,
- atalk_buf));
- break;
-
case AF_LINK:
sdl = (struct sockaddr_dl *)(void *)sa;
@@ -651,7 +636,6 @@ static const char *
netname(struct sockaddr *sa)
{
struct sockaddr_dl *sdl;
- char atalk_buf[ATALK_BUF_SIZE];
int n;
#ifdef INET
struct netent *np = NULL;
@@ -712,13 +696,6 @@ netname(struct sockaddr *sa)
return(net_line);
}
#endif
-
- case AF_APPLETALK:
- (void)snprintf(net_line, sizeof(net_line), "atalk %s",
- atalk_ntoa(((struct sockaddr_at *)(void *)sa)->sat_addr,
- atalk_buf));
- break;
-
case AF_LINK:
sdl = (struct sockaddr_dl *)(void *)sa;
@@ -838,10 +815,6 @@ newroute(int argc, char **argv)
aflen = sizeof(struct sockaddr_in6);
break;
#endif
- case K_ATALK:
- af = AF_APPLETALK;
- aflen = sizeof(struct sockaddr_at);
- break;
case K_SA:
af = PF_ROUTE;
aflen = sizeof(struct sockaddr_storage);
@@ -1304,16 +1277,6 @@ getaddr(int idx, char *str, struct hoste
return (0);
}
#endif /* INET6 */
-
- case AF_APPLETALK:
- {
- struct sockaddr_at *sat = (struct sockaddr_at *)(void *)sa;
-
- if (!atalk_aton(str, &sat->sat_addr))
- errx(EX_NOHOST, "bad address: %s", str);
- rtm_addrs |= RTA_NETMASK;
- return(forcehost || sat->sat_addr.s_node != 0);
- }
case AF_LINK:
link_addr(str, (struct sockaddr_dl *)(void *)sa);
return (1);
@@ -1892,7 +1855,6 @@ keyword(const char *cp)
static void
sodump(struct sockaddr *sa, const char *which)
{
- char atalk_buf[ATALK_BUF_SIZE];
#ifdef INET6
char nbuf[INET6_ADDRSTRLEN];
#endif
@@ -1915,11 +1877,6 @@ sodump(struct sockaddr *sa, const char *
sizeof(nbuf)));
break;
#endif
- case AF_APPLETALK:
- (void)printf("%s: atalk %s; ", which,
- atalk_ntoa(((struct sockaddr_at *)(void *)sa)->sat_addr,
- atalk_buf));
- break;
}
(void)fflush(stdout);
}
@@ -1973,24 +1930,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[ATALK_BUF_SIZE])
-{
- (void)snprintf(buf, ATALK_BUF_SIZE, "%u.%u", ntohs(at.s_net), at.s_node);
- buf[ATALK_BUF_SIZE - 1] = '\0';
- return(buf);
-}
Modified: head/share/man/man4/gre.4
==============================================================================
--- head/share/man/man4/gre.4 Fri Mar 14 04:35:18 2014 (r263151)
+++ head/share/man/man4/gre.4 Fri Mar 14 06:29:43 2014 (r263152)
@@ -75,7 +75,7 @@ Encapsulated datagrams are
prepended an outer datagram and a GRE header.
The GRE header specifies
the type of the encapsulated datagram and thus allows for tunneling other
-protocols than IP like e.g.\& AppleTalk.
+protocols than IP.
GRE mode is also the default tunnel mode on Cisco routers.
This is also the default mode of operation of the
.Nm
@@ -169,8 +169,7 @@ Get the GRE key currently used for outgo
Note that the IP addresses of the tunnel endpoints may be the same as the
ones defined with
.Xr ifconfig 8
-for the interface (as if IP is encapsulated), but need not be, as e.g.\& when
-encapsulating AppleTalk.
+for the interface (as if IP is encapsulated), but need not be.
.Sh EXAMPLES
Configuration example:
.Bd -literal
@@ -294,7 +293,6 @@ The kernel must be set to forward datagr
.Xr sysctl 8
variable to non-zero.
.Sh SEE ALSO
-.\" Xr atalk 4 ,
.Xr gif 4 ,
.Xr inet 4 ,
.Xr ip 4 ,
Modified: head/share/man/man4/netgraph.4
==============================================================================
--- head/share/man/man4/netgraph.4 Fri Mar 14 04:35:18 2014 (r263151)
+++ head/share/man/man4/netgraph.4 Fri Mar 14 06:29:43 2014 (r263152)
@@ -1269,8 +1269,8 @@ It allows capturing raw Ethernet frames
sending frames out of the interface.
.It INTERFACE
This node is also a system networking interface.
-It has hooks representing
-each protocol family (IP, AppleTalk, etc.) and appears in the output of
+It has hooks representing each protocol family (IP, IPv6)
+and appears in the output of
.Xr ifconfig 8 .
The interfaces are named
.Dq Li ng0 ,
Modified: head/share/man/man4/ng_iface.4
==============================================================================
--- head/share/man/man4/ng_iface.4 Fri Mar 14 04:35:18 2014 (r263151)
+++ head/share/man/man4/ng_iface.4 Fri Mar 14 06:29:43 2014 (r263152)
@@ -70,8 +70,7 @@ Packets transmitted via the interface fl
protocol-specific hook.
Similarly, packets received on a hook appear on the interface as
packets received into the corresponding protocol stack.
-The currently supported protocols are IP, IPv6, AppleTalk, ATM,
-NATM, and NS.
+The currently supported protocols are IP, IPv6, ATM, NATM, and NS.
.Pp
An
.Nm iface
@@ -88,8 +87,6 @@ This node type supports the following ho
Transmission and reception of IP packets.
.It Va inet6
Transmission and reception of IPv6 packets.
-.It Va atalk
-Transmission and reception of AppleTalk packets.
.It Va atm
Transmission and reception of ATM packets.
.It Va natm
Modified: head/share/man/man7/hier.7
==============================================================================
--- head/share/man/man7/hier.7 Fri Mar 14 04:35:18 2014 (r263151)
+++ head/share/man/man7/hier.7 Fri Mar 14 06:29:43 2014 (r263152)
@@ -279,8 +279,6 @@ mail filter API
machine-specific C include files
.It Pa net/
miscellaneous network C include files
-.It Pa netatalk/
-Appletalk protocol
.It Pa netinet/
C include files for Internet standard protocols;
see
Modified: head/share/man/man9/netisr.9
==============================================================================
--- head/share/man/man9/netisr.9 Fri Mar 14 04:35:18 2014 (r263151)
+++ head/share/man/man9/netisr.9 Fri Mar 14 06:29:43 2014 (r263152)
@@ -189,19 +189,13 @@ and
variants.
.Ss Protocol number constants
The follow protocol numbers are currently defined:
-.Bl -tag -width NETISR_ATALK1
+.Bl -tag -width NETISR_ROUTE
.It Dv NETISR_IP
IPv4
.It Dv NETISR_IGMP
IGMPv3 loopback
.It Dv NETISR_ROUTE
Routing socket loopback
-.It Dv NETISR_AARP
-Appletalk AARP
-.It Dv NETISR_ATALK1
-Appletalk phase 1
-.It Dv NETISR_ATALK2
-Appletalk phase 2
.It Dv NETISR_ARP
ARP
.It Dv NETISR_IPV6
Modified: head/sys/Makefile
==============================================================================
--- head/sys/Makefile Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/Makefile Fri Mar 14 06:29:43 2014 (r263152)
@@ -9,7 +9,7 @@ SUBDIR= boot
# Directories to include in cscope name file and TAGS.
CSCOPEDIRS= boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
- geom gnu isa kern libkern modules net net80211 netatalk \
+ geom gnu isa kern libkern modules net net80211 \
netgraph netinet netinet6 netipsec netnatm netpfil \
netsmb nfs nfsclient nfsserver nlm ofed opencrypto \
pci rpc security sys ufs vm xdr xen ${CSCOPE_ARCHDIR}
Modified: head/sys/amd64/amd64/machdep.c
==============================================================================
--- head/sys/amd64/amd64/machdep.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/amd64/amd64/machdep.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -41,7 +41,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_atalk.h"
#include "opt_atpic.h"
#include "opt_compat.h"
#include "opt_cpu.h"
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/conf/NOTES Fri Mar 14 06:29:43 2014 (r263152)
@@ -606,9 +606,6 @@ options IPSEC #IP security (requires
#
options IPSEC_NAT_T #NAT-T support, UDP encap of ESP
-options NETATALK #Appletalk communications protocols
-options NETATALKDEBUG #Appletalk debugging
-
#
# SMB/CIFS requester
# NETSMB enables support for SMB protocol, it requires LIBMCHAIN and LIBICONV
@@ -1070,7 +1067,7 @@ options MD_ROOT
options QUOTA #enable disk quotas
# If you are running a machine just as a fileserver for PC and MAC
-# users, using SAMBA or Netatalk, you may consider setting this option
+# users, using SAMBA, you may consider setting this option
# and keeping all those users' directories on a filesystem that is
# mounted with the suiddir option. This gives new files the same
# ownership as the directory (similar to group). It's a security hole
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/conf/files Fri Mar 14 06:29:43 2014 (r263152)
@@ -3168,14 +3168,6 @@ net80211/ieee80211_tdma.c optional wlan
net80211/ieee80211_wds.c optional wlan
net80211/ieee80211_xauth.c optional wlan wlan_xauth
net80211/ieee80211_alq.c optional wlan ieee80211_alq
-netatalk/aarp.c optional netatalk
-netatalk/at_control.c optional netatalk
-netatalk/at_proto.c optional netatalk
-netatalk/at_rmx.c optional netatalk
-netatalk/ddp_input.c optional netatalk
-netatalk/ddp_output.c optional netatalk
-netatalk/ddp_pcb.c optional netatalk
-netatalk/ddp_usrreq.c optional netatalk
netgraph/atm/ccatm/ng_ccatm.c optional ngatm_ccatm \
compile-with "${NORMAL_C} -I$S/contrib/ngatm"
netgraph/atm/ng_atm.c optional ngatm_atm
@@ -3775,7 +3767,6 @@ security/audit/bsm_errno.c optional audi
security/audit/bsm_fcntl.c optional audit
security/audit/bsm_socket_type.c optional audit
security/audit/bsm_token.c optional audit
-security/mac/mac_atalk.c optional mac netatalk
security/mac/mac_audit.c optional mac audit
security/mac/mac_cred.c optional mac
security/mac/mac_framework.c optional mac
Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/conf/options Fri Mar 14 06:29:43 2014 (r263152)
@@ -422,7 +422,6 @@ LIBMCHAIN
MBUF_PROFILING
MBUF_STRESS_TEST
MROUTING opt_mrouting.h
-NETATALK opt_atalk.h
NFSLOCKD
PCBGROUP opt_pcbgroup.h
PF_DEFAULT_TO_DROP opt_pf.h
@@ -548,7 +547,6 @@ VP0_DEBUG opt_vpo.h
LPT_DEBUG opt_lpt.h
PLIP_DEBUG opt_plip.h
LOCKF_DEBUG opt_debug_lockf.h
-NETATALKDEBUG opt_atalk.h
SI_DEBUG opt_debug_si.h
# Fb options
Modified: head/sys/i386/i386/machdep.c
==============================================================================
--- head/sys/i386/i386/machdep.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/i386/i386/machdep.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -41,7 +41,6 @@
__FBSDID("$FreeBSD$");
#include "opt_apic.h"
-#include "opt_atalk.h"
#include "opt_atpic.h"
#include "opt_compat.h"
#include "opt_cpu.h"
Modified: head/sys/kern/Make.tags.inc
==============================================================================
--- head/sys/kern/Make.tags.inc Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/kern/Make.tags.inc Fri Mar 14 06:29:43 2014 (r263152)
@@ -36,7 +36,6 @@ COMM= ${SYS}/dev/advansys/*.[ch] \
${SYS}/geom/*.[ch] \
${SYS}/kern/*.[ch] \
${SYS}/net/*.[ch] \
- ${SYS}/netatalk/*.[ch] \
${SYS}/netinet/*.[ch] \
${SYS}/netinet6/*.[ch] \
${SYS}/netipsec/*.[ch] \
@@ -54,7 +53,6 @@ COMMDIR1= ${SYS}/conf \
${SYS}/geom \
${SYS}/kern \
${SYS}/net \
- ${SYS}/netatalk \
${SYS}/netinet \
${SYS}/netinet6 \
${SYS}/netipsec \
Modified: head/sys/kern/kern_jail.c
==============================================================================
--- head/sys/kern/kern_jail.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/kern/kern_jail.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -3699,11 +3699,6 @@ prison_priv_check(struct ucred *cred, in
#ifdef notyet
/*
- * AppleTalk privileges.
- */
- case PRIV_NETATALK_RESERVEDPORT:
-
- /*
* ATM privileges.
*/
case PRIV_NETATM_CFG:
Modified: head/sys/kern/subr_witness.c
==============================================================================
--- head/sys/kern/subr_witness.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/kern/subr_witness.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -547,12 +547,6 @@ static struct witness_order_list_entry o
{ "so_snd", &lock_class_mtx_sleep },
{ NULL, NULL },
/*
- * netatalk
- */
- { "ddp_list_mtx", &lock_class_mtx_sleep },
- { "ddp_mtx", &lock_class_mtx_sleep },
- { NULL, NULL },
- /*
* BPF
*/
{ "bpf global lock", &lock_class_mtx_sleep },
Modified: head/sys/modules/if_gre/Makefile
==============================================================================
--- head/sys/modules/if_gre/Makefile Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/modules/if_gre/Makefile Fri Mar 14 06:29:43 2014 (r263152)
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
KMOD= if_gre
-SRCS= if_gre.c ip_gre.c opt_inet.h opt_inet6.h opt_atalk.h
+SRCS= if_gre.c ip_gre.c opt_inet.h opt_inet6.h
.if !defined(KERNBUILDDIR)
opt_inet.h:
@@ -11,9 +11,6 @@ opt_inet.h:
opt_inet6.h:
echo "#define INET6 1" > ${.TARGET}
-
-opt_atalk.h:
- echo "#define NETATALK 1" > ${.TARGET}
.endif
.include <bsd.kmod.mk>
Modified: head/sys/modules/if_tun/Makefile
==============================================================================
--- head/sys/modules/if_tun/Makefile Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/modules/if_tun/Makefile Fri Mar 14 06:29:43 2014 (r263152)
@@ -3,12 +3,9 @@
.PATH: ${.CURDIR}/../../net
KMOD= if_tun
-SRCS= if_tun.c opt_atalk.h opt_inet.h opt_inet6.h
+SRCS= if_tun.c opt_inet.h opt_inet6.h
.if !defined(KERNBUILDDIR)
-opt_atalk.h:
- echo "#define NETATALK 1" > ${.TARGET}
-
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
Modified: head/sys/modules/netgraph/iface/Makefile
==============================================================================
--- head/sys/modules/netgraph/iface/Makefile Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/modules/netgraph/iface/Makefile Fri Mar 14 06:29:43 2014 (r263152)
@@ -2,12 +2,9 @@
# $Whistle: Makefile,v 1.2 1999/01/19 19:39:21 archie Exp $
KMOD= ng_iface
-SRCS= ng_iface.c opt_atalk.h opt_inet.h opt_inet6.h
+SRCS= ng_iface.c opt_inet.h opt_inet6.h
.if !defined(KERNBUILDDIR)
-opt_atalk.h:
- echo "#define NETATALK 1" > ${.TARGET}
-
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
Modified: head/sys/net/if_ethersubr.c
==============================================================================
--- head/sys/net/if_ethersubr.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/net/if_ethersubr.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -30,7 +30,6 @@
* $FreeBSD$
*/
-#include "opt_atalk.h"
#include "opt_inet.h"
#include "opt_inet6.h"
#include "opt_netgraph.h"
@@ -82,18 +81,6 @@ int (*ef_inputp)(struct ifnet*, struct e
int (*ef_outputp)(struct ifnet *ifp, struct mbuf **mp,
const struct sockaddr *dst, short *tp, int *hlen);
-#ifdef NETATALK
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#include <netatalk/at_extern.h>
-
-#define llc_snap_org_code llc_un.type_snap.org_code
-#define llc_snap_ether_type llc_un.type_snap.ether_type
-
-extern u_char at_org_code[3];
-extern u_char aarp_org_code[3];
-#endif /* NETATALK */
-
#include <security/mac/mac_framework.h>
#ifdef CTASSERT
@@ -243,42 +230,6 @@ ether_output(struct ifnet *ifp, struct m
type = htons(ETHERTYPE_IPV6);
break;
#endif
-#ifdef NETATALK
- case AF_APPLETALK:
- {
- struct at_ifaddr *aa;
-
- if ((aa = at_ifawithnet((const struct sockaddr_at *)dst)) == NULL)
- senderr(EHOSTUNREACH); /* XXX */
- if (!aarpresolve(ifp, m, (const struct sockaddr_at *)dst, edst)) {
- ifa_free(&aa->aa_ifa);
- return (0);
- }
- /*
- * In the phase 2 case, need to prepend an mbuf for the llc header.
- */
- if ( aa->aa_flags & AFA_PHASE2 ) {
- struct llc llc;
-
- ifa_free(&aa->aa_ifa);
- M_PREPEND(m, LLC_SNAPFRAMELEN, M_NOWAIT);
- if (m == NULL)
- senderr(ENOBUFS);
- llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
- llc.llc_control = LLC_UI;
- bcopy(at_org_code, llc.llc_snap_org_code, sizeof(at_org_code));
- llc.llc_snap_ether_type = htons( ETHERTYPE_AT );
- bcopy(&llc, mtod(m, caddr_t), LLC_SNAPFRAMELEN);
- type = htons(m->m_pkthdr.len);
- hlen = LLC_SNAPFRAMELEN + ETHER_HDR_LEN;
- } else {
- ifa_free(&aa->aa_ifa);
- type = htons(ETHERTYPE_AT);
- }
- break;
- }
-#endif /* NETATALK */
-
case pseudo_AF_HDRCMPLT:
{
const struct ether_header *eh;
@@ -720,9 +671,6 @@ ether_demux(struct ifnet *ifp, struct mb
struct ether_header *eh;
int i, isr;
u_short ether_type;
-#if defined(NETATALK)
- struct llc *l;
-#endif
KASSERT(ifp != NULL, ("%s: NULL interface pointer", __func__));
@@ -798,38 +746,7 @@ ether_demux(struct ifnet *ifp, struct mb
isr = NETISR_IPV6;
break;
#endif
-#ifdef NETATALK
- case ETHERTYPE_AT:
- isr = NETISR_ATALK1;
- break;
- case ETHERTYPE_AARP:
- isr = NETISR_AARP;
- break;
-#endif /* NETATALK */
default:
-#if defined(NETATALK)
- if (ether_type > ETHERMTU)
- goto discard;
- l = mtod(m, struct llc *);
- if (l->llc_dsap == LLC_SNAP_LSAP &&
- l->llc_ssap == LLC_SNAP_LSAP &&
- l->llc_control == LLC_UI) {
- if (bcmp(&(l->llc_snap_org_code)[0], at_org_code,
- sizeof(at_org_code)) == 0 &&
- ntohs(l->llc_snap_ether_type) == ETHERTYPE_AT) {
- m_adj(m, LLC_SNAPFRAMELEN);
- isr = NETISR_ATALK2;
- break;
- }
- if (bcmp(&(l->llc_snap_org_code)[0], aarp_org_code,
- sizeof(aarp_org_code)) == 0 &&
- ntohs(l->llc_snap_ether_type) == ETHERTYPE_AARP) {
- m_adj(m, LLC_SNAPFRAMELEN);
- isr = NETISR_AARP;
- break;
- }
- }
-#endif /* NETATALK */
goto discard;
}
netisr_dispatch(isr, m);
Modified: head/sys/net/if_fddisubr.c
==============================================================================
--- head/sys/net/if_fddisubr.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/net/if_fddisubr.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -36,7 +36,6 @@
* $FreeBSD$
*/
-#include "opt_atalk.h"
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -75,15 +74,6 @@
#include <netdnet/dn.h>
#endif
-#ifdef NETATALK
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#include <netatalk/at_extern.h>
-
-extern u_char at_org_code[ 3 ];
-extern u_char aarp_org_code[ 3 ];
-#endif /* NETATALK */
-
#include <security/mac/mac_framework.h>
static const u_char fddibroadcastaddr[FDDI_ADDR_LEN] =
@@ -178,40 +168,6 @@ fddi_output(struct ifnet *ifp, struct mb
type = htons(ETHERTYPE_IPV6);
break;
#endif /* INET6 */
-#ifdef NETATALK
- case AF_APPLETALK: {
- struct at_ifaddr *aa;
- if (!aarpresolve(ifp, m, (const struct sockaddr_at *)dst, edst))
- return (0);
- /*
- * ifaddr is the first thing in at_ifaddr
- */
- if ((aa = at_ifawithnet((const struct sockaddr_at *)dst)) == 0)
- goto bad;
-
- /*
- * In the phase 2 case, we need to prepend an mbuf for the llc header.
- * Since we must preserve the value of m, which is passed to us by
- * value, we m_copy() the first mbuf, and use it for our llc header.
- */
- if (aa->aa_flags & AFA_PHASE2) {
- struct llc llc;
-
- M_PREPEND(m, LLC_SNAPFRAMELEN, M_WAITOK);
- llc.llc_dsap = llc.llc_ssap = LLC_SNAP_LSAP;
- llc.llc_control = LLC_UI;
- bcopy(at_org_code, llc.llc_snap.org_code, sizeof(at_org_code));
- llc.llc_snap.ether_type = htons(ETHERTYPE_AT);
- bcopy(&llc, mtod(m, caddr_t), LLC_SNAPFRAMELEN);
- type = 0;
- } else {
- type = htons(ETHERTYPE_AT);
- }
- ifa_free(&aa->aa_ifa);
- break;
- }
-#endif /* NETATALK */
-
case pseudo_AF_HDRCMPLT:
{
const struct ether_header *eh;
@@ -459,23 +415,6 @@ fddi_input(ifp, m)
ifp->if_noproto++;
goto dropanyway;
}
-#ifdef NETATALK
- if (bcmp(&(l->llc_snap.org_code)[0], at_org_code,
- sizeof(at_org_code)) == 0 &&
- ntohs(l->llc_snap.ether_type) == ETHERTYPE_AT) {
- isr = NETISR_ATALK2;
- m_adj(m, LLC_SNAPFRAMELEN);
- break;
- }
-
- if (bcmp(&(l->llc_snap.org_code)[0], aarp_org_code,
- sizeof(aarp_org_code)) == 0 &&
- ntohs(l->llc_snap.ether_type) == ETHERTYPE_AARP) {
- m_adj(m, LLC_SNAPFRAMELEN);
- isr = NETISR_AARP;
- break;
- }
-#endif /* NETATALK */
if (l->llc_snap.org_code[0] != 0 ||
l->llc_snap.org_code[1] != 0 ||
l->llc_snap.org_code[2] != 0) {
@@ -510,14 +449,6 @@ fddi_input(ifp, m)
isr = NETISR_DECNET;
break;
#endif
-#ifdef NETATALK
- case ETHERTYPE_AT:
- isr = NETISR_ATALK1;
- break;
- case ETHERTYPE_AARP:
- isr = NETISR_AARP;
- break;
-#endif /* NETATALK */
default:
/* printf("fddi_input: unknown protocol 0x%x\n", type); */
ifp->if_noproto++;
Modified: head/sys/net/if_gre.c
==============================================================================
--- head/sys/net/if_gre.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/net/if_gre.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -41,7 +41,6 @@
* Also supported: IP in IP encaps (proto 55) as of RFC 2004
*/
-#include "opt_atalk.h"
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -440,11 +439,6 @@ gre_output(struct ifnet *ifp, struct mbu
etype = ETHERTYPE_IPV6;
break;
#endif
-#ifdef NETATALK
- case AF_APPLETALK:
- etype = ETHERTYPE_ATALK;
- break;
-#endif
default:
_IF_DROP(&ifp->if_snd);
m_freem(m);
Modified: head/sys/net/if_loop.c
==============================================================================
--- head/sys/net/if_loop.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/net/if_loop.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -34,7 +34,6 @@
* Loopback interface driver for protocol testing and timing.
*/
-#include "opt_atalk.h"
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -71,11 +70,6 @@
#include <netinet/ip6.h>
#endif
-#ifdef NETATALK
-#include <netatalk/at.h>
-#include <netatalk/at_var.h>
-#endif
-
#include <security/mac/mac_framework.h>
#ifdef TINY_LOMTU
@@ -267,8 +261,6 @@ looutput(struct ifnet *ifp, struct mbuf
#endif
m->m_pkthdr.csum_flags &= ~LO_CSUM_FEATURES6;
break;
- case AF_APPLETALK:
- break;
default:
printf("looutput: af=%d unexpected\n", af);
m_freem(m);
@@ -361,11 +353,6 @@ if_simloop(struct ifnet *ifp, struct mbu
isr = NETISR_IPV6;
break;
#endif
-#ifdef NETATALK
- case AF_APPLETALK:
- isr = NETISR_ATALK2;
- break;
-#endif
default:
printf("if_simloop: can't handle af=%d\n", af);
m_freem(m);
Modified: head/sys/net/if_spppfr.c
==============================================================================
--- head/sys/net/if_spppfr.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/net/if_spppfr.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -260,11 +260,6 @@ drop: ++ifp->if_ierrors;
isr = NETISR_IP;
break;
#endif
-#ifdef NETATALK
- case ETHERTYPE_AT:
- isr = NETISR_ATALK;
- break;
-#endif
}
if (! (ifp->if_flags & IFF_UP))
@@ -339,11 +334,6 @@ struct mbuf *sppp_fr_header (struct sppp
type = 0x8137;
break;
#endif
-#ifdef NETATALK
- case AF_APPLETALK:
- type = ETHERTYPE_AT;
- break;
-#endif
}
h[3] = FR_PADDING;
h[4] = FR_SNAP;
Modified: head/sys/net/if_tun.c
==============================================================================
--- head/sys/net/if_tun.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/net/if_tun.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -16,7 +16,6 @@
* $FreeBSD$
*/
-#include "opt_atalk.h"
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -905,11 +904,6 @@ tunwrite(struct cdev *dev, struct uio *u
isr = NETISR_IPV6;
break;
#endif
-#ifdef NETATALK
- case AF_APPLETALK:
- isr = NETISR_ATALK2;
- break;
-#endif
default:
m_freem(m);
return (EAFNOSUPPORT);
Modified: head/sys/net/netisr.h
==============================================================================
--- head/sys/net/netisr.h Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/net/netisr.h Fri Mar 14 06:29:43 2014 (r263152)
@@ -52,15 +52,11 @@
#define NETISR_IP 1
#define NETISR_IGMP 2 /* IGMPv3 output queue */
#define NETISR_ROUTE 3 /* routing socket */
-#define NETISR_AARP 4 /* Appletalk ARP */
-#define NETISR_ATALK2 5 /* Appletalk phase 2 */
-#define NETISR_ATALK1 6 /* Appletalk phase 1 */
-#define NETISR_ARP 7 /* same as AF_LINK */
-/* 8 was IPX */
-#define NETISR_ETHER 9 /* ethernet input */
-#define NETISR_IPV6 10
-#define NETISR_NATM 11
-#define NETISR_EPAIR 12 /* if_epair(4) */
+#define NETISR_ARP 4 /* same as AF_LINK */
+#define NETISR_ETHER 5 /* ethernet input */
+#define NETISR_IPV6 6
+#define NETISR_NATM 7
+#define NETISR_EPAIR 8 /* if_epair(4) */
/*
* Protocol ordering and affinity policy constants. See the detailed
Modified: head/sys/netgraph/ng_cisco.c
==============================================================================
--- head/sys/netgraph/ng_cisco.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/netgraph/ng_cisco.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -55,8 +55,6 @@
#include <netinet/in.h>
#include <netinet/if_ether.h>
-#include <netatalk/at.h>
-
#include <netgraph/ng_message.h>
#include <netgraph/netgraph.h>
#include <netgraph/ng_parse.h>
Modified: head/sys/netgraph/ng_iface.c
==============================================================================
--- head/sys/netgraph/ng_iface.c Fri Mar 14 04:35:18 2014 (r263151)
+++ head/sys/netgraph/ng_iface.c Fri Mar 14 06:29:43 2014 (r263152)
@@ -52,7 +52,6 @@
* This node also includes Berkeley packet filter support.
*/
-#include "opt_atalk.h"
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -103,7 +102,6 @@ typedef const struct iffam *iffam_p;
const static struct iffam gFamilies[] = {
{ AF_INET, NG_IFACE_HOOK_INET },
{ AF_INET6, NG_IFACE_HOOK_INET6 },
- { AF_APPLETALK, NG_IFACE_HOOK_ATALK },
{ AF_ATM, NG_IFACE_HOOK_ATM },
{ AF_NATM, NG_IFACE_HOOK_NATM },
};
@@ -759,11 +757,6 @@ ng_iface_rcvdata(hook_p hook, item_p ite
isr = NETISR_IPV6;
break;
#endif
-#ifdef NETATALK
- case AF_APPLETALK:
- isr = NETISR_ATALK2;
- break;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-head
mailing list