gre: add support for MikroTik Ethernet-over-IP hack.

[tcpdump] / print-ap1394.c

diff --git a/print-ap1394.c b/print-ap1394.c
index 6a9e891a573bfeafdc74c43f5667200772f8741f..b1988f270650e0126c93de5e0e822c538053fb5e 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -19,12 +19,15 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: Apple IP-over-IEEE 1394 printer */
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
@@ -35,9 +38,9 @@
  */
 #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;
 };
 
 /*
@@ -47,28 +50,34 @@ struct firewire_header {
  */
 #define FIREWIRE_HDRLEN                18
 
-static inline void
-ap1394_hdr_print(netdissect_options *ndo, register const u_char *bp, u_int length)
+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)
 {
-       register const struct firewire_header *fp;
-       u_int16_t firewire_type;
+       const struct firewire_header *fp;
+       uint16_t firewire_type;
 
        fp = (const struct firewire_header *)bp;
 
-       ND_PRINT((ndo, "%s > %s",
-                    linkaddr_string(fp->firewire_dhost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN),
-                    linkaddr_string(fp->firewire_shost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN)));
+       ND_PRINT("%s > %s",
+                    fwaddr_string(ndo, fp->firewire_shost),
+                    fwaddr_string(ndo, fp->firewire_dhost));
 
-       firewire_type = EXTRACT_16BITS(&fp->firewire_type);
+       firewire_type = GET_BE_U_2(fp->firewire_type);
        if (!ndo->ndo_qflag) {
-               ND_PRINT((ndo, ", ethertype %s (0x%04x)",
+               ND_PRINT(", ethertype %s (0x%04x)",
                               tok2str(ethertype_values,"Unknown", firewire_type),
-                               firewire_type));
+                               firewire_type);
         } else {
-                ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", firewire_type)));
+                ND_PRINT(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", firewire_type));
         }
 
-       ND_PRINT((ndo, ", length %u: ", length));
+       ND_PRINT(", length %u: ", length);
 }
 
 /*
@@ -77,36 +86,38 @@ ap1394_hdr_print(netdissect_options *ndo, register const u_char *bp, u_int lengt
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+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;
-       struct firewire_header *fp;
+       const struct firewire_header *fp;
        u_short ether_type;
+       struct lladdr_info src, dst;
 
-       if (caplen < FIREWIRE_HDRLEN) {
-               ND_PRINT((ndo, "[|ap1394]"));
-               return FIREWIRE_HDRLEN;
-       }
+       ndo->ndo_protocol = "ap1394";
+       ND_TCHECK_LEN(p, FIREWIRE_HDRLEN);
+       ndo->ndo_ll_hdr_len += FIREWIRE_HDRLEN;
 
        if (ndo->ndo_eflag)
                ap1394_hdr_print(ndo, p, length);
 
        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);
-       if (ethertype_print(ndo, ether_type, p, length, caplen) == 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 */
                if (!ndo->ndo_eflag)
-                       ap1394_hdr_print(ndo, (u_char *)fp, length + FIREWIRE_HDRLEN);
+                       ap1394_hdr_print(ndo, (const u_char *)fp, length + FIREWIRE_HDRLEN);
 
                if (!ndo->ndo_suppress_default_print)
-                       ndo->ndo_default_print(ndo, p, caplen);
+                       ND_DEFAULTPRINT(p, caplen);
        }
-
-       return FIREWIRE_HDRLEN;
 }