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 b1e59850e04ab1d68f916c2bf6bd8d0adef9b0a9..aecc58b652530528233b1eb8e107e9ded4c0b5d6 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -19,8 +19,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.30 2002-12-11 06:55:08 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
@@ -49,27 +49,9 @@ static const char rcsid[] =
 static void
 atm_llc_print(const u_char *p, int length, int caplen)
 {
-       struct ether_header ehdr;
        u_short extracted_ethertype;
 
-       /*
-        * 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) {
@@ -93,28 +75,19 @@ atm_llc_print(const u_char *p, int length, int caplen)
  * 'h->length' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-void
-atm_if_print(u_char *user _U_, 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_int32_t llchdr;
-
-       ++infodelay;
-       ts_print(&h->ts);
+       u_int hdrlen = 0;
 
        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.
-        */
-       snapend = p + caplen;
-
        /*
         * Extract the presumed LLC header into a variable, for quick
         * testing.
@@ -151,12 +124,10 @@ atm_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)
                p += 20;
                length -= 20;
                caplen -= 20;
+               hdrlen += 20;
        }
        atm_llc_print(p, length, caplen);
-       if (xflag)
-               default_print(p, caplen);
- out:
-       putchar('\n');
+       return (hdrlen);
 }
 
 /*
@@ -225,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);
 
-       /*
-        * 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);
-                       goto out;
+                       return;
 
                case BCC:
                        printf("broadcast sig: ");
-                       goto out;
+                       return;
 
                case OAMF4SC:
                        printf("oamF4(segment): ");
-                       goto out;
+                       return;
 
                case OAMF4EC:
                        printf("oamF4(end): ");
-                       goto out;
+                       return;
 
                case METAC:
                        printf("meta: ");
-                       goto out;
+                       return;
 
                case ILMIC:
                        printf("ilmi: ");
                        snmp_print(p, length);
-                       goto out;
+                       return;
                }
        }
 
@@ -276,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;
        }
-
-out:
-       if (xflag)
-               default_print(p, caplen);
 }