don't pass on src & dst MAC adresses to the isoclns decoder as MAC adresses

[tcpdump] / print-token.c

diff --git a/print-token.c b/print-token.c
index 1690b3c9184ec43d89b28b28435487487f94e231..6478ff272592d50578999573baf1ee3af4112449 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -25,18 +25,14 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.15 2002-05-29 10:06:27 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.22 2002-12-19 09:39:16 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>
 
 #include <pcap.h>
 #include <stdio.h>
@@ -107,7 +103,8 @@ token_print(const u_char *p, u_int length, u_int caplen)
        const struct token_header *trp;
        u_short extracted_ethertype;
        struct ether_header ehdr;
-       u_int route_len = 0, hdr_len = TOKEN_HDRLEN, seg;
+       u_int route_len = 0, hdr_len = TOKEN_HDRLEN;
+       int seg;
 
        trp = (const struct token_header *)p;
 
@@ -115,23 +112,11 @@ token_print(const u_char *p, u_int length, u_int caplen)
                printf("[|token-ring]");
                return hdr_len;
        }
+
        /*
         * 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 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.
-        */
-       snapend = p + caplen;
-       /*
-        * Actually, the only printers that use packetp are print-arp.c
-        * and print-bootp.c, and they assume that packetp points to an
-        * Ethernet header.  The right thing to do is to fix them to know
-        * which link type is in use when they excavate. XXX
-        */
-       packetp = (u_char *)&ehdr;
 
        /* Adjust for source routing information in the MAC header */
        if (IS_SOURCE_ROUTED(trp)) {
@@ -145,13 +130,13 @@ token_print(const u_char *p, u_int length, u_int caplen)
                if (vflag) {
                        printf("%s ", broadcast_indicator[BROADCAST(trp)]);
                        printf("%s", direction[DIRECTION(trp)]);
-     
+
                        for (seg = 0; seg < SEGMENT_COUNT(trp); seg++)
                                printf(" [%d:%d]", RING_NUMBER(trp, seg),
                                    BRIDGE_NUMBER(trp, seg));
                } else {
                        printf("rt = %x", ntohs(trp->token_rcf));
- 
+
                        for (seg = 0; seg < SEGMENT_COUNT(trp); seg++)
                                printf(":%x", ntohs(trp->token_rseg[seg]));
                }
@@ -198,33 +183,13 @@ token_print(const u_char *p, u_int length, u_int caplen)
 }
 
 /*
- * This is the top level routine of the printer.  'p' 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'
+ * This is the top level routine of the printer.  'p' points
+ * to the TR header of the packet, 'h->ts' is the timestamp,
+ * 'h->length' is the length of the packet off the wire, and 'h->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
+token_if_print(const struct pcap_pkthdr *h, const u_char *p)
 {
-       u_int caplen = h->caplen;
-       u_int length = h->len;
-       u_int hdr_len;
-
-       ++infodelay;
-       ts_print(&h->ts);
-
-       hdr_len = token_print(p, length, caplen);
-
-       /*
-        * If "-x" was specified, print stuff past the Token Ring header,
-        * if there's anything to print.
-        */
-       if (xflag && caplen > hdr_len)
-               default_print(p + hdr_len, caplen - hdr_len);
-
-       putchar('\n');
-
-       --infodelay;
-       if (infoprint)
-               info(0);
+       return (token_print(p, h->len, h->caplen));
 }