Upgrade tcpdump to tcpdump-4.99.1
Test: make
Change-Id: I052ed8f5279c806e4d2ff925f581b71db3ac03c0
diff --git a/print-ap1394.c b/print-ap1394.c
index 79401cb..b1988f2 100644
--- a/print-ap1394.c
+++ b/print-ap1394.c
@@ -22,11 +22,12 @@
/* \summary: Apple IP-over-IEEE 1394 printer */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
+#define ND_LONGJMP_FROM_TCHECK
#include "netdissect.h"
#include "extract.h"
#include "addrtoname.h"
@@ -37,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;
};
/*
@@ -52,31 +53,31 @@
static const char *
fwaddr_string(netdissect_options *ndo, const u_char *addr)
{
- return (linkaddr_string(ndo, addr, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN));
+ return GET_LINKADDR_STRING(addr, LINKADDR_IEEE1394, FIREWIRE_EUI64_LEN);
}
-static inline void
-ap1394_hdr_print(netdissect_options *ndo, register const u_char *bp, u_int length)
+static void
+ap1394_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
{
- register const struct firewire_header *fp;
+ const struct firewire_header *fp;
uint16_t firewire_type;
fp = (const struct firewire_header *)bp;
- ND_PRINT((ndo, "%s > %s",
+ ND_PRINT("%s > %s",
fwaddr_string(ndo, fp->firewire_shost),
- fwaddr_string(ndo, fp->firewire_dhost)));
+ 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);
}
/*
@@ -85,7 +86,7 @@
* '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;
@@ -94,10 +95,9 @@
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);
@@ -107,7 +107,7 @@
fp = (const struct firewire_header *)p;
p += FIREWIRE_HDRLEN;
- ether_type = EXTRACT_16BITS(&fp->firewire_type);
+ ether_type = GET_BE_U_2(fp->firewire_type);
src.addr = fp->firewire_shost;
src.addr_string = fwaddr_string;
dst.addr = fp->firewire_dhost;
@@ -120,6 +120,4 @@
if (!ndo->ndo_suppress_default_print)
ND_DEFAULTPRINT(p, caplen);
}
-
- return FIREWIRE_HDRLEN;
}