Commit Graph

124 Commits

Author SHA1 Message Date
Alexis La Goutte a6ba632ec3 BTLE: Nesting level does not match indendation (CID 1261651)
Change-Id: I11e436ca91c766edc8e85fd2402e61a17465bee2
Reviewed-on: https://code.wireshark.org/review/6373
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-07 18:20:53 +00:00
Martin Mathieson 596669f921 First batch of unincludes. Last attempt...
Change-Id: I3681462aeb98ca62ed3ec5eb226b2553317391a9
Reviewed-on: https://code.wireshark.org/review/5997
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-22 21:03:13 +00:00
Michal Labedzki f5cd21543d Bluetooth: Add generic Bluetooth dissector
Bluetooth dissector is used to add ability to filter all bluetooth
payload from capture files (there are many transport like:
hci_h4, hci_h1, hci_usb, hci_mon, btle). Also it is used to placeholder for
all data tree used to store additional informations like bd_addrs, names, etc.
Finally it is used to be one point for Bluetooth
Endpoints/Conversation filtering what is enabled now.

Also add Master/Slave Role and Connection Mode tracking.

Change-Id: I67048080fb8ee16fa0f4ec429c1257de81ddd737
Reviewed-on: https://code.wireshark.org/review/5771
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-18 11:03:05 +00:00
Michal Labedzki 4a467ff609 Bluetooth: BTLE: Add src/dst addresses when they are known
Generally where it is not connection then on LinkLayer protocol level
addresses for Source and Destination device are known.

Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9
Reviewed-on: https://code.wireshark.org/review/5776
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-18 11:02:52 +00:00
Pascal Quantin c504772ffd Revert "Bluetooth: BTLE: Add src/dst addresses when they are known"
This reverts commit a89c17fb52.

Change-Id: I99029d72b82aaec1b398dffee0beec30829a3939
Reviewed-on: https://code.wireshark.org/review/5775
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-15 16:48:07 +00:00
Michal Labedzki a89c17fb52 Bluetooth: BTLE: Add src/dst addresses when they are known
Generally where it is not connection then on LinkLayer protocol level
addresses for Source and Destination device are known.

Change-Id: I28da88381a26826ad4897b56da993909130683d3
Reviewed-on: https://code.wireshark.org/review/5768
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-15 14:27:05 +00:00
Michal Labedzki 79d6a157ba Bluetooth: BTLE: SN, NESN should be numbers not booleans
SN = Sequence Number, so it is not bool.

Change-Id: I0691b17150bbbdd34a0e7cbe3cb90058c9183ff7
Reviewed-on: https://code.wireshark.org/review/5769
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-15 14:25:36 +00:00
Bill Meier 94d7e8d838 Use ENC_LITTLE_ENDIAN when fetching FT_U?INT8 fields ...
(for some dissectors which fetch all other integral fields using
   ENC_LITTLE_ENDIAN).

Change-Id: Ica72a68ac560f2920d61e0769de83130557c46fd
Reviewed-on: https://code.wireshark.org/review/5752
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13 21:58:59 +00:00
Michal Labedzki 845b781dfb Bluetooth: btle: Clear info column before use it
This fix "btle" over "ubertooth" dissector, so messeges from both
will not be merged.

Change-Id: I587b81a405f37d16e8ab417d94edfc633bfc14fc
Reviewed-on: https://code.wireshark.org/review/3877
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-28 07:07:37 +00:00
Michal Labedzki c7c4abaab0 Bluetooth: btle: Fix reserved field dissection
Also cosmetic changes:
1. Clear Info Column at start (fix garbages from previous protocols like Ubertooth)
2. Refactor a little all expert field definitions

Change-Id: Ie1cba8c1578597f2d896ec75f7d2af4987325bf3
Reviewed-on: https://code.wireshark.org/review/3768
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-08-21 10:27:15 +00:00
oyv 8ef6f589e3 btle advertising header flags (RxAdd/TxAdd) dissected incorrectly
bug:10384
Signed-off-by: oyv <ronningstad@gmail.com>

