The third argument to linkaddr_string is one of the LINKADDR_ enums.

[tcpdump] / print-bt.c

diff --git a/print-bt.c b/print-bt.c
index 259f3e5d9c76063b39bb3d5006050aca55274986..9b0859f9f7a7ab6ff40f6333189852185bb3bc75 100644 (file)
--- a/print-bt.c
+++ b/print-bt.c
@@ -9,37 +9,37 @@
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:
  * this paragraph in its entirety in the documentation or other materials
  * provided with the distribution, and (3) all advertising materials mentioning
  * features or use of this software display the following acknowledgement:

- * ``This product includes software developed by Paolo Abeni.'' 
- * The name of author may not be used to endorse or promote products derived 
+ * ``This product includes software developed by Paolo Abeni.''
+ * The name of author may not be used to endorse or promote products derived

  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * from this software without specific prior written permission.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-bt.c,v 1.2 2008-09-25 21:45:50 guy Exp $";
-#endif
+/* \summary: Bluetooth printer */

 
 #ifdef HAVE_CONFIG_H
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <tcpdump-stdinc.h>
-
-#include <pcap.h>
-#include <stdio.h>
-#include <string.h>
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 #include "extract.h"

-#include "addrtoname.h"

 
 

-#if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
-#include <pcap/bluetooth.h>
+#ifdef DLT_BLUETOOTH_HCI_H4_WITH_PHDR
+
+/*
+ * Header prepended by libpcap to each bluetooth h4 frame;
+ * the direction field is in network byte order.
+ */
+typedef struct _bluetooth_h4_header {
+       nd_uint32_t direction; /* if first bit is set direction is incoming */
+} bluetooth_h4_header;
+
+#define        BT_HDRLEN sizeof(bluetooth_h4_header)

 
 

-#define        BT_HDRLEN sizeof(pcap_bluetooth_h4_header)

 /*
  * This is the top level routine of the printer.  'p' points
  * to the bluetooth header of the packet, 'h->ts' is the timestamp,
 /*
  * This is the top level routine of the printer.  'p' points
  * to the bluetooth header of the packet, 'h->ts' is the timestamp,


@@ -47,33 +47,30 @@ static const char rcsid[] _U_ =
  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int

-bt_if_print(const struct pcap_pkthdr *h, const u_char *p)
+bt_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)

 {
        u_int length = h->len;
        u_int caplen = h->caplen;
 {
        u_int length = h->len;
        u_int caplen = h->caplen;

-       const pcap_bluetooth_h4_header* hdr = (const pcap_bluetooth_h4_header*)p;
+       const bluetooth_h4_header* hdr = (const bluetooth_h4_header*)p;

 
 

-       if (caplen < BT_HDRLEN) {
-               printf("[|bt]");
-               return (BT_HDRLEN);
-       }
+       ndo->ndo_protocol = "bluetooth";
+       nd_print_protocol(ndo);
+       if (caplen < BT_HDRLEN)
+               goto trunc;

        caplen -= BT_HDRLEN;
        length -= BT_HDRLEN;
        p += BT_HDRLEN;
        caplen -= BT_HDRLEN;
        length -= BT_HDRLEN;
        p += BT_HDRLEN;

-       if (eflag)
-               (void)printf("hci length %d, direction %s, ", length, (EXTRACT_32BITS(&hdr->direction)&0x1)?"in":"out");
+       ND_TCHECK_4(hdr->direction);
+       if (ndo->ndo_eflag)
+               ND_PRINT(", hci length %u, direction %s", length,
+                        (GET_BE_U_4(hdr->direction)&0x1) ? "in" : "out");

 
 

-       if (!suppress_default_print)
-               default_print(p, caplen);
+       if (!ndo->ndo_suppress_default_print)
+               ND_DEFAULTPRINT(p, caplen);
+       return (BT_HDRLEN);

 
 

+trunc:
+       nd_print_trunc(ndo);

        return (BT_HDRLEN);
 }
 #endif
        return (BT_HDRLEN);
 }
 #endif

-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */