Merge remote branch 'origin/master'

[tcpdump] / print-token.c

diff --git a/print-token.c b/print-token.c
index 37fa2c28d33069bde27e312c1c46d5120a2b9d5e..4f8422b5ab1b096c0e9a4cc4eee5813936c590c3 100644 (file)
--- a/print-token.c
+++ b/print-token.c
@@ -23,6 +23,10 @@
  * Further tweaked to more closely resemble print-fddi.c
  *     Guy Harris <[email protected]>
  */
  * Further tweaked to more closely resemble print-fddi.c
  *     Guy Harris <[email protected]>
  */

+#ifndef lint
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.27 2005-11-13 12:12:43 guy Exp $";
+#endif

 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"


@@ -35,13 +39,10 @@
 #include <string.h>
 
 #include "interface.h"
 #include <string.h>
 
 #include "interface.h"

+#include "extract.h"

 #include "addrtoname.h"
 #include "ethertype.h"
 
 #include "addrtoname.h"
 #include "ethertype.h"
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.23 2003-11-15 00:39:42 guy Exp $";
-#endif

 #include "ether.h"
 #include "token.h"
 
 #include "ether.h"
 #include "token.h"
 


@@ -126,7 +127,16 @@ token_print(const u_char *p, u_int length, u_int caplen)
                if (eflag)
                        token_hdr_print(trp, length, ESRC(&ehdr), EDST(&ehdr));
 
                if (eflag)
                        token_hdr_print(trp, length, ESRC(&ehdr), EDST(&ehdr));
 

+               if (caplen < TOKEN_HDRLEN + 2) {
+                       printf("[|token-ring]");
+                       return hdr_len;
+               }

                route_len = RIF_LENGTH(trp);
                route_len = RIF_LENGTH(trp);

+               hdr_len += route_len;
+               if (caplen < hdr_len) {
+                       printf("[|token-ring]");
+                       return hdr_len;
+               }

                if (vflag) {
                        printf("%s ", broadcast_indicator[BROADCAST(trp)]);
                        printf("%s", direction[DIRECTION(trp)]);
                if (vflag) {
                        printf("%s ", broadcast_indicator[BROADCAST(trp)]);
                        printf("%s", direction[DIRECTION(trp)]);


@@ -135,10 +145,10 @@ token_print(const u_char *p, u_int length, u_int caplen)
                                printf(" [%d:%d]", RING_NUMBER(trp, seg),
                                    BRIDGE_NUMBER(trp, seg));
                } else {
                                printf(" [%d:%d]", RING_NUMBER(trp, seg),
                                    BRIDGE_NUMBER(trp, seg));
                } else {

-                       printf("rt = %x", ntohs(trp->token_rcf));
+                       printf("rt = %x", EXTRACT_16BITS(&trp->token_rcf));

 
                        for (seg = 0; seg < SEGMENT_COUNT(trp); seg++)
 
                        for (seg = 0; seg < SEGMENT_COUNT(trp); seg++)

-                               printf(":%x", ntohs(trp->token_rseg[seg]));
+                               printf(":%x", EXTRACT_16BITS(&trp->token_rseg[seg]));

                }
                printf(" (%s) ", largest_frame[LARGEST_FRAME(trp)]);
        } else {
                }
                printf(" (%s) ", largest_frame[LARGEST_FRAME(trp)]);
        } else {


@@ -147,13 +157,11 @@ token_print(const u_char *p, u_int length, u_int caplen)
        }
 
        /* Skip over token ring MAC header and routing information */
        }
 
        /* Skip over token ring MAC header and routing information */

-       hdr_len += route_len;

        length -= hdr_len;
        p += hdr_len;
        caplen -= hdr_len;
 
        /* Frame Control field determines interpretation of packet */
        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 */
                if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
        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),


@@ -167,7 +175,7 @@ token_print(const u_char *p, u_int length, u_int caplen)
                                printf("(LLC %s) ",
                        etherproto_string(htons(extracted_ethertype)));
                        }
                                printf("(LLC %s) ",
                        etherproto_string(htons(extracted_ethertype)));
                        }

-                       if (!xflag && !qflag)
+                       if (!suppress_default_print)

                                default_print(p, caplen);
                }
        } else {
                                default_print(p, caplen);
                }
        } else {


@@ -176,7 +184,7 @@ token_print(const u_char *p, u_int length, u_int caplen)
                if (!eflag)
                        token_hdr_print(trp, length + TOKEN_HDRLEN + route_len,
                            ESRC(&ehdr), EDST(&ehdr));
                if (!eflag)
                        token_hdr_print(trp, length + TOKEN_HDRLEN + route_len,
                            ESRC(&ehdr), EDST(&ehdr));

-               if (!xflag && !qflag)
+               if (!suppress_default_print)

                        default_print(p, caplen);
        }
        return (hdr_len);
                        default_print(p, caplen);
        }
        return (hdr_len);


@@ -185,7 +193,7 @@ token_print(const u_char *p, u_int length, u_int caplen)
 /*
  * This is the top level routine of the printer.  'p' points
  * to the TR header of the packet, 'h->ts' is the timestamp,
 /*
  * 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'
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'

  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int