diff options
author | glebius <glebius@FreeBSD.org> | 2014-03-14 06:29:43 +0000 |
---|---|---|
committer | glebius <glebius@FreeBSD.org> | 2014-03-14 06:29:43 +0000 |
commit | 80e85e32a582ff3a03a87cb98dd996b7929f824b (patch) | |
tree | b6714370b79bb13837321dcbc195eadc7047b2b2 /tools | |
parent | fc1b773c21c561cbe8c09b09d48f80aada9bc2f9 (diff) | |
download | FreeBSD-src-80e85e32a582ff3a03a87cb98dd996b7929f824b.zip FreeBSD-src-80e85e32a582ff3a03a87cb98dd996b7929f824b.tar.gz |
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.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/regression/README | 4 | ||||
-rw-r--r-- | tools/regression/netatalk/simple_send/Makefile | 8 | ||||
-rw-r--r-- | tools/regression/netatalk/simple_send/simple_send.c | 162 | ||||
-rw-r--r-- | tools/tools/net80211/wlanwatch/wlanwatch.c | 1 | ||||
-rw-r--r-- | tools/tools/net80211/wlanwds/wlanwds.c | 1 |
5 files changed, 2 insertions, 174 deletions
diff --git a/tools/regression/README b/tools/regression/README index 4879a65..87e4ab3 100644 --- a/tools/regression/README +++ b/tools/regression/README @@ -28,11 +28,11 @@ considered to be the name of the test. Naming tests is optional, but encouraged. A test may be written which is conditional, and may need to be skipped. -For example, the netatalk tests require 'options NETATALK' in the kernel. +For example, the netinet tests require 'options INET' in the kernel. A test may be skipped by printing '# skip Reason for skipping' after the test name. For example, - ok 1 - netatalk # skip 'options NETATALK' not compiled in + ok 1 - netinet # skip 'options INET' not compiled in A test may be flagged as 'todo'. This indicates that you expect the test to fail (perhaps because the necessary functionality hasn't been written diff --git a/tools/regression/netatalk/simple_send/Makefile b/tools/regression/netatalk/simple_send/Makefile deleted file mode 100644 index e01fcea..0000000 --- a/tools/regression/netatalk/simple_send/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# $FreeBSD$ -# - -PROG= simple_send -NO_MAN= - -.include <bsd.prog.mk> diff --git a/tools/regression/netatalk/simple_send/simple_send.c b/tools/regression/netatalk/simple_send/simple_send.c deleted file mode 100644 index 9dbbce8..0000000 --- a/tools/regression/netatalk/simple_send/simple_send.c +++ /dev/null @@ -1,162 +0,0 @@ -/*- - * Copyright (c) 2004 Robert N. M. Watson - * 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. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. - * - * $FreeBSD$ - */ - -#include <sys/types.h> -#include <sys/socket.h> - -#include <arpa/inet.h> - -#include <netatalk/at.h> - -#include <err.h> -#include <errno.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - -/* - * This is a simple test tool to bind netatalk SOCK_DGRAM sockets and perform - * simple send operations that exercise each combination of bound and - * connected endpoints, with the intent of exercising the various kernel send - * case. - * - * In order to run this test, configure NETATALK into the kernel. Use - * ifconfig to set an appletalk address on an interface. Run this tool with - * two arguments: a local address and port number, and a remote address and - * port number. - * - * It is recommended that you try running it with some interesting address - * and port thresholds, including ATADDR_ANYNET, ATADDR_ANYNODE, - * ATADDR_ANYPORT, and ATADDR_ANYBCAST. Try both remote unicast addresses - * and the local address, which will help to test local delivery (although - * not socket receive). - */ - -/* - * Create a netatalk socket with specified source and destination, if - * desired. If a source is specified, bind it. If a destination is - * specified, connect it. - */ -static int -socket_between(struct sockaddr_at *from, struct sockaddr_at *to) -{ - int s; - - s = socket(PF_APPLETALK, SOCK_DGRAM, ATPROTO_DDP); - if (s == -1) - errx(1, "socket: %s\n", strerror(errno)); - - if (from != NULL) { - if (bind(s, (struct sockaddr *)from, sizeof(*from)) != 0) - errx(1, "bind: %u.%u returned %s\n", - ntohs(from->sat_addr.s_net), from->sat_addr.s_node, - strerror(errno)); - } - - if (to != NULL) { - if (connect(s, (struct sockaddr *)to, sizeof(*to)) != 0) - errx(1, "connect: %u.%u returned %s\n", - ntohs(to->sat_addr.s_net), to->sat_addr.s_node, - strerror(errno)); - } - return (s); -} - -int -main(int argc, char *argv[]) -{ - struct sockaddr_at sat_from, sat_to; - char *addr_from, *addr_to; - u_int net, node, port; - char msg[] = "TEST"; - ssize_t len; - int s; - - if (argc != 3) - errx(1, "simple_send from_addr to_addr"); - - addr_from = argv[1]; - sat_from.sat_family = AF_APPLETALK; - sat_from.sat_len = sizeof(sat_from); - if (sscanf(addr_from, "%u.%u:%u", &net, &node, &port) != 3 || - net > 0xfff || node > 0xfe) - errx(1, "%s: illegal address", addr_from); - sat_from.sat_addr.s_net = htons(net); - sat_from.sat_addr.s_node = node; - sat_from.sat_port = port; - - addr_to = argv[2]; - sat_to.sat_family = AF_APPLETALK; - sat_to.sat_len = sizeof(sat_to); - if (sscanf(addr_to, "%u.%u:%u", &net, &node, &port) != 3 || - net > 0xffff || node > 0xfe) - errx(1, "%s: illegal address", addr_to); - sat_to.sat_addr.s_net = htons(net); - sat_to.sat_addr.s_node = node; - sat_from.sat_port = port; - - printf("Address source is %u.%u:%u, address destination is %u.%u:%u\n", - ntohs(sat_from.sat_addr.s_net), sat_from.sat_addr.s_node, - sat_from.sat_port, - ntohs(sat_to.sat_addr.s_net), sat_to.sat_addr.s_node, - sat_to.sat_port); - - /* - * First, create a socket and use explicit sendto() to specify - * destination. - */ - s = socket_between(NULL, NULL); - len = sendto(s, msg, sizeof(msg), 0, (struct sockaddr *)&sat_to, - sizeof(sat_to)); - close(s); - - /* - * Next, specify the destination for a connect() but not the source. - */ - s = socket_between(NULL, &sat_to); - len = send(s, msg, sizeof(msg), 0); - close(s); - - /* - * Now, bind the source, but not connect the destination. - */ - s = socket_between(&sat_from, NULL); - len = sendto(s, msg, sizeof(msg), 0, (struct sockaddr *)&sat_to, - sizeof(sat_to)); - close(s); - - /* - * Finally, bind and connect. - */ - s = socket_between(&sat_from, &sat_to); - len = send(s, msg, sizeof(msg), 0); - close(s); - - exit(0); -} diff --git a/tools/tools/net80211/wlanwatch/wlanwatch.c b/tools/tools/net80211/wlanwatch/wlanwatch.c index 61bd7ed..254d3be 100644 --- a/tools/tools/net80211/wlanwatch/wlanwatch.c +++ b/tools/tools/net80211/wlanwatch/wlanwatch.c @@ -45,7 +45,6 @@ #include <net/if_dl.h> #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netatalk/at.h> #ifdef __NetBSD__ #include <net80211/ieee80211_netbsd.h> #elif __FreeBSD__ diff --git a/tools/tools/net80211/wlanwds/wlanwds.c b/tools/tools/net80211/wlanwds/wlanwds.c index c722693..6e2ef05 100644 --- a/tools/tools/net80211/wlanwds/wlanwds.c +++ b/tools/tools/net80211/wlanwds/wlanwds.c @@ -50,7 +50,6 @@ #include <net/if_dl.h> #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netatalk/at.h> #include "net80211/ieee80211_ioctl.h" #include "net80211/ieee80211_freebsd.h" #include <arpa/inet.h> |