Use "len", not "payload_len", as we step through the packet; use

[tcpdump] / print-atm.c

diff --git a/print-atm.c b/print-atm.c
index 6104c361aabf6b6346b6681b426a7541d94f3cb0..aecc58b652530528233b1eb8e107e9ded4c0b5d6 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -19,19 +19,15 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.24 2002-07-11 09:17:23 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.35 2003-11-16 09:36:13 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #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 <stdio.h>
 #include <pcap.h>
 
 #include <stdio.h>
 #include <pcap.h>


@@ -43,6 +39,7 @@ static const char rcsid[] =
 #include "ethertype.h"
 #include "atm.h"
 #include "atmuni31.h"
 #include "ethertype.h"
 #include "atm.h"
 #include "atmuni31.h"

+#include "llc.h"

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


@@ -52,30 +49,9 @@ static const char rcsid[] =
 static void
 atm_llc_print(const u_char *p, int length, int caplen)
 {
 static void
 atm_llc_print(const u_char *p, int length, int caplen)
 {

-       struct ether_header ehdr;
-       u_short ether_type;

        u_short extracted_ethertype;
 
        u_short extracted_ethertype;
 

-       ether_type = p[6] << 8 | p[7];
-
-       /*
-        * Fake up an Ethernet header for the benefit of printers that
-        * insist on "packetp" pointing to an Ethernet header.
-        */
-       memset(&ehdr, '\0', sizeof ehdr);
-
-       /*
-        * Some printers want to get back at the ethernet addresses.
-        * Rather than pass it all the way down, we set this global.
-        *
-        * 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;
-
-       if (!llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
+       if (!llc_print(p, length, caplen, NULL, NULL,

            &extracted_ethertype)) {
                /* ether_type not known, print raw packet */
                if (extracted_ethertype) {
            &extracted_ethertype)) {
                /* ether_type not known, print raw packet */
                if (extracted_ethertype) {


@@ -88,54 +64,70 @@ atm_llc_print(const u_char *p, int length, int caplen)
 }
 
 /*
 }
 
 /*

- * This is the top level routine of the printer.  'p' is the points
- * to the LLC/SNAP header of the packet, 'tvp' is the timestamp,
- * 'length' is the length of the packet off the wire, and 'caplen'
+ * Given a SAP value, generate the LLC header value for a UI packet
+ * with that SAP as the source and destination SAP.
+ */
+#define LLC_UI_HDR(sap)        ((sap)<<16 | (sap<<8) | 0x03)
+
+/*
+ * This is the top level routine of the printer.  'p' points
+ * to the LLC/SNAP 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.
  */
  * is the number of bytes actually captured.
  */

-void
-atm_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+u_int
+atm_if_print(const struct pcap_pkthdr *h, const u_char *p)

 {
        u_int caplen = h->caplen;
        u_int length = h->len;
 {
        u_int caplen = h->caplen;
        u_int length = h->len;

-
-       ++infodelay;
-       ts_print(&h->ts);
+       u_int32_t llchdr;
+       u_int hdrlen = 0;

 
        if (caplen < 8) {
                printf("[|atm]");
 
        if (caplen < 8) {
                printf("[|atm]");

-               goto out;
+               return (caplen);

        }
 
        /*
        }
 
        /*

-        * Some printers want to check that they're not walking off the
-        * end of the packet.
-        * Rather than pass it all the way down, we set this global.
+        * Extract the presumed LLC header into a variable, for quick
+        * testing.
+        * Then check for a header that's neither a header for a SNAP
+        * packet nor an RFC 2684 routed NLPID-formatted PDU nor
+        * an 802.2-but-no-SNAP IP packet.

         */
         */

-       snapend = p + caplen;
-
-       if (p[0] != 0xaa || p[1] != 0xaa || p[2] != 0x03) {
+       llchdr = EXTRACT_24BITS(p);
+       if (llchdr != LLC_UI_HDR(LLCSAP_SNAP) &&
+           llchdr != LLC_UI_HDR(LLCSAP_ISONS) &&
+           llchdr != LLC_UI_HDR(LLCSAP_IP)) {

                /*
                 * XXX - assume 802.6 MAC header from Fore driver.
                /*
                 * XXX - assume 802.6 MAC header from Fore driver.

-                * XXX - should we also assume it's not a MAC header
-                * if it begins with 0xfe 0xfe 0x03, for RFC 2684
-                * routed NLPID-formatted PDUs?
+                *
+                * Unfortunately, the above list doesn't check for
+                * all known SAPs, doesn't check for headers where
+                * the source and destination SAP aren't the same,
+                * and doesn't check for non-UI frames.  It also
+                * runs the risk of an 802.6 MAC header that happens
+                * to begin with one of those values being
+                * incorrectly treated as an 802.2 header.
+                *
+                * So is that Fore driver still around?  And, if so,
+                * is it still putting 802.6 MAC headers on ATM
+                * packets?  If so, could it be changed to use a
+                * new DLT_IEEE802_6 value if we added it?

                 */
                if (eflag)
                 */
                if (eflag)

-                       printf("%04x%04x %04x%04x ",
-                              p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3],
-                              p[4] << 24 | p[5] << 16 | p[6] << 8 | p[7],
-                              p[8] << 24 | p[9] << 16 | p[10] << 8 | p[11],
-                              p[12] << 24 | p[13] << 16 | p[14] << 8 | p[15]);
+                       printf("%08x%08x %08x%08x ",
+                              EXTRACT_32BITS(p),
+                              EXTRACT_32BITS(p+4),
+                              EXTRACT_32BITS(p+8),
+                              EXTRACT_32BITS(p+12));

                p += 20;
                length -= 20;
                caplen -= 20;
                p += 20;
                length -= 20;
                caplen -= 20;

+               hdrlen += 20;

        }
        atm_llc_print(p, length, caplen);
        }
        atm_llc_print(p, length, caplen);

-       if (xflag)
-               default_print(p, caplen);
- out:
-       putchar('\n');
+       return (hdrlen);

 }
 
 /*
 }
 
 /*


@@ -204,40 +196,33 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length,
        if (eflag)
                printf("VPI:%u VCI:%u ", vpi, vci);
 
        if (eflag)
                printf("VPI:%u VCI:%u ", vpi, vci);
 

-       /*
-        * Some printers want to check that they're not walking off the
-        * end of the packet.
-        * Rather than pass it all the way down, we set this global.
-        */
-       snapend = p + caplen;
-

        if (vpi == 0) {
                switch (vci) {
 
                case PPC:
                        sig_print(p, caplen);
        if (vpi == 0) {
                switch (vci) {
 
                case PPC:
                        sig_print(p, caplen);

-                       goto out;
+                       return;

 
                case BCC:
                        printf("broadcast sig: ");
 
                case BCC:
                        printf("broadcast sig: ");

-                       goto out;
+                       return;

 
                case OAMF4SC:
                        printf("oamF4(segment): ");
 
                case OAMF4SC:
                        printf("oamF4(segment): ");

-                       goto out;
+                       return;

 
                case OAMF4EC:
                        printf("oamF4(end): ");
 
                case OAMF4EC:
                        printf("oamF4(end): ");

-                       goto out;
+                       return;

 
                case METAC:
                        printf("meta: ");
 
                case METAC:
                        printf("meta: ");

-                       goto out;
+                       return;

 
                case ILMIC:
                        printf("ilmi: ");
                        snmp_print(p, length);
 
                case ILMIC:
                        printf("ilmi: ");
                        snmp_print(p, length);

-                       goto out;
+                       return;

                }
        }
 
                }
        }
 


@@ -255,8 +240,4 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length,
                lane_print(p, length, caplen);
                break;
        }
                lane_print(p, length, caplen);
                break;
        }

-
-out:
-       if (xflag)
-               default_print(p, caplen);

 }
 }