World, I'd like you to meet the first FreeBSD token Ring driver.

This  is for various Olicom cards. An IBM driver is following.
This patch also adds support to tcpdump to decode packets on tokenring.
Congratulations to the proud father.. (below)

Submitted by:	Larry Lile <lile@stdio.com>

4 files changed, 211 insertions, 1 deletions

diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h
index 7ccb3f5..4f5f692 100644
--- a/contrib/tcpdump/interface.h
+++ b/contrib/tcpdump/interface.h
@@ -176,6 +176,8 @@ extern void dvmrp_print(const u_char *, u_int);
 extern void egp_print(const u_char *, u_int, const u_char *);
 extern void ether_if_print(u_char *, const struct pcap_pkthdr *,
 	const u_char *);
+extern void token_if_print(u_char *, const struct pcap_pkthdr *,
+	const u_char *);
 extern void fddi_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void gre_print(const u_char *, u_int);
 extern void icmp_print(const u_char *, const u_char *);
diff --git a/contrib/tcpdump/print-token.c b/contrib/tcpdump/print-token.c
new file mode 100644
index 0000000..e1dff5b
--- /dev/null
+++ b/contrib/tcpdump/print-token.c
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996
+ *	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: (1) source code distributions
+ * retain the above copyright notice and this paragraph in its entirety, (2)
+ * distributions including binary code include the above copyright notice and
+ * this paragraph in its entirety in the documentation or other materials
+ * provided with the distribution, and (3) all advertising materials mentioning
+ * features or use of this software display the following acknowledgement:
+ * ``This product includes software developed by the University of California,
+ * Lawrence Berkeley Laboratory and its contributors.'' 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 ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * Hacked version of print-ether.c  Larry Lile <lile@stdio.com>
+ */
+#ifndef lint
+static const char rcsid[] =
+    "@(#) $Header$";
+#endif
+
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+
+#if __STDC__
+struct mbuf;
+struct rtentry;
+#endif
+#include <net/if.h>
+
+#include "token.h"
+
+#include <netinet/in.h>
+#include <net/ethernet.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip_var.h>
+#include <netinet/udp.h>
+#include <netinet/udp_var.h>
+#include <netinet/tcp.h>
+#include <netinet/tcpip.h>
+
+#include <stdio.h>
+#include <pcap.h>
+
+#include "interface.h"
+#include "addrtoname.h"
+#include "ethertype.h"
+#include "llc.h"
+
+const u_char *packetp;
+const u_char *snapend;
+
+static inline void
+token_print(register const u_char *bp, u_int length)
+{
+	register const struct token_header *tp;
+        register const struct llc *lp;
+        u_short ether_type;
+
+        tp = (const struct token_header *)bp;
+        lp = (struct llc *)(bp + TOKEN_HDR_LEN);
+        if (IS_SOURCE_ROUTED) 
+                lp = (struct llc *)(bp + TOKEN_HDR_LEN + RIF_LENGTH);
+
+        /* 
+         * Ethertype on ethernet is a short, but ethertype in an llc-snap has
+         * been defined as 2 u_chars.  This is a stupid little hack to fix
+         * this for now but something better should be done using ntohs()
+         * XXX
+         */
+         ether_type = ((u_short)lp->ethertype[1] << 16) | lp->ethertype[0];
+
+	if (qflag)
+		(void)printf("%s %s %d: ",
+			     etheraddr_string(ESRC(tp)),
+			     etheraddr_string(EDST(tp)),
+			     length);
+	else
+		(void)printf("%s %s %s %d: ",
+			     etheraddr_string(ESRC(tp)),
+			     etheraddr_string(EDST(tp)),
+			     etherproto_string(ether_type),
+			     length);
+}
+
+/*
+ * This is the top level routine of the printer.  'p' is the points
+ * to the ether header of the packet, 'tvp' is the timestamp,
+ * 'length' is the length of the packet off the wire, and 'caplen'
+ * is the number of bytes actually captured.
+ */
+void
+token_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+{
+	u_int caplen = h->caplen;
+	u_int length = h->len;
+	struct token_header *tp;
+	u_short ether_type;
+	extern u_short extracted_ethertype;
+        u_int route_len = 0;
+        struct llc *lp;
+
+        tp = (struct token_header *)p;
+
+	ts_print(&h->ts);
+
+	if (caplen < TOKEN_HDR_LEN) {
+		printf("[|token-ring]");
+		goto out;
+	}
+
+	if (eflag)
+		token_print(p, length);
+
+	/*
+	 * Some printers want to get back at the ethernet addresses,
+	 * and/or check that they're not walking off the end of the packet.
+	 * Rather than pass them all the way down, we set these globals.
+	 */
+	tp = (struct token_header *)p;
+
+        /* Adjust for source routing information in the MAC header */
+        if (IS_SOURCE_ROUTED) {
+                route_len =  RIF_LENGTH;
+        }
+
+        /* Set pointer to llc header, adjusted for routing information */
+        lp = (struct llc *)(p + TOKEN_HDR_LEN + route_len);
+
+        packetp = p;
+	snapend = p + caplen;
+
+        /* Skip over token ring MAC header */
+	length -= TOKEN_HDR_LEN + route_len;
+	caplen -= TOKEN_HDR_LEN + route_len;
+	p += TOKEN_HDR_LEN + route_len;
+
+	ether_type = ntohs((int)lp->ethertype);
+
+	extracted_ethertype = 0;
+	/* Try to print the LLC-layer header & higher layers */
+	if (llc_print(p, length, caplen, ESRC(tp), EDST(tp)) == 0) {
+		/* ether_type not known, print raw packet */
+		if (!eflag)
+			token_print((u_char *)tp, length);
+		if (extracted_ethertype) {
+			printf("(LLC %s) ",
+		       etherproto_string(htons(extracted_ethertype)));
+		}
+		if (!xflag && !qflag)
+			default_print(p, caplen);
+	}
+	if (xflag)
+		default_print(p, caplen);
+ out:
+	putchar('\n');
+}
diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c
index 14a12e7..1526db2 100644
--- a/contrib/tcpdump/tcpdump.c
+++ b/contrib/tcpdump/tcpdump.c
@@ -91,7 +91,7 @@ struct printer {
 
 static struct printer printers[] = {
 	{ ether_if_print,	DLT_EN10MB },
-	{ ether_if_print,	DLT_IEEE802 },
+	{ token_if_print,	DLT_IEEE802 },
 	{ sl_if_print,		DLT_SLIP },
 	{ sl_bsdos_if_print,	DLT_SLIP_BSDOS },
 	{ ppp_if_print,		DLT_PPP },
diff --git a/contrib/tcpdump/token.h b/contrib/tcpdump/token.h
new file mode 100644
index 0000000..6f28a1e
--- /dev/null
+++ b/contrib/tcpdump/token.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 1998, Larry Lile
+ * 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 unmodified, 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.
+ *
+ */
+
+#define TOKEN_HDR_LEN       14
+#define IS_SOURCE_ROUTED    (tp->ether_shost[0] & 0x80)
+#define RIF_LENGTH          ((ntohs(tp->rcf) & 0x1f00) >> 8)
+#define TOKEN_RING_MAC_LEN  6
+#define ROUTING_SEGMENT_MAX 16
+
+struct token_header {
+        u_char   ac;
+        u_char   fc;
+        u_char   ether_dhost[TOKEN_RING_MAC_LEN];
+        u_char   ether_shost[TOKEN_RING_MAC_LEN];
+        u_short  rcf;
+        u_short  rseg[ROUTING_SEGMENT_MAX];
+};
+