summaryrefslogtreecommitdiffstats
path: root/src/bluetooth/bluez
Commit message (Collapse)AuthorAgeFilesLines
...
* Add missing "We mean it" comments to private headers.Friedemann Kleint2015-10-091-0/+11
| | | | | Change-Id: I4e78a2b263fb779253556201fd20fe47a2afc58e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* [Bluetooth] Optimize loopsKonstantin Ritt2015-09-161-3/+8
| | | | | | | | | | | | Decrease complexity from O(N+N*logN) to just O(N) for cases like foreach (Key key, map.keys()) Value value = map.value(key); , by rewriting with use of iterators. Change-Id: I81f1334797f16b624293fcebdee885b2be3c89f1 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add detection for running Bluez 4 daemonAlex Blasche2015-05-041-3/+17
| | | | | | | | | | | | So far we tried to detect Bluez5. If we couldn't find it the code automatically assumed Bluez4. That's not always true though as the Bluez daemon (bluetoothd) may not actually be running. In such cases we print a warning from now on. Change-Id: I6bf803ab21cb8906bb786bc0549db8e1bb3a0a3b Task-number: QTBUG-45750 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-241-7/+8
|\ | | | | | | Change-Id: Ie5ce761b77cc5c02647a9f7d52f427401b85d6b0
| * Use proper endian conversion functionsAndreas Schwab2015-02-171-7/+8
| | | | | | | | | | | | | | bswap_16 isn't defined anywhere, use qbswap from <QtCore/qendian.h> instead. Change-Id: I9ee260752ab7bcae3bbd30b4b71d30d52c837a2b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-1641-83/+83
|/ | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I3822a6484e8f7a420330de1cb1aeb0c3d1cf41b7 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Fix build with -no-c++11Fatih Aşıcı2015-01-273-55/+56
| | | | | | | | | | | | With -no-c++11, - Enum type names cannot be used as namespaces. Use old style naming. - For errno, errno.h must be included. - stdint.h must be included to use uint*_t types. Use quint* equivalents instead. Change-Id: I992f531a46cfc997df0aa6fc7ff6bf75fb750fc6 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Reset the controller's internal state when disconnectingAlex Blasche2014-11-231-0/+1
| | | | | | | | | | This caused problems when disconnecting from the remote device while an openrequest was pending and if the controller tried to reconnect immediately afterwards. The pending request queue was blocked forever. Change-Id: I444d5ac6763b65ec8baf687e0dccec4b28016a6c Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Upgrade ATT reads requests to encrypted links when indicatedAlex Blasche2014-09-161-0/+1
| | | | | | | | | | | | This is triggered if the GATT server complains about missing authorization/encryption when reading an attribute. The same mechanism has to be applied to all remaining read and write types Change-Id: Ia8330951ffdc61afb98424557bbeffe444e9a812 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add class for HCI protocol interactionAlex Blasche2014-09-164-2/+522
| | | | | | | | The first step is to monitor encryption changes. Later we will add more events and possibly commands as needed. Change-Id: I03ca547678bbfc971f53b32b1efde601685dd7e1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add ability to set the security level of the l2cp connectionAlex Blasche2014-09-161-0/+13
| | | | | | | | Later this will be needed to read/write authorized and encrypted characteristic/descriptor values. Change-Id: Ibc70b65b51723d6e0668ee177f5dbd1df2ba047f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add support for random vs public remote address connectionsAlex Blasche2014-09-021-0/+1
| | | | | | | | | | | | | | | | This is required to be able to connect to devices which use random device addresses. Some platforms can determine this flag based on their last device scan. The flag is likely to be provided as part of QBluetoothDeviceInfo once the information is available. Unfortunately non-le scan on BLuez doesn't inform about the flag. The LE device scan is currently not implemented and, even worse, requires root privileges on Linux. The new API element permits the selection of the correct type when the scan doesn't detect the type properly. Change-Id: I8e7118658a7c927e0ea07b0d639d57f9483cb33c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-282-0/+22
|\ | | | | | | | | | | | | Conflicts: src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp Change-Id: Ie8bf1903f9c7c1ccd5b05a3f97049ae0882b88b8
| * Add missing private headers warningSamuel Gaist2014-08-182-0/+22
| | | | | | | | | | Change-Id: I0f079a9b1b45bd2d2e946e06d7688f299a9c3fc3 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Update license headers and add new licensesJani Heikkinen2014-08-245-92/+52
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I7a8b8b787fcae9a178794364efdefe1021d10b1b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Remove libbluetooth system header dependencies from BTLE code baseAlex Blasche2014-08-131-0/+86
| | | | | | | | | | Change-Id: I44c2ba2308a786b1ed67a9f89701c2d18fe64f6b Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
* | Remove Bluez as link and include dependency from QtBluetoothAlex Blasche2014-08-123-212/+0
| | | | | | | | | | Change-Id: Ieecf341918ffdc51c359fed4969ef6c3998d83b8 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* | Merge branch '5.3' into devAlex Blasche2014-07-175-3/+102
|\| | | | | | | | | | | | | | | Conflicts: src/bluetooth/bluez/bluez.pri src/bluetooth/qbluetoothsocket_bluez.cpp Change-Id: Ieca8f2a327bf54b42403ddab88f8b9c3ff6b4a95
| * Reduce system header dependenciesAlex Blasche2014-07-162-1/+89
| | | | | | | | | | Change-Id: I52ac33b4864d6bfca248ff3fad5a069154a9c756 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Bluez5: Add Object-Push supportAlex Blasche2014-06-1710-2/+396
| | | | | | | | | | | | Task-number: QTBUG-32085 Change-Id: Ied7ffeac768dc65c44cc74112cdebaaf9bb2bc46 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Bluez5: Simplify lookup of default adapterAlex Blasche2014-06-022-0/+63
| | | | | | | | | | | | Change-Id: I59aa5241d33191a8ca8cc167263b63b024f52754 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Bluez5: Add service (un)registration supportAlex Blasche2014-06-024-2/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Bluez5 DBus API does not permit the selection of the local Bt adapter when registering a service. This means that if the local device has two Bluetooth adapters the service will be advertised by both adapters. This leads to cases where the QBluetoothServer::listen() call binds the socket on one adapter but the remote device tries to connect to the other adapter. For now this is an acceptable behavior since it is rather rare to have two local adapters at the same time. A potential future fix is tracked by QTBUG-39012. Task-number: QTBUG-32085 Change-Id: Ibb24edc5b9d1c25a005aedd98f6fc5d0d11b60f8 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Service discovery via Bluez5Alex Blasche2014-05-222-0/+191
| | | | | | | | | | | | | | | | | | At the same time we shift the ServiceClassUUID to service name mapping to QBluetoothUuid. It was used by Android and now Bluez 5 uses it too. Task-number: QTBUG-32085 Change-Id: I9f2d4dc4e2997683485f2ba7aaefb646cb72fb75 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Bluez5 support for QBluetoothDeviceDiscoveryAlex Blasche2014-05-092-0/+218
| | | | | | | | | | | | | | Task-number: QTBUG-32085 Change-Id: I31ae0dc9f0d09f3979797eb95eb87ed7bd181ae3 Reviewed-by: Oleg Shparber <trollixx@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Add Bluez5 support for QBluetoothLocalDeviceAlex Blasche2014-05-0615-2/+766
|/ | | | | | | | | The pairing signals are not yet implemented. For details see QTBUG-38401. Task-number: QTBUG-32085 Change-Id: I2b4e9a97b880801ebbffe367a8ab98320dd7ef2f Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Update Copyright headersAlex Blasche2013-06-252-2/+2
| | | | | | | | | - Update Digia's copyright year - Add copyright to files without it - Convert old BSD to new LGPL license for auto test code Change-Id: I47f5c871c436f9c2731b235026434448719cc671 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Replaced Nokia copyrights in headerTeemu Kaukoranta2013-05-2318-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | Replaced old Nokia copyrights with Digia copyrights. Removed "All rights reserved" strings without leading copyrights were removed (for example, 'Copyright SomeCompany, all rights reserved remain untouched). Did NOT touch contact details, will change them later. Excluded folders that have '3rdparty' in path. Used command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*' {} \; | tee >(xargs sed -i -r '1,10 s/([ \t#*]*)(.*Copyright.*Nokia.*)/ \1Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I') >(xargs sed -i -r '1,10 s/(^[ \t#*]*)(all rights reserved.*)/\1/I') This excludes binary files and retains whitespace and #* characters in the beginning of the edited lines. Change-Id: I9d4a312997b402c7a23d2e035db4de9aece1009a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-232-50/+50
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I4f07028d0bf0b3ba4c4649897b80687ea5e51abc Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Compile bluetooth for QtConnectivity under C++11 modeKalle Juhani Lehtonen2012-06-281-0/+12
| | | | | | | | | | In the spirit of: https://codereview.qt-project.org/#change,29448 Noticed when doing qt5 build under Ubuntu 12.04. Change-Id: Id7ffa6eab26ef78deeeb76be67cf337a3bc32311 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-302-2/+2
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I84f8c423bd7748bbae495fedae696990414cee83 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-202-2/+2
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I1c6ba5c87f0eca30b6f01f4245a032262d30f8ce Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-1120-20/+20
| | | | | | | | Update copyright headers from before 2011. Change-Id: Ic34da6aa9bf8ba63d4e41c2135b4fdaf7c437360 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed QtConnectivity bluetooth namespace compilation.Toby Tomkins2011-12-052-0/+6
| | | | | | Change-Id: I507f35962151e705682c65b1fe9bf33f309d3263 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* added Connectivity namespaces (QtBluetooth and QtNfc)Michael Zanetti2011-11-112-2/+2
| | | | | | Change-Id: I5f3062c857e657a6d05ab29edfa2f1b48cb173f8 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alex <alex.blasche@nokia.com>
* Initial commit.Michael Zanetti2011-08-2431-0/+1631
From qt5connectivity.tar.gz, md5 317c149d6f8c07d09632353188582834