aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-btl2cap.c
AgeCommit message (Collapse)AuthorFilesLines
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
2012-03-18From Reinhard Speyerer: Fix several misspellings/typos in WiresharkBill Meier1-2/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6967 svn path=/trunk/; revision=41645
2012-03-12Cleanup & minor bug fixes:Bill Meier1-1495/+1510
- Don't put a value_string array in a .h file (included in several .c files); - 'if ((a!=NULL) && !b) {fail}' should be 'if ((a==NULL) || !b) {fail}' in a few cases; - Use value_string_ext as appropriate; - Use val_to_str_const() in place of val_to_str() as appropriate; - Use tvb_new_subset_remaining(...) instead of tvb_new_subset(..., -1, -1); - Use tvb_reported_length_remaining() in place of tvb_length_remaining() in some cases; - tvb_reported_length_remaining() can return -1; - Use of TFS(&true_false) not req'd since "True"/"False" is the default if no TFS provided; - Reformat various (long lines, etc); - Use consistent indentation. svn path=/trunk/; revision=41502
2012-02-06Fix some Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-4/+6
svn path=/trunk/; revision=40900
2012-01-28From Michal Labedzki:Anders Broman1-8/+100
Fix:Wrong bluetooth PSM detected when parse the L2CAP packet. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6619 svn path=/trunk/; revision=40749
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-10 Convert 'encoding' parameter of certain proto_tree_add_item() calls in ↵Bill Meier1-2/+2
non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_BOOLEAN FT_IPv4 FT_EUI64 FT_GUID FT_UINT_STRING Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260) svn path=/trunk/; revision=39328
2011-10-06Convert 'encoding' parameter of certain proto_tree_add_item() calls in ↵Bill Meier1-92/+92
non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_UINT8 FT_UINT16 FT_UINT24 FT_UINT32 FT_UINT64 FT_INT8 FT_INT16 FT_INT24 FT_INT32 FT_INT64 FT_FLOAT FT_DOUBLE svn path=/trunk/; revision=39288
2011-10-04Use ENC_NA as encoding for proto_tree_add_item() calls which directly ↵Bill Meier1-8/+8
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