Apple IPoIEEE1394: Use a GET_LINKADDR_STRING() call

[tcpdump] / print-ap1394.c

diff --git a/print-ap1394.c b/print-ap1394.c
index 49a704eafbbedfbd79ce527418d47859b11760c8..8e6454dd0ee38f18963d93056c0544ad917a83ce 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -18,21 +18,17 @@
  * 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.1 2004-03-17 19:40:42 guy Exp $ (LBL)";
-#endif
+
+/* \summary: Apple IP-over-IEEE 1394 printer */

 
 #ifdef HAVE_CONFIG_H
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #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 "addrtoname.h"
 #include "ethertype.h"
 


@@ -41,9 +37,9 @@ static const char rcsid[] _U_ =
  */
 #define FIREWIRE_EUI64_LEN     8
 struct firewire_header {
  */
 #define FIREWIRE_EUI64_LEN     8
 struct firewire_header {

-       u_char  firewire_dhost[FIREWIRE_EUI64_LEN];
-       u_char  firewire_shost[FIREWIRE_EUI64_LEN];
-       u_short firewire_type;
+       nd_byte     firewire_dhost[FIREWIRE_EUI64_LEN];
+       nd_byte     firewire_shost[FIREWIRE_EUI64_LEN];
+       nd_uint16_t firewire_type;

 };
 
 /*
 };
 
 /*


@@ -53,40 +49,80 @@ struct firewire_header {
  */
 #define FIREWIRE_HDRLEN                18
 
  */
 #define FIREWIRE_HDRLEN                18
 

+static const char *
+fwaddr_string(netdissect_options *ndo, const u_char *addr)
+{
+       return GET_LINKADDR_STRING(addr, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN);
+}
+
+static void
+ap1394_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
+{
+       const struct firewire_header *fp;
+       uint16_t firewire_type;
+
+       fp = (const struct firewire_header *)bp;
+
+       ND_PRINT("%s > %s",
+                    fwaddr_string(ndo, fp->firewire_shost),
+                    fwaddr_string(ndo, fp->firewire_dhost));
+
+       firewire_type = GET_BE_U_2(fp->firewire_type);
+       if (!ndo->ndo_qflag) {
+               ND_PRINT(", ethertype %s (0x%04x)",
+                              tok2str(ethertype_values,"Unknown", firewire_type),
+                               firewire_type);
+        } else {
+                ND_PRINT(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", firewire_type));
+        }
+
+       ND_PRINT(", length %u: ", length);
+}
+

 /*
  * This is the top level routine of the printer.  'p' points
  * to the ether header of the packet, 'h->ts' is the timestamp,
 /*
  * 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.
  */
  * is the number of bytes actually captured.
  */

-u_int
-ap1394_if_print(const struct pcap_pkthdr *h, const u_char *p)
+void
+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;
        u_short ether_type;

-       u_short extracted_ether_type;
+       struct lladdr_info src, dst;

 
 

+       ndo->ndo_protocol = "ap1394";

        if (caplen < FIREWIRE_HDRLEN) {
        if (caplen < FIREWIRE_HDRLEN) {

-               printf("[|ap1394]");
-               return FIREWIRE_HDRLEN;
+               ndo->ndo_ll_hdr_len += caplen;
+               nd_print_trunc(ndo);
+               return;

        }
        }

+       ndo->ndo_ll_hdr_len += FIREWIRE_HDRLEN;
+
+       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;
 
        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 = GET_BE_U_2(fp->firewire_type);
+       src.addr = fp->firewire_shost;
+       src.addr_string = fwaddr_string;
+       dst.addr = fp->firewire_dhost;
+       dst.addr_string = fwaddr_string;
+       if (ethertype_print(ndo, ether_type, p, length, caplen, &src, &dst) == 0) {

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

-               if (!xflag && !qflag)
-                       default_print(p, caplen);
-       } 
+               if (!ndo->ndo_eflag)
+                       ap1394_hdr_print(ndo, (const u_char *)fp, length + FIREWIRE_HDRLEN);
+
+               if (!ndo->ndo_suppress_default_print)
+                       ND_DEFAULTPRINT(p, caplen);
+       }

 
 

-       return FIREWIRE_HDRLEN;
+       return;

 }
 }