diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-12-23 18:55:55 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-12-23 18:55:55 +0000 |
| commit | b16af7bdec39afe0819c52e1573e37f9cc2e378a (patch) | |
| tree | 43b5a9d821830f733f5da9364f813c6958fd45e6 | |
| parent | eb68a7b8d392896ff3a42c381f610f8f01724eed (diff) | |
| download | wireshark-b16af7bdec39afe0819c52e1573e37f9cc2e378a.tar.gz | |
From Michal Labedzki via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562
USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122
Bluetooth: L2CAP: Clarify constant
BTL2CAP_FIXED_CID_MAX should not be 0x40 because this is first
dynamic CID, so rename to BTL2CAP_FIXED_CID_LAST and set to
last fixed CID value.
svn path=/trunk/; revision=54404
| -rw-r--r-- | epan/dissectors/packet-btl2cap.c | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-btl2cap.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index e8d3411170..078b7ec662 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -1810,7 +1810,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) } } } - else if (cid < BTL2CAP_FIXED_CID_MAX) { + else if (cid <= BTL2CAP_FIXED_CID_LAST) { if (cid == BTL2CAP_FIXED_CID_AMP_MAN) { control = tvb_get_letohs(tvb, offset); if (control & 0x1) { @@ -1847,7 +1847,7 @@ dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data) proto_tree_add_item(btl2cap_tree, hf_btl2cap_payload, tvb, offset, length, ENC_NA); } } - else /* if (cid >= BTL2CAP_FIXED_CID_MAX) */ { /* Connection oriented channel */ + else /* if (cid > BTL2CAP_FIXED_CID_LAST) */ { /* Connection oriented channel */ wmem_tree_key_t key[6]; guint32 k_interface_id; guint32 k_adapter_id; diff --git a/epan/dissectors/packet-btl2cap.h b/epan/dissectors/packet-btl2cap.h index 4bcb3d446e..456c359bfa 100644 --- a/epan/dissectors/packet-btl2cap.h +++ b/epan/dissectors/packet-btl2cap.h @@ -49,7 +49,7 @@ #define BTL2CAP_FIXED_CID_LE_SIGNAL 0x0005 #define BTL2CAP_FIXED_CID_SMP 0x0006 #define BTL2CAP_FIXED_CID_AMP_TEST 0x003F -#define BTL2CAP_FIXED_CID_MAX 0x0040 +#define BTL2CAP_FIXED_CID_LAST 0x003F typedef struct _btl2cap_data_t { guint32 interface_id; |