Add changes in 4.2.1.

[tcpdump] / print-fddi.c

diff --git a/print-fddi.c b/print-fddi.c
index bf090d7ce97a4c225649790309c26dd8c42f9577..1e7d554ad7104268ef61f4276de0b5468801dc64 100644 (file)
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -20,24 +20,16 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.54 2002-04-07 09:50:32 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.66 2005-11-13 12:12:41 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 <sys/file.h>
-#include <sys/ioctl.h>
+#include <tcpdump-stdinc.h>

 
 

-#include <netinet/in.h>
-
-#include <ctype.h>
-#include <netdb.h>

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


@@ -241,7 +233,7 @@ fddi_hdr_print(register const struct fddi_header *fddip, register u_int length,
 }
 
 static inline void
 }
 
 static inline void

-fddi_smt_print(const u_char *p, u_int length)
+fddi_smt_print(const u_char *p _U_, u_int length _U_)

 {
        printf("<SMT printer not yet implemented>");
 }
 {
        printf("<SMT printer not yet implemented>");
 }


@@ -255,25 +247,13 @@ fddi_print(const u_char *p, u_int length, u_int caplen)
 
        if (caplen < FDDI_HDRLEN) {
                printf("[|fddi]");
 
        if (caplen < FDDI_HDRLEN) {
                printf("[|fddi]");

-               goto out;
+               return;

        }
        }

+

        /*
         * Get the FDDI addresses into a canonical form
         */
        extract_fddi_addrs(fddip, (char *)ESRC(&ehdr), (char *)EDST(&ehdr));
        /*
         * Get the FDDI addresses into a canonical form
         */
        extract_fddi_addrs(fddip, (char *)ESRC(&ehdr), (char *)EDST(&ehdr));

-       /*
-        * Some printers want to get back at the link level addresses,
-        * and/or check that they're not walking off the end of the packet.
-        * Rather than pass them all the way down, we set these globals.
-        */
-       snapend = p + caplen;
-       /*
-        * 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 (eflag)
                fddi_hdr_print(fddip, length, ESRC(&ehdr), EDST(&ehdr));
 
        if (eflag)
                fddi_hdr_print(fddip, length, ESRC(&ehdr), EDST(&ehdr));


@@ -284,7 +264,6 @@ fddi_print(const u_char *p, u_int length, u_int caplen)
        caplen -= FDDI_HDRLEN;
 
        /* Frame Control field determines interpretation of packet */
        caplen -= FDDI_HDRLEN;
 
        /* Frame Control field determines interpretation of packet */

-       extracted_ethertype = 0;

        if ((fddip->fddi_fc & FDDIFC_CLFF) == FDDIFC_LLC_ASYNC) {
                /* Try to print the LLC-layer header & higher layers */
                if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
        if ((fddip->fddi_fc & FDDIFC_CLFF) == FDDIFC_LLC_ASYNC) {
                /* Try to print the LLC-layer header & higher layers */
                if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),


@@ -300,7 +279,7 @@ fddi_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 if ((fddip->fddi_fc & FDDIFC_CLFF) == FDDIFC_SMT)
                                default_print(p, caplen);
                }
        } else if ((fddip->fddi_fc & FDDIFC_CLFF) == FDDIFC_SMT)


@@ -310,34 +289,21 @@ fddi_print(const u_char *p, u_int length, u_int caplen)
                if (!eflag)
                        fddi_hdr_print(fddip, length + FDDI_HDRLEN, ESRC(&ehdr),
                            EDST(&ehdr));
                if (!eflag)
                        fddi_hdr_print(fddip, length + FDDI_HDRLEN, ESRC(&ehdr),
                            EDST(&ehdr));

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

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

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

 }
 
 /*
 }
 
 /*

- * This is the top level routine of the printer.  'sp' is the points
- * to the FDDI header of the packet, 'tvp' is the timestamp,
- * 'length' is the length of the packet off the wire, and 'caplen'
+ * This is the top level routine of the printer.  'p' points
+ * to the FDDI header of the packet, 'h->ts' is the timestamp,
+ * 'h->len' 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
-fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h,
-             register const u_char *p)
+u_int
+fddi_if_print(const struct pcap_pkthdr *h, register const u_char *p)

 {
 {

-       u_int caplen = h->caplen;
-       u_int length = h->len;
-
-       ++infodelay;
-       ts_print(&h->ts);
-
-       fddi_print(p, length, caplen);
+       fddi_print(p, h->len, h->caplen);

 
 

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

 }
 }