Add CAP_FCNTL and use cap_fcntls_limit().

[tcpdump] / print-bt.c

diff --git a/print-bt.c b/print-bt.c
index 3c89a291f8168e4afa848147837c68ac7d301fcd..128daade063f8ade4c449803bbc5422c6a4d785a 100644 (file)
--- a/print-bt.c
+++ b/print-bt.c
@@ -17,24 +17,15 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * 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
-
+#define NETDISSECT_REWORKED

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 

-#include <pcap.h>
-#include <stdio.h>
-#include <string.h>
-

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

-#include "addrtoname.h"

 
 #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
 #include <pcap/bluetooth.h>
 
 #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
 #include <pcap/bluetooth.h>


@@ -47,24 +38,24 @@ 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;
        const pcap_bluetooth_h4_header* hdr = (const pcap_bluetooth_h4_header*)p;
 
        if (caplen < BT_HDRLEN) {
 {
        u_int length = h->len;
        u_int caplen = h->caplen;
        const pcap_bluetooth_h4_header* hdr = (const pcap_bluetooth_h4_header*)p;
 
        if (caplen < BT_HDRLEN) {

-               printf("[|bt]");
+               ND_PRINT((ndo, "[|bt]"));

                return (BT_HDRLEN);
        }
        caplen -= BT_HDRLEN;
        length -= BT_HDRLEN;
        p += BT_HDRLEN;
                return (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");
+       if (ndo->ndo_eflag)
+               ND_PRINT((ndo, "hci length %d, direction %s, ", length, (EXTRACT_32BITS(&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);
 }
 
        return (BT_HDRLEN);
 }