aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-bthci_cmd.c
AgeCommit message (Collapse)AuthorFilesLines
2014-12-18Bluetooth: Add generic Bluetooth dissectorMichal Labedzki1-405/+142
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-18Bluetooth: BTLE: Add src/dst addresses when they are knownMichal Labedzki1-31/+31
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-15Revert "Bluetooth: BTLE: Add src/dst addresses when they are known"Pascal Quantin1-31/+31
This reverts commit a89c17fb52ec1270076abd82e6e5cd56d94fa682. Change-Id: I99029d72b82aaec1b398dffee0beec30829a3939 Reviewed-on: https://code.wireshark.org/review/5775 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-15Bluetooth: BTLE: Add src/dst addresses when they are knownMichal Labedzki1-31/+31
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-11-01Bluetooth: Fix AVRCP UUIDMichal Labedzki1-1/+1
Change-Id: Iaddde4a1ce49b46e4473c1a470760d9cbbe8000e Reviewed-on: https://code.wireshark.org/review/5038 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-10-30Fix a typo: Unidirected -> UndirectedJeff Morriss1-3/+3
As reported in https://ask.wireshark.org/questions/37462/possible-mistake-in-bluetooth-low-energy-hci-event-type Change-Id: Ia6217531208b00c52c89bcb279cbbe67b5163e96 Reviewed-on: https://code.wireshark.org/review/5004 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-22Try to fix some buildbot warningsMichal Labedzki1-1/+1
Most interesting are: warning: cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations] warning: ISO C forbids zero-size array [-Wpedantic] warning: ISO C90 doesn't support unnamed structs/unions [-Wpedantic] warning: cast discards '__attribute__((const))' qualifier from pointer target type [-Wcast-qual warning: initializer element is not computable at load time [enabled by default] Change-Id: I5573c6bdca856a304877d9bef643f8c0fa93cdaf Reviewed-on: https://code.wireshark.org/review/3174 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-09-20Bluetooth: HCI: Add support for user/vendor commandsMichal Labedzki1-2/+41
Some Vendors can provide own subset of HCI commands/events, so provide them possibility to write own dissectors and use them by "Decode As". Change-Id: I87ff60ae12ac63ddd4b12b26951aa9f5143eabc6 Reviewed-on: https://code.wireshark.org/review/4166 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-19Do encoding-arg changes (all benign)Bill Meier1-1/+1
For: - FT_BYTES: Always use just ENC_NA - integral/floating (other than FT_[U]INT8): Do ENC_NA --> ENC_BIG_ENDIAN Also: - FT_UINT... --> FT_UINT8 in a few cases (to match proto_tree_add_item...) - Change one case of incorrect '||' to '|' Change-Id: I427e0e61618ff8faf55691c8a695930f67d455b0 Reviewed-on: https://code.wireshark.org/review/4184 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-12/+12
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-12/+12
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18Fixup: tvb_get_string(z) -> tvb_get_string(z)_encDario Lombardo1-2/+2
Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe Reviewed-on: https://code.wireshark.org/review/2376 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-07tvb_new_subset -> tvb_new_subset_length when length parameters are equal.Michael Mann1-7/+7
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-03-24Bluetooth: Add Member "Company" UUIDsMichal Labedzki1-0/+19
Change-Id: I8f455f12eeeaa51a0699e4cc1ee639d7031ce2c6 Reviewed-on: https://code.wireshark.org/review/803 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(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-01-20From Michal Labedzki:Anders Broman1-80/+80
Bluetooth/Ubertooth: Improvements: Support for new btsnoop format, almost finished btle and minor fixes. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9606 svn path=/trunk/; revision=54862
2014-01-12Bluetooth/Ubertooth improvements. Bug 9606 ↵Michael Mann1-106/+660
(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-12Bluetooth/Ubertooth improvements. Bug 9606 ↵Michael Mann1-854/+1201
(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
2013-12-23From Michal Labedzki via ↵Alexis La Goutte1-2/+2
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: HCI: Clarify roles for Switch Role command Descriptions now based on Core 4.1 specification. svn path=/trunk/; revision=54403
2013-11-28Bluetooth improvements. Bug 9446 ↵Michael Mann1-3/+6
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446) From Michal Labedzki. 1. Bluetooth: HFP: Fix recognizing roles. There is need to check which side SDP record is, then it is possible to recognize roles. 2. Bluetooth: RFCOMM/HFP: Fix recognizing services and roles. Direction bit means only that device is initiator of connection or not. But need information who is owner of connection (remote device or localhost), so use this information from L2CAP. 3. Bluetooth: HFP: Fix unexpected expert info 4. Bluetooth: HCI: Set addresses to host/controller. Also optimize a little handing of dissectors handles. svn path=/trunk/; revision=53628
2013-11-23Bluetooth improvements. Bug 9446 ↵Michael Mann1-3/+9
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446) From Michal Labedzki svn path=/trunk/; revision=53525
2013-11-02Bluetooth: Use dissector data instead of pinfo->private_data. Bug 7893 ↵Michael Mann1-11/+11
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893) From Michal Labedzki svn path=/trunk/; revision=53051
2013-10-29From didier gautheron: remove redundant or use faster col_xxx functionsBill Meier1-2/+2
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster. - same for replace col_append_fstr and col_append_str - remove col_clear() when it's redundant: + before a col_set/col_add if the dissector can't throw an exception. - replace col_append() after a col_clear() with faster col_add... or col_set https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9344 svn path=/trunk/; revision=52948
2013-10-26Bluetooth: Use items for logical block objects. Bug 9327 ↵Michael Mann1-8/+26
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) Bluetooth protocols use items, so dissect it to improve filtering and better user experience - text object cannot be filterable or comparable. From Michal Labedzki svn path=/trunk/; revision=52863
2013-09-02Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
svn path=/trunk/; revision=51652
2013-08-27From Michal Labedzki:Anders Broman1-1/+9
Full dissection of EIR/AD and little improve filtering, cd https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9050 svn path=/trunk/; revision=51527
2013-08-18Bluetooth: HCI: Synchronize and update Voice command. Bug 9050 ↵Michael Mann1-5/+19
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9050) From Michal Labedzki. svn path=/trunk/; revision=51411
2013-08-18HCI: Full dissection of EIR/AD and little improve filtering, bug 9050 ↵Michael Mann1-41/+227
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9050) From Michal Labedzki. From me: 1. Have boolean filters use tfs_true_false instead of NULL (because it appears previous functionality had "TRUE" and "FALSE"). Perhaps other tfs_ values could be used, but tfs_true_false makes a good placeholder. 2. Add FT_ETHER field as a proto_tree_add_item. svn path=/trunk/; revision=51410
2013-07-23From Michal Labedzki:Anders Broman1-41/+522
HCI: Improve Class of Device dissection. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8948 svn path=/trunk/; revision=50814
2013-07-23From Michal Labedzki:Anders Broman1-296/+606
HCI: Add latest Assigned Numbers https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8948 svn path=/trunk/; revision=50813
2013-03-30From Michal Labedzki via ↵Evan Huus1-2/+14
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8509 Unify bluetooth direction handling (sent vs rcvd). svn path=/trunk/; revision=48661
2013-03-19From Michal Labedzki via ↵Pascal Quantin1-8/+11
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 : Remove C++ incompatibilities from Bluetooth dissectors and switch to wmem API svn path=/trunk/; revision=48414
2013-03-18From Michal Labedzki:Anders Broman1-7/+7
Fix issues found by fix-encoding-args.pl https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304 svn path=/trunk/; revision=48388
2013-03-18From Michal Labedzki:Anders Broman1-1/+3
Fix issues discovered by cppcheck Also use global OUI array in AVRCP. Thanks to Evan Huus for cppcheck. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304 svn path=/trunk/; revision=48387
2013-02-21Minor Bluetooth fixesMichael Mann1-5/+5
1. Allow to DecodeBy payload over AVCTP 2. Fix L2CAP CID payload recognize after disc 3. Removed unneeded _U_ 4. Fall back to control channel in AVRCP 5. Fix time-tracking for passthrough and capability AVRCP commands From Michal Labedzki, bug 8367 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8367) svn path=/trunk/; revision=47810
2012-12-03Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8038 :Pascal Quantin1-1/+2
Prevent a counter overflow in while loops svn path=/trunk/; revision=46345
2012-12-02Remove unneeded variable initializers.Evan Huus1-4/+4
svn path=/trunk/; revision=46328
2012-11-29From Michal Labedzki:Anders Broman1-1/+1
Bluetooth: Add support for source/destination addresses Within resolving devices names. Also make header file more generic, packet-hci_h4.h renamed to packet-bluetooth-hci.h. Part of: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032 svn path=/trunk/; revision=46278
2012-10-22FixJörg Mayer1-2/+2
wireshark/svn/trunk/epan/dissectors/packet-bthci_cmd.c:2611:13: error: format ‘%g’ expects argument of type ‘double’, but argument 3 has type ‘int’ [-Werror=format] wireshark/svn/trunk/epan/dissectors/packet-bthci_cmd.c:2617:13: error: format ‘%g’ expects argument of type ‘double’, but argument 3 has type ‘int’ [-Werror=format] svn path=/trunk/; revision=45711
2012-10-22from Allan M. Madsen:Anders Broman1-79/+1288
Add support for HCI 3.0+HS and v4.0, Bluetooth Low Energy. This includes dissection of additional HCI commands and events, Attribute Protocol and Security Manager Protocol. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7872 svn path=/trunk/; revision=45709
2012-10-09From Michal Labedzki:Anders Broman1-0/+12
[PATCH 15] Bluetooth: Add modelines https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639 svn path=/trunk/; revision=45422
2012-09-21From Michal Labedzki:Anders Broman1-7/+3
Bluetooth: Cleanup headers Remove redundant headers and sort existing to chosen convention. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639 svn path=/trunk/; revision=45039
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-2/+0
svn path=/trunk/; revision=45017
2012-06-28Update FSF address - part II.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=43538
2012-03-21From Martin Kaiser via ↵Jeff Morriss1-1/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6977 : The attached (trivial) patch adds some missing breaks in switch-case blocks. This fixes coverity defects #445, #446, #1316 and #1380. svn path=/trunk/; revision=41727
2012-03-12Use consistent indentation;Bill Meier1-2455/+2455
Do minor reformatting. svn path=/trunk/; revision=41503
2011-10-21For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.Bill Meier1-1/+1
Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-10-19Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-6/+12
svn path=/trunk/; revision=39481
2011-10-15Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, ↵Bill Meier1-3/+3
FT_STRINGZ, FT_UINT_STRING as follows: 1. If there's no character encoding (ENC_ASCII, ...) specified then use ENC_ASCII. 2. For all but FT_UINT_STRING, always use ENC_NA (replacing any existing True/1/FALSE/0 /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN). svn path=/trunk/; revision=39426
2011-10-04Use ENC_NA as encoding for proto_tree_add_item() calls which directly ↵Bill Meier1-13/+13
reference an hf item (in hf[] with types: FT_NONE FT_BYTES FT_IPV6 FT_IPXNET FT_OID Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN svn path=/trunk/; revision=39260