Merge pull request #4 from infrastation/master

[tcpdump] / print-ap1394.c

diff --git a/print-ap1394.c b/print-ap1394.c
index 626658104501c0a38dbe96821560d5e1d5277b97..ab0713b5a7a2b5965df3f73ddbc52c4222a44a55 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ap1394.c,v 1.2 2004-03-17 22:11:34 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ap1394.c,v 1.5 2006-02-11 22:12:06 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -33,6 +33,7 @@ static const char rcsid[] _U_ =
 #include <pcap.h>
 
 #include "interface.h"
+#include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 
@@ -57,18 +58,21 @@ static inline void
 ap1394_hdr_print(register const u_char *bp, u_int length)
 {
        register const struct firewire_header *fp;
+       u_int16_t firewire_type;
+
        fp = (const struct firewire_header *)bp;
 
        (void)printf("%s > %s",
-                    linkaddr_string(fp->firewire_dhost, FIREWIRE_EUI64_LEN),
-                    linkaddr_string(fp->firewire_shost, FIREWIRE_EUI64_LEN));
+                    linkaddr_string(fp->firewire_dhost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN),
+                    linkaddr_string(fp->firewire_shost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN));
 
+       firewire_type = EXTRACT_16BITS(&fp->firewire_type);
        if (!qflag) {
                (void)printf(", ethertype %s (0x%04x)",
-                              tok2str(ethertype_values,"Unknown", ntohs(fp->firewire_type)),
-                               ntohs(fp->firewire_type));            
+                              tok2str(ethertype_values,"Unknown", firewire_type),
+                               firewire_type);
         } else {
-                (void)printf(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ntohs(fp->firewire_type)));  
+                (void)printf(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", firewire_type));
         }
 
        (void)printf(", length %u: ", length);
@@ -77,7 +81,7 @@ ap1394_hdr_print(register const u_char *bp, u_int length)
 /*
  * This is the top level routine of the printer.  'p' points
  * to the ether 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.
  */
 u_int
@@ -87,7 +91,6 @@ ap1394_if_print(const struct pcap_pkthdr *h, const u_char *p)
        u_int caplen = h->caplen;
        struct firewire_header *fp;
        u_short ether_type;
-       u_short extracted_ether_type;
 
        if (caplen < FIREWIRE_HDRLEN) {
                printf("[|ap1394]");
@@ -102,16 +105,13 @@ ap1394_if_print(const struct pcap_pkthdr *h, const u_char *p)
        fp = (struct firewire_header *)p;
        p += FIREWIRE_HDRLEN;
 
-       ether_type = ntohs(fp->firewire_type);
-
-       extracted_ether_type = 0;
-       if (ether_encap_print(ether_type, p, length, caplen,
-           &extracted_ether_type) == 0) {
+       ether_type = EXTRACT_16BITS(&fp->firewire_type);
+       if (ethertype_print(gndo, ether_type, p, length, caplen) == 0) {
                /* ether_type not known, print raw packet */
                if (!eflag)
                        ap1394_hdr_print((u_char *)fp, length + FIREWIRE_HDRLEN);
 
-               if (!xflag && !qflag)
+               if (!suppress_default_print)
                        default_print(p, caplen);
        }