DNS: Sync types with IANA

[tcpdump] / print-bt.c

diff --git a/print-bt.c b/print-bt.c
index 77aebe4262f10c8c01c9c96e7aec9943bddff2f3..46aa2782aeb58be8a320b809e7408e83858a300e 100644 (file)
--- a/print-bt.c
+++ b/print-bt.c
@@ -25,6 +25,7 @@
 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 

+#define ND_LONGJMP_FROM_TCHECK

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


@@ -46,31 +47,25 @@ typedef struct _bluetooth_h4_header {
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */

-u_int
+void

 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;
 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 bluetooth_h4_header* hdr = (const bluetooth_h4_header*)p;
+       const bluetooth_h4_header *hdr = (const bluetooth_h4_header *)p;

 
        ndo->ndo_protocol = "bluetooth";
        nd_print_protocol(ndo);
 
        ndo->ndo_protocol = "bluetooth";
        nd_print_protocol(ndo);

-       if (caplen < BT_HDRLEN)
-               goto trunc;
+       ND_TCHECK_LEN(p, BT_HDRLEN);
+       ndo->ndo_ll_hdr_len += BT_HDRLEN;

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

-       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 (!ndo->ndo_suppress_default_print)
                ND_DEFAULTPRINT(p, caplen);
        if (ndo->ndo_eflag)
                ND_PRINT(", hci length %u, direction %s", length,
                         (GET_BE_U_4(hdr->direction)&0x1) ? "in" : "out");
 
        if (!ndo->ndo_suppress_default_print)
                ND_DEFAULTPRINT(p, caplen);

-       return (BT_HDRLEN);
-
-trunc:
-       nd_print_trunc(ndo);
-       return (BT_HDRLEN);

 }
 #endif
 }
 #endif