NTP: Use tstr for truncation indicator.

[tcpdump] / print-ap1394.c

diff --git a/print-ap1394.c b/print-ap1394.c
index 1e6bbd98b5a87f543958daeee20b704a057bacc8..79401cba0ef71c45904911c762406ddb7c53f671 100644 (file)
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -49,6 +49,12 @@ struct firewire_header {
  */
 #define FIREWIRE_HDRLEN                18
 
  */
 #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)
 {
 static inline void
 ap1394_hdr_print(netdissect_options *ndo, register const u_char *bp, u_int length)
 {


@@ -58,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",
        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) {
 
        firewire_type = EXTRACT_16BITS(&fp->firewire_type);
        if (!ndo->ndo_qflag) {


@@ -86,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;
        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]"));
 
        if (caplen < FIREWIRE_HDRLEN) {
                ND_PRINT((ndo, "[|ap1394]"));


@@ -101,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);
        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);
                /* ether_type not known, print raw packet */
                if (!ndo->ndo_eflag)
                        ap1394_hdr_print(ndo, (const u_char *)fp, length + FIREWIRE_HDRLEN);