Change-Id: Ic31772c551f36fc8d144a5eaeae987a1e5f3e3f1
Reviewed-on: https://code.wireshark.org/review/3601
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit 9337e7962df8bc12f27019b20dedbb2311669949)
Change-Id: Ic31772c551f36fc8d144a5eaeae987a1e5f3e3f1
Reviewed-on: https://code.wireshark.org/review/3609
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-15 11:40:06 +00:00
Michael Mann 14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Dario Lombardo 246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00
Michael Mann 73217d9f3f tvb_new_subset -> tvb_new_subset_length when length parameters are equal.
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is.

Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d
Reviewed-on: https://code.wireshark.org/review/1999
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 15:41:07 +00:00
Alexis La Goutte ee07cd9e24 Make buildbot happy : packet-btle.c:275:16: error: declaration of 'index' shadows a global declaration [-Werror=shadow]
Change-Id: I94e1da9f12c257fa4e2c597f29a200d35e2d5d0d
Reviewed-on: https://code.wireshark.org/review/546
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-07 07:20:47 +00:00
Christopher Kilgour ef94a80bfa Introduces two new Bluetooth DLTs for RF-based captures.
Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing
BTLE dissector.

Fixes BTLE dissector to correctly extract packet CRC.

Adds CRC checking to BTLE dissector.

Provides optional context to BTLE dissector that allows RF captures to provide
link-layer hints for dissection details.  Significantly, parameters for
determining CRC correctness are provided, as well as Access Address validity
information.

Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb
Reviewed-on: https://code.wireshark.org/review/310
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-07 05:20:17 +00:00
Michal Labedzki 248c284622 Bluetooth: Fix interface_id
Interface ID should correspond to the Wireshark Interface Id
to avoid mixing data from various interfaces in dissectors.

Change-Id: Ibaa3ddab7f0ebd0985efea74439b94a5881145a7
Reviewed-on: https://code.wireshark.org/review/472
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-06 05:53:52 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Bill Meier 15a3a4436e (Minor) Use col_add_str() iso col_set_str().
Change-Id: I3d430e7e6a6bbdcb518f0110bd81ab32f88c17f0
Reviewed-on: https://code.wireshark.org/review/409
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-26 18:28:33 +00:00
Michal Labedzki 1987306015 Bluetooth: btle: Make RxAdd field reserved in some cases
Specification: "If the TxAdd or RxAdd fields are not
defined as used in a given PDU then they shall be considered
Reserved for Future Use."

Change-Id: I767c0df0366afe789624046cda2d49c9875ffe60
Reviewed-on: https://code.wireshark.org/review/103
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-04 13:15:55 +00:00
Michael Mann 11a61d757d Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606)
From Michal Labedzki

1. Bluetooth: Implement the rest of fields in Low Energy Link Layer dissector
2. Bluetooth: Merge all UUIDs together
3. Bluetooth: Extract LE Channel MAP to separate dissector
4. Ubertooth: Dissect CC2400 registers

svn path=/trunk/; revision=54700
2014-01-12 02:29:51 +00:00
Michael Mann c071a1c728 Bluetooth/Ubertooth improvements. Bug 9606 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606)
From Michal Labedski

1. add support for new btsnoop "format" introduced by BlueZ team in "btmon" tool
2. Bluetooth: Make EIR, AD and COD more generic
3. Bluetooth: HCI/LL: Update Error Codes to Core 4.1  Specification
4. Ubertooth: Fix response command handling
5. Ubertooth: Update to support firmware version
6. Ubertooth: Dissect by Vendor Id/Product Id

svn path=/trunk/; revision=54699
2014-01-12 00:50:41 +00:00
Alexis La Goutte 368df16f6a Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=54411
2013-12-23 20:12:26 +00:00
Alexis La Goutte 908bd09730 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: Add support for Low Energy Link Layer dissector

svn path=/trunk/; revision=54405
2013-12-23 18:56:06 +00:00