Add EXTRACT_ calls.

[tcpdump] / print-bt.c

diff --git a/print-bt.c b/print-bt.c
index 68c02a61610eb0d3bedf8974c52d1db4b077c31e..7eddbec2c541670139e33718e292af6dd572ab35 100644 (file)
--- a/print-bt.c
+++ b/print-bt.c
@@ -17,13 +17,15 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: Bluetooth 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"
 
 #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
@@ -51,7 +53,7 @@ bt_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *
        length -= BT_HDRLEN;
        p += BT_HDRLEN;
        if (ndo->ndo_eflag)
-               ND_PRINT((ndo, "hci length %d, direction %s, ", length, (EXTRACT_32BITS(&hdr->direction)&0x1)?"in":"out"));
+               ND_PRINT((ndo, "hci length %d, direction %s, ", length, (EXTRACT_BE_U_4(&hdr->direction)&0x1)?"in":"out"));
 
        if (!ndo->ndo_suppress_default_print)
                ND_DEFAULTPRINT(p, caplen);