Make "-x" and "-X" work with PPPoE interfaces; based on code from Darren

[tcpdump] / print-token.c

diff --git a/print-token.c b/print-token.c
index d634c673377879b822b28998c0518e39f514a607..1690b3c9184ec43d89b28b28435487487f94e231 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -25,7 +25,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
  */
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.5 2000-09-28 06:43:08 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.15 2002-05-29 10:06:27 guy Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -36,14 +36,11 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
 #include <sys/time.h>
 #include <sys/socket.h>
 

-struct mbuf;
-struct rtentry;
-

 #include <netinet/in.h>
 #include <netinet/in.h>

-#include <netinet/in_systm.h>

 
 #include <pcap.h>
 #include <stdio.h>
 
 #include <pcap.h>
 #include <stdio.h>

+#include <string.h>

 
 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"


@@ -56,18 +53,18 @@ struct rtentry;
 static inline void
 extract_token_addrs(const struct token_header *trp, char *fsrc, char *fdst)
 {
 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);
+       memcpy(fdst, (const char *)trp->token_dhost, 6);
+       memcpy(fsrc, (const char *)trp->token_shost, 6);

 }
 
 /*
  * Print the TR MAC header
  */
 static inline void
 }
 
 /*
  * Print the TR MAC header
  */
 static inline void

-token_print(register const struct token_header *trp, register u_int length,
+token_hdr_print(register const struct token_header *trp, register u_int length,

           register const u_char *fsrc, register const u_char *fdst)
 {
           register const u_char *fsrc, register const u_char *fdst)
 {

-       char *srcname, *dstname;
+       const char *srcname, *dstname;

 
        srcname = etheraddr_string(fsrc);
        dstname = etheraddr_string(fdst);
 
        srcname = etheraddr_string(fsrc);
        dstname = etheraddr_string(fdst);


@@ -82,18 +79,18 @@ token_print(register const struct token_header *trp, register u_int length,
                printf("%s %s %d: ", srcname, dstname, length);
 }
 
                printf("%s %s %d: ", srcname, dstname, length);
 }
 

-static char *broadcast_indicator[] = {
+static const char *broadcast_indicator[] = {

        "Non-Broadcast", "Non-Broadcast",
        "Non-Broadcast", "Non-Broadcast",
        "All-routes",    "All-routes",
        "Single-route",  "Single-route"
 };
 
        "Non-Broadcast", "Non-Broadcast",
        "Non-Broadcast", "Non-Broadcast",
        "All-routes",    "All-routes",
        "Single-route",  "Single-route"
 };
 

-static char *direction[] = {
+static const char *direction[] = {

        "Forward", "Backward"
 };
 
        "Forward", "Backward"
 };
 

-static char *largest_frame[] = {
+static const char *largest_frame[] = {

        "516",
        "1500",
        "2052",
        "516",
        "1500",
        "2052",


@@ -104,29 +101,19 @@ static char *largest_frame[] = {
        "??"
 };
 
        "??"
 };
 

-/*
- * 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'
- * 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_print(const u_char *p, u_int length, u_int caplen)

 {
 {

-       u_int caplen = h->caplen;
-       u_int length = h->len;
-       struct token_header *trp;
+       const struct token_header *trp;

        u_short extracted_ethertype;
        struct ether_header ehdr;
        u_short extracted_ethertype;
        struct ether_header ehdr;

-       u_int route_len = 0, seg;
+       u_int route_len = 0, hdr_len = TOKEN_HDRLEN, seg;

 
 

-       trp = (struct token_header *)p;
-
-       ts_print(&h->ts);
+       trp = (const struct token_header *)p;

 
        if (caplen < TOKEN_HDRLEN) {
                printf("[|token-ring]");
 
        if (caplen < TOKEN_HDRLEN) {
                printf("[|token-ring]");

-               goto out;
+               return hdr_len;

        }
        /*
         * Get the TR addresses into a canonical form
        }
        /*
         * Get the TR addresses into a canonical form


@@ -139,10 +126,10 @@ token_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
         */
        snapend = p + caplen;
        /*
         */
        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
+        * 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;
 
         */
        packetp = (u_char *)&ehdr;
 


@@ -152,7 +139,7 @@ token_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
                *ESRC(&ehdr) &= 0x7f;
 
                if (eflag)
                *ESRC(&ehdr) &= 0x7f;
 
                if (eflag)

-                       token_print(trp, length, ESRC(&ehdr), EDST(&ehdr));
+                       token_hdr_print(trp, length, ESRC(&ehdr), EDST(&ehdr));

 
                route_len = RIF_LENGTH(trp);
                if (vflag) {
 
                route_len = RIF_LENGTH(trp);
                if (vflag) {


@@ -171,23 +158,25 @@ token_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
                printf(" (%s) ", largest_frame[LARGEST_FRAME(trp)]);
        } else {
                if (eflag)
                printf(" (%s) ", largest_frame[LARGEST_FRAME(trp)]);
        } else {
                if (eflag)

-                       token_print(trp, length, ESRC(&ehdr), EDST(&ehdr));
+                       token_hdr_print(trp, length, ESRC(&ehdr), EDST(&ehdr));

        }
 
        /* Skip over token ring MAC header and routing information */
        }
 
        /* Skip over token ring MAC header and routing information */

-       length -= TOKEN_HDRLEN + route_len;
-       p += TOKEN_HDRLEN + route_len;
-       caplen -= TOKEN_HDRLEN + route_len;
+       hdr_len += route_len;
+       length -= hdr_len;
+       p += hdr_len;
+       caplen -= hdr_len;

 
        /* Frame Control field determines interpretation of packet */
        extracted_ethertype = 0;
        if (FRAME_TYPE(trp) == TOKEN_FC_LLC) {
                /* Try to print the LLC-layer header & higher layers */
 
        /* Frame Control field determines interpretation of packet */
        extracted_ethertype = 0;
        if (FRAME_TYPE(trp) == TOKEN_FC_LLC) {
                /* Try to print the LLC-layer header & higher layers */

-               if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr))
-                   == 0) {
+               if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
+                   &extracted_ethertype) == 0) {

                        /* ether_type not known, print raw packet */
                        if (!eflag)
                        /* ether_type not known, print raw packet */
                        if (!eflag)

-                               token_print(trp, length,
+                               token_hdr_print(trp,
+                                   length + TOKEN_HDRLEN + route_len,

                                    ESRC(&ehdr), EDST(&ehdr));
                        if (extracted_ethertype) {
                                printf("(LLC %s) ",
                                    ESRC(&ehdr), EDST(&ehdr));
                        if (extracted_ethertype) {
                                printf("(LLC %s) ",


@@ -200,12 +189,42 @@ token_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
                /* Some kinds of TR packet we cannot handle intelligently */
                /* XXX - dissect MAC packets if frame type is 0 */
                if (!eflag)
                /* Some kinds of TR packet we cannot handle intelligently */
                /* XXX - dissect MAC packets if frame type is 0 */
                if (!eflag)

-                       token_print(trp, length, ESRC(&ehdr), EDST(&ehdr));
+                       token_hdr_print(trp, length + TOKEN_HDRLEN + route_len,
+                           ESRC(&ehdr), EDST(&ehdr));

                if (!xflag && !qflag)
                        default_print(p, caplen);
        }
                if (!xflag && !qflag)
                        default_print(p, caplen);
        }

-       if (xflag)
-               default_print(p, caplen);
-out:
+       return (hdr_len);
+}
+
+/*
+ * 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'
+ * 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;
+       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');
        putchar('\n');

+
+       --infodelay;
+       if (infoprint)
+               info(0);

 }
 }