summaryrefslogtreecommitdiff
path: root/epan/dissectors/packet-btl2cap.c
AgeCommit message (Collapse)AuthorFilesLines
2014-03-24Check API found: Found non-ASCII characters on line 248 ..253AndersBroman1-6/+6
Change-Id: I964690c6468f1b8cfdf63cb5784f26065d56a204 Reviewed-on: https://code.wireshark.org/review/813 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Bluetooth: L2CAP: Fix disconnection CIDsMichal Labedzki1-5/+10
CID has two roles: Source CID and Destination CID. This two roles have another two different meanings: one if frame is received, another if frame is sent (SCID is "DCID", etc). Then using information that PDU is "request" or "response" we can correctly recognize CID. This should fix unrecognized L2CAP payload while there were no valid Disconnection Request. Change-Id: Ibcbbb9e6966873b6af12c1e3c65c6a3983aa4163 Reviewed-on: https://code.wireshark.org/review/807 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Bluetooth: L2CAP: A little update to Core 4.1Michal Labedzki1-12/+120
Add some command codes seen in Core 4.1 specification. Also add some missing fields. Change-Id: If3761744b1ada185027a560bceb66804d7eea8ec Reviewed-on: https://code.wireshark.org/review/806 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-06Bluetooth: Make Source/Destination BD_ADDRs and names filterableMichal Labedzki1-9/+10
Source/Destination BD_ADDRs and name are filterable. Also simplify code around wmem trees, and enable commented "data" field in unreassembled case and fix btl2cap offsets (discovered by enabling "data" field). Change-Id: Ic28c9bf19bcd6281b652be538b221da74df4bb76 Reviewed-on: https://code.wireshark.org/review/471 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-06Bluetooth: Fix interface_idMichal Labedzki1-7/+29
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-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-12Bluetooth/Ubertooth improvements. Bug 9606 ↵Michael Mann1-3/+3
(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
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: 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
2013-12-07Bluetooth enhancements. Bug 9446 ↵Michael Mann1-1/+2
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446) Bluetooth: SCO: Add Source/Destination addresses Bluetooth: HCRP: Use information from SDP to decoding PSM payload From Michal Labedzki svn path=/trunk/; revision=53816
2013-12-04From Michal Labedzki via ↵Chris Maynard1-11/+8
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446 - r53051 introduced an incorrect DISSECTOR_ASSERT(acl_data), which led me to believe that acl_data must not be NULL. Except for the removal of the DISSECTOR_ASSERT(acl_data), this patch basically reverts r53735 and r53743, as acl_data can be NULL. svn path=/trunk/; revision=53784
2013-12-03Remove some no-longer-necessary null pointer checks, as pointed out byGuy Harris1-8/+8
Coverity; dissect_btl2cap() now returns immediately if handed a null private-data pointer. svn path=/trunk/; revision=53743
2013-12-02Reject the packet if data is NULL without doing anything else.Chris Maynard1-3/+5
svn path=/trunk/; revision=53735
2013-11-30Replace "btsdp" tap with function to query service_infos tree, since that's ↵Michael Mann1-22/+2
all dissectors were doing with it. Not used outside of dissectors and cuts down on a few redundant global variables. svn path=/trunk/; revision=53677
2013-11-23Bluetooth improvements. Bug 9446 ↵Michael Mann1-3/+3
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9446) From Michal Labedzki svn path=/trunk/; revision=53525
2013-11-23Create the ability to have packet scoped "proto" data. Bug 9470 ↵Michael Mann1-22/+22
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470) I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future. And search/replace of a function name is easy enough to do. The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As. All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope(). All other dissectors were converted to using file_scope() which was the original scope for "proto" data. svn path=/trunk/; revision=53520
2013-11-20Add explicit casts to please GCCPascal Quantin1-8/+8
svn path=/trunk/; revision=53448
2013-11-20Provide "Decode As" functionality through dissectors themselves instead of ↵Michael Mann1-0/+90
the GUI. Bug 9450 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9450) The basic idea behind this design is to have dissectors register with a "decode as list" with their name and dissector table. When "Decode As" dialog is launched, any "registered" dissector found in the packet will cause a tab to be created in the dialog. This patch includes just the dissector portion of the functionality (minus packet-dcerpc.[ch] because it has hooks to the current GUI) svn path=/trunk/; revision=53445
2013-11-10Add missing includes in order to remove exceptions.h from proto.h (next commit).Jakub Zawadzki1-0/+1
svn path=/trunk/; revision=53230
2013-11-02Bluetooth: Use dissector data instead of pinfo->private_data. Bug 7893 ↵Michael Mann1-66/+58
(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-3/+3
- 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: SDP: Decode all types of UUIDs. Bug 9327 ↵Michael Mann1-2/+1
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327). From Michal Labedzki svn path=/trunk/; revision=52864
2013-10-26Replace tabs by spaces. Bug 9327 ↵Michael Mann1-3/+1
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9327) From Michal Labedzki svn path=/trunk/; revision=52857
2013-09-09expert_add_info_format_text -> expert_add_info_formatMichael Mann1-3/+3
svn path=/trunk/; revision=51852
2013-07-28From Michal Labedzki via ↵Pascal Quantin1-0/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8948 : Bluetooth: add missing PSM strings svn path=/trunk/; revision=50968
2013-07-09Batch of filterable expert infos.Michael Mann1-4/+18
svn path=/trunk/; revision=50454
2013-06-20From Michal Labedzki viaEvan Huus1-25/+28
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8824 Convert bluetooth emem trees to wmem trees. Add modelines and fix indentation. Correct typo in wmem_tree.h that still referred to emem. svn path=/trunk/; revision=50076
2013-03-30From Michal Labedzki via ↵Evan Huus1-17/+11
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8509 Unify bluetooth direction handling (sent vs rcvd). svn path=/trunk/; revision=48661
2013-03-30From Michal Labedzki via ↵Evan Huus1-279/+129
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8509 Round 3 of Bluetooth SDP updates. Update the list of company IDs and fix service recognition. svn path=/trunk/; revision=48660
2013-03-30From Michal Labedzki via ↵Evan Huus1-1/+1
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8509 Round 2 of Bluetooth SDP updates: - replace a lot of proto_tree_add_text with named fields - dissect more of the protocol - misc fixes svn path=/trunk/; revision=48655
2013-03-28From Michal Labedzki via ↵Evan Huus1-1/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8536 Fix unrecognised CID session payload in bluetooth if there are multiple sessions with the same DCID. svn path=/trunk/; revision=48618
2013-03-19From Michal Labedzki via ↵Pascal Quantin1-7/+10
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-42/+47
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-03-18From Michal Labedzki:Anders Broman1-9/+8
Update HID to version 1.1 Also fix SDP TAP to avoid crash. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304 svn path=/trunk/; revision=48386
2013-03-16From beroset:Anders Broman1-18/+18
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48337
2013-02-21Minor Bluetooth fixesMichael Mann1-15/+99
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
2013-02-21Fix AVCTP, AVRCP, HCI AVL and L2CP for multiple interfaces/adaptersMichael Mann1-162/+544
From Michal Labedzki, bug 8367 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8367) svn path=/trunk/; revision=47809
2013-02-14From Michael Labedzki via ↵Chris Maynard1-2/+3
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304: Fix potential inconsistency with interfaces introduced with r47651. svn path=/trunk/; revision=47655
2013-02-13Fix Coverity CID 981007: Dereference before null check. Bug introduced with ↵Chris Maynard1-6/+6
r47632. svn path=/trunk/; revision=47651
2013-02-11From: Michal Labedzki:Anders Broman1-5/+9
Bluetooth: Improve support of MAP, PBAP, BPP and BIP in OBEX Add support for recognize profiles using OBEX (by "Target"), then add all Application Parameters specific for MAP, PBAP, BPP, BIP. Also fix one FIXME, so now dissecting by OBEX does not cause malformed frames while jumping over dissected packets. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8304 svn path=/trunk/; revision=47632
2012-11-05From Michal Labedzki:Anders Broman1-3/+21
Add support for AVDTP/A2DP/VDP and SBC Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893 svn path=/trunk/; revision=45921
2012-11-05From Andrei Emeltchenko:Anders Broman1-1/+1
Makes L2CAP be independent from acl_data When L2CAP is transferred through wireless it has no ACL incapsulation. The patch makes it possible to chain L2CAP dissector based on LLC bluetooth pid. Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7633 svn path=/trunk/; revision=45918
2012-11-05From Michal Labedzki:Anders Broman1-12/+15
"Decode By" for Bluetooth support decoding by L2CAP service, L2CAP CID, L2CAP PSM, RFCOMM service and RFCOMM channel. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7754 svn path=/trunk/; revision=45913
2012-10-22from Allan M. Madsen:Anders Broman1-1/+91
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-2/+15
[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-1/+3
Bluetooth: Provide PSM for higher layers This is needed by AVRCP, HCRP and AVDTP to recognize other substreams. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7740 svn path=/trunk/; revision=45041
2012-09-21From Michal Labedzki:Anders Broman1-5/+2
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-21From Michal Labedzki:Anders Broman1-1/+1
FCS is not part of "Control" subtree so move it. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7639 svn path=/trunk/; revision=45038
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45017
2012-08-13Add length checks to make sure we don't underflow an integer. MakeGerald Combs1-6/+18
sure we allocate and copy the same amount of data. Fixes bug 7621. svn path=/trunk/; revision=44476
2012-06-28Update FSF address - part II.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=43538
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-04 08:57:51 +0000