When checking for pcap_if_t, add $V_INCLS to CFLAGS, so we look at the

[tcpdump] / print-atm.c

diff --git a/print-atm.c b/print-atm.c
index 77977b256c19a27eb635ae5489c63793567b15f7..413b1887a7e72ec115b8fb600331e87615639409 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.31 2002-12-18 08:53:19 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.36 2004-03-17 23:24:36 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -72,31 +72,22 @@ atm_llc_print(const u_char *p, int length, int caplen)
 /*
  * 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'
+ * 'h->len' 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.
@@ -133,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);
 }
 
 /*
@@ -207,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;
                }
        }
 
@@ -258,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);
 }