diff options
Diffstat (limited to 'contrib/tcpdump/print-ap1394.c')
| -rw-r--r-- | contrib/tcpdump/print-ap1394.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/contrib/tcpdump/print-ap1394.c b/contrib/tcpdump/print-ap1394.c index 3befe23..79401cb 100644 --- a/contrib/tcpdump/print-ap1394.c +++ b/contrib/tcpdump/print-ap1394.c @@ -19,14 +19,15 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED +/* \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" @@ -48,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) { @@ -57,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_dhost, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN), - linkaddr_string(ndo, fp->firewire_shost, 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) { @@ -83,8 +90,9 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch { 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]")); @@ -96,14 +104,18 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch 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) { + 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) ND_DEFAULTPRINT(p, caplen); |
