[src/trunk]: src/usr.sbin/tcpdump Make this understand Token-Ring.

[bad <bad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c06502d12ca1
branches:  trunk
changeset: 467312:c06502d12ca1
user:      bad <bad%NetBSD.org@localhost>
date:      Tue Mar 23 00:02:24 1999 +0000

description:
Make this understand Token-Ring.
>From Onno van der Linden.

diffstat:

 usr.sbin/tcpdump/Makefile      |    6 +-
 usr.sbin/tcpdump/interface.h   |    4 +-
 usr.sbin/tcpdump/print-token.c |  187 +++++++++++++++++++++++++++++++++++++++++
 usr.sbin/tcpdump/tcpdump.c     |    6 +-
 4 files changed, 196 insertions(+), 7 deletions(-)

diffs (263 lines):

diff -r 2f6f34939de3 -r c06502d12ca1 usr.sbin/tcpdump/Makefile
--- a/usr.sbin/tcpdump/Makefile Mon Mar 22 23:43:30 1999 +0000
+++ b/usr.sbin/tcpdump/Makefile Tue Mar 23 00:02:24 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 1998/09/25 19:10:25 hwr Exp $  
+#      $NetBSD: Makefile,v 1.14 1999/03/23 00:02:24 bad Exp $  
 
 PROG=  tcpdump
 MAN=   tcpdump.8 
@@ -7,7 +7,7 @@
 CPPFLAGS+=-DTIME_WITH_SYS_TIME=1 -DHAVE_NET_SLIP_H=1 -DHAVE_VFPRINTF=1
 CPPFLAGS+=-DHAVE_STRCASECMP=1 -DHAVE_ETHER_NTOA=1 -DHAVE_SETLINEBUF=1
 CPPFLAGS+=-DRETSIGTYPE=void -DRETSIGVAL= -DHAVE_SIGACTION=1
-CPPFLAGS+=-DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_FDDI -DLBL_ALIGN
+CPPFLAGS+=-DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_FDDI -DHAVE_TOKEN -DLBL_ALIGN
 CPPFLAGS+=-DHAVE_HDLC
 
 LDADD+=        -lpcap -ll
@@ -19,7 +19,7 @@
 print-nfs.c print-netbios.c print-llc.c print-krb.c print-isoclns.c print-ipx.c \
 print-ip.c print-igrp.c print-icmp.c print-gre.c print-fddi.c print-ether.c \
 print-egp.c print-dvmrp.c print-domain.c print-decnet.c print-bootp.c print-atm.c \
-print-hdlc.c \
+print-hdlc.c print-token.c \
 print-atalk.c print-arp.c parsenfsfh.c machdep.c gmt2local.c bpf_dump.c \
 addrtoname.c print-mobile.c
 SRCS+= version.c
diff -r 2f6f34939de3 -r c06502d12ca1 usr.sbin/tcpdump/interface.h
--- a/usr.sbin/tcpdump/interface.h      Mon Mar 22 23:43:30 1999 +0000
+++ b/usr.sbin/tcpdump/interface.h      Tue Mar 23 00:02:24 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: interface.h,v 1.6 1998/09/25 19:10:25 hwr Exp $        */
+/*     $NetBSD: interface.h,v 1.7 1999/03/23 00:02:24 bad Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -238,6 +238,8 @@
 extern void sunrpcrequest_print(const u_char *, u_int, const u_char *);
 extern void tcp_print(const u_char *, u_int, const u_char *);
 extern void tftp_print(const u_char *, u_int);
+extern void token_if_print(u_char *, const struct pcap_pkthdr *,
+       const u_char *);
 extern void udp_print(const u_char *, u_int, const u_char *);
 extern void wb_print(const void *, u_int);
 extern void hdlc_if_print(u_char *, const struct pcap_pkthdr *,
diff -r 2f6f34939de3 -r c06502d12ca1 usr.sbin/tcpdump/print-token.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.sbin/tcpdump/print-token.c    Tue Mar 23 00:02:24 1999 +0000
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 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.
+ */
+
+#if 0
+static  char rcsid[] =
+       "@(#)$Header: /cvsroot/src/usr.sbin/tcpdump/Attic/print-token.c,v 1.1 1999/03/23 00:02:25 bad Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_TOKEN
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+
+#if __STDC__
+struct mbuf;
+struct rtentry;
+#endif
+#include <net/if.h>
+#include <net/if_token.h>
+
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+
+#include <ctype.h>
+#include <netdb.h>
+#include <pcap.h>
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "interface.h"
+#include "addrtoname.h"
+#include "ethertype.h"
+
+#define TOKEN_HDRLEN (sizeof(struct token_header))
+
+/* Extract src, dst addresses */
+static inline void
+extract_token_addrs(const struct token_header *trp, char *fsrc, char *fdst)
+{
+       memcpy(fdst, (char *)trp->token_dhost, 6);
+       memcpy(fsrc, (char *)trp->token_shost, 6);
+}
+
+/*
+ * Print the TR MAC header
+ */
+static inline void
+token_print(register const struct token_header *trp, register u_int length,
+          register const u_char *fsrc, register const u_char *fdst)
+{
+       char *srcname, *dstname;
+
+       srcname = etheraddr_string(fsrc);
+       dstname = etheraddr_string(fdst);
+
+       if (vflag)
+               (void) printf("%02x %02x %s %s %d: ",
+                      trp->token_ac,
+                      trp->token_fc,
+                      srcname, dstname,
+                      length);
+       else
+               printf("%s %s %d: ", srcname, dstname, length);
+}
+
+/*
+ * This is the top level routine of the printer.  'sp' is the points
+ * to the TR 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 *pcap, const struct pcap_pkthdr *h,
+             register const u_char *p)
+{
+       u_int caplen = h->caplen;
+       u_int length = h->len;
+       const struct token_header *trp = (struct token_header *)p;
+       extern u_short extracted_ethertype;
+       struct ether_header ehdr;
+
+       ts_print(&h->ts);
+
+       if (caplen < TOKEN_HDRLEN) {
+               printf("[|tr]");
+               goto out;
+       }
+       /*
+        * Get the TR addresses into a canonical form
+        */
+       extract_token_addrs(trp, (char*)ESRC(&ehdr), (char*)EDST(&ehdr));
+       /*
+        * Some printers want to get back at the link level 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.
+        */
+       snapend = p + caplen;
+       /*
+        * Actually, the only printer that uses packetp is print-bootp.c,
+        * and it assumes that packetp points to an Ethernet header.  The
+        * right thing to do is to fix print-bootp.c to know which link
+        * type is in use when it excavates. XXX
+        */
+       packetp = (u_char *)&ehdr;
+
+       if (eflag)
+               token_print(trp, length, ESRC(&ehdr), EDST(&ehdr));
+
+       /* Skip over TR MAC header */
+
+       length -= TOKEN_HDRLEN;
+       p += TOKEN_HDRLEN;
+       caplen -= TOKEN_HDRLEN;
+
+       if (trp->token_shost[0] & TOKEN_RI_PRESENT) {
+               u_int riflen;
+               struct token_rif        *rif;
+
+               rif = TOKEN_RIF(trp);
+               riflen = (NTOHS(rif->tr_rcf) & TOKEN_RCF_LEN_MASK) >> 8;
+/*
+ * XXX if (vflag && eflag) print RIF ???
+ */
+               length -= riflen;
+               p += riflen;
+               caplen -= riflen;
+       }
+
+       /* Frame Control field determines interpretation of packet */
+       extracted_ethertype = 0;
+       /* Try to print the LLC-layer header & higher layers */
+       if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr)) == 0) {
+               /*
+                * Some kinds of LLC packet we cannot
+                * handle intelligently
+                */
+               if (!eflag)
+                       token_print(trp, length, ESRC(&ehdr), EDST(&ehdr));
+               if (extracted_ethertype) {
+                       printf("(LLC %s) ",
+                       etherproto_string(htons(extracted_ethertype)));
+               }
+               if (!xflag && !qflag)
+                       default_print(p, caplen);
+       }
+out:
+       putchar('\n');
+}
+#else
+#include <sys/types.h>
+#include <sys/time.h>
+
+#include <stdio.h>
+
+#include "interface.h"
+void
+token_if_print(u_char *pcap, const struct pcap_pkthdr *h,
+             register const u_char *p)
+{
+
+       error("not configured for token-ring");
+       /* NOTREACHED */
+}
+#endif
diff -r 2f6f34939de3 -r c06502d12ca1 usr.sbin/tcpdump/tcpdump.c
--- a/usr.sbin/tcpdump/tcpdump.c        Mon Mar 22 23:43:30 1999 +0000
+++ b/usr.sbin/tcpdump/tcpdump.c        Tue Mar 23 00:02:24 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcpdump.c,v 1.8 1998/07/25 11:30:46 explorer Exp $     */
+/*     $NetBSD: tcpdump.c,v 1.9 1999/03/23 00:02:25 bad Exp $  */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -29,7 +29,7 @@
 #else
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
 The Regents of the University of California.  All rights reserved.\n");
-__RCSID("$NetBSD: tcpdump.c,v 1.8 1998/07/25 11:30:46 explorer Exp $");
+__RCSID("$NetBSD: tcpdump.c,v 1.9 1999/03/23 00:02:25 bad Exp $");
 #endif
 #endif
 
@@ -97,7 +97,7 @@
 
 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 },