NTP: Use tstr for truncation indicator.

[tcpdump] / print-ap1394.c

diff --git a/print-ap1394.c b/print-ap1394.c
index 135264651a5955b1eff9701b5fa2be5ef68f707c..79401cba0ef71c45904911c762406ddb7c53f671 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -19,13 +19,15 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: Apple IP-over-IEEE 1394 printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
@@ -47,6 +49,12 @@ struct firewire_header {
  */
 #define FIREWIRE_HDRLEN                18
 
+static const char *
+fwaddr_string(netdissect_options *ndo, const u_char *addr)
+{
+       return (linkaddr_string(ndo, addr, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN));
+}
+
 static inline void
 ap1394_hdr_print(netdissect_options *ndo, register const u_char *bp, u_int length)
 {
@@ -56,8 +64,8 @@ ap1394_hdr_print(netdissect_options *ndo, register const u_char *bp, u_int lengt
        fp = (const struct firewire_header *)bp;
 
        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)));
+                    fwaddr_string(ndo, fp->firewire_shost),
+                    fwaddr_string(ndo, fp->firewire_dhost)));
 
        firewire_type = EXTRACT_16BITS(&fp->firewire_type);
        if (!ndo->ndo_qflag) {
@@ -84,6 +92,7 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
        u_int caplen = h->caplen;
        const struct firewire_header *fp;
        u_short ether_type;
+       struct lladdr_info src, dst;
 
        if (caplen < FIREWIRE_HDRLEN) {
                ND_PRINT((ndo, "[|ap1394]"));
@@ -99,7 +108,11 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
        p += FIREWIRE_HDRLEN;
 
        ether_type = EXTRACT_16BITS(&fp->firewire_type);
-       if (ethertype_print(ndo, ether_type, p, length, caplen) == 0) {
+       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, (const u_char *)fp, length + FIREWIRE_HDRLEN);