Avoiding conditional directives that break statements

[tcpdump] / print-ap1394.c

diff --git a/print-ap1394.c b/print-ap1394.c
index ab0713b5a7a2b5965df3f73ddbc52c4222a44a55..a7096fb65e59c30fa4251b84ab4c785581a52210 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -18,21 +18,14 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ap1394.c,v 1.5 2006-02-11 22:12:06 hannes Exp $ (LBL)";
-#endif

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

-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <pcap.h>
+#include <netdissect-stdinc.h>

 
 

-#include "interface.h"
+#include "netdissect.h"

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


@@ -55,27 +48,27 @@ struct firewire_header {
 #define FIREWIRE_HDRLEN                18
 
 static inline void
 #define FIREWIRE_HDRLEN                18
 
 static inline void

-ap1394_hdr_print(register const u_char *bp, u_int length)
+ap1394_hdr_print(netdissect_options *ndo, register const u_char *bp, u_int length)

 {
        register const struct firewire_header *fp;
 {
        register const struct firewire_header *fp;

-       u_int16_t firewire_type;
+       uint16_t firewire_type;

 
        fp = (const struct firewire_header *)bp;
 
 
        fp = (const struct firewire_header *)bp;
 

-       (void)printf("%s > %s",
-                    linkaddr_string(fp->firewire_dhost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN),
-                    linkaddr_string(fp->firewire_shost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN));
+       ND_PRINT((ndo, "%s > %s",
+                    linkaddr_string(ndo, fp->firewire_shost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN),
+                    linkaddr_string(ndo, fp->firewire_dhost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN)));

 
        firewire_type = EXTRACT_16BITS(&fp->firewire_type);
 
        firewire_type = EXTRACT_16BITS(&fp->firewire_type);

-       if (!qflag) {
-               (void)printf(", ethertype %s (0x%04x)",
+       if (!ndo->ndo_qflag) {
+               ND_PRINT((ndo, ", ethertype %s (0x%04x)",

                               tok2str(ethertype_values,"Unknown", firewire_type),
                               tok2str(ethertype_values,"Unknown", firewire_type),

-                               firewire_type);
+                               firewire_type));

         } else {
         } else {

-                (void)printf(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", firewire_type));
+                ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", firewire_type)));

         }
 
         }
 

-       (void)printf(", length %u: ", length);
+       ND_PRINT((ndo, ", length %u: ", length));

 }
 
 /*
 }
 
 /*


@@ -85,35 +78,35 @@ ap1394_hdr_print(register const u_char *bp, u_int length)
  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int

-ap1394_if_print(const struct pcap_pkthdr *h, const u_char *p)
+ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)

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

-       struct firewire_header *fp;
+       const struct firewire_header *fp;

        u_short ether_type;
 
        if (caplen < FIREWIRE_HDRLEN) {
        u_short ether_type;
 
        if (caplen < FIREWIRE_HDRLEN) {

-               printf("[|ap1394]");
+               ND_PRINT((ndo, "[|ap1394]"));

                return FIREWIRE_HDRLEN;
        }
 
                return FIREWIRE_HDRLEN;
        }
 

-       if (eflag)
-               ap1394_hdr_print(p, length);
+       if (ndo->ndo_eflag)
+               ap1394_hdr_print(ndo, p, length);

 
        length -= FIREWIRE_HDRLEN;
        caplen -= FIREWIRE_HDRLEN;
 
        length -= FIREWIRE_HDRLEN;
        caplen -= FIREWIRE_HDRLEN;

-       fp = (struct firewire_header *)p;
+       fp = (const struct firewire_header *)p;

        p += FIREWIRE_HDRLEN;
 
        ether_type = EXTRACT_16BITS(&fp->firewire_type);
        p += FIREWIRE_HDRLEN;
 
        ether_type = EXTRACT_16BITS(&fp->firewire_type);

-       if (ethertype_print(gndo, ether_type, p, length, caplen) == 0) {
+       if (ethertype_print(ndo, ether_type, p, length, caplen) == 0) {

                /* ether_type not known, print raw packet */
                /* ether_type not known, print raw packet */

-               if (!eflag)
-                       ap1394_hdr_print((u_char *)fp, length + FIREWIRE_HDRLEN);
+               if (!ndo->ndo_eflag)
+                       ap1394_hdr_print(ndo, (const u_char *)fp, length + FIREWIRE_HDRLEN);

 
 

-               if (!suppress_default_print)
-                       default_print(p, caplen);
-       } 
+               if (!ndo->ndo_suppress_default_print)
+                       ND_DEFAULTPRINT(p, caplen);
+       }

 
        return FIREWIRE_HDRLEN;
 }
 
        return FIREWIRE_HDRLEN;
 }