summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Expose CONNACK Reason Code via serverConnectionProperties() for MQTT <5v5.15.0-beta4v5.15.0-beta3Konstantin Ritt2020-04-021-2/+2
| | | | | Change-Id: Ieea55c5990a24857c27a9dd71279bf08b2ff0170 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Better handling of MQTT SUBACK Reason CodesKonstantin Ritt2020-04-021-4/+29
| | | | | | | | prohibit reason codes not allowed for MQTT <=5 SUBACK (see section 3.9.3 for details) Change-Id: Ic433d14cd1c787da584e311c04273b676f4b450a Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Better handling of MQTT 5 CONNACK Reason CodesKonstantin Ritt2020-04-021-1/+44
| | | | | | | | | * map MQTT 5 reason codes to a legacy ClientError values * prohibit reason codes not allowed for MQTT 5 CONNACK (see section 3.2.2.2 for details) Change-Id: Ia5f5c2a55c9cf7477409b7f5bf670768b42eb979 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* QMqttConnection: code deduplicationKonstantin Ritt2020-04-022-27/+13
| | | | | | | squash finalize_pubAckRecComp() with finalize_pubrel() Change-Id: I1a14d1ca0efccbfc58edafe0eaf27d58543ac82a Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Doc: Update reason code documentationMaurice Kalinowski2020-04-011-4/+4
| | | | | | | | | As a follow up to 8b90d4808fad9e2fffda02dd90fa48e86d65e171 specify the version that the AUTH related enums have been introduced. Change-Id: I3f03a16504091f030e32bb97f9cae4e9b0864c62 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fix handling of incoming DISCONNECT Control packetKonstantin Ritt2020-04-021-0/+19
| | | | | | | | | | as of MQTT 5, DISCONNECT Control packet could be sent from the Client or the Server, however QMqttControlPacket::DISCONNECT wasn't handled in the switch, causing connection close with ProtocolViolation error. Change-Id: Ic908f4e51ad133aff90cac1c65aa6df7eb21a427 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* QMqttConnection: do not block when connecting with encryptionKonstantin Ritt2020-03-311-10/+5
| | | | | | | | instead, postpone the transportConnectionEstablished() call from QSslSocket's Connected to Encrypted state Change-Id: I4ed146897c6b084c3dd19848655a3c28979175ba Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Fix documentation of the qos argument meaningKonstantin Ritt2020-03-311-2/+2
| | | | | | Change-Id: I530ca158ca01a4d793bad9a5ea2eaf12f6098506 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Prohibit Subscription Identifier in Client to a Server PUBLISHKonstantin Ritt2020-03-311-0/+6
| | | | | | | | as per 3.3.4 > A PUBLISH packet sent from a Client to a Server MUST NOT contain a Subscription Identifier Change-Id: I490d46cdb346b0ebcd47f333ff410835a9c30733 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Introduce MQTT 5 AUTH specific Reason CodesKonstantin Ritt2020-03-313-6/+13
| | | | | | | and use them in place of magic numbers to improve the code readability Change-Id: Iec458898f9aee79b4e1977cd3bbe8697cb036ce6 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Prohibit sending MQTT 5 AUTH while connecting to the BrokerKonstantin Ritt2020-03-311-4/+5
| | | | | | | | the QMqttConnection's m_internalState distinguishes between Connecting and WaitForConnectAck, whilst QMqttClient's state doesn't Change-Id: Ic5c963aa07a8165e22b52baf36d98ac186cb6c58 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Fix handling of incoming MQTT 5 AUTH Control packetKonstantin Ritt2020-03-311-0/+16
| | | | | | | | QMqttControlPacket::AUTH wasn't handled in the switch, causing connection close with ProtocolViolation error. Change-Id: I6a9f44b66a8c8e9a6524bf98513428c5dc610a5b Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Better handling for topic alias of a received messageKonstantin Ritt2020-03-271-6/+9
| | | | | | | | | | * for received PUBLISH, check for Client-to-Server Maximum Topic Alias preference, not Server-to-Client one * fire ProtocolViolation on topicAlias == 0 * return earlier on errors Change-Id: Ia371b7a4e05704d07caab6c0d67b9180f590f1fc Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Get rid of stale TODO commentKonstantin Ritt2020-03-261-2/+0
| | | | | | | | it was already chosen to follow the Method B (which accidentally is the only proposed method in MQTT 5 Standard, by the way) Change-Id: I55dcea0f9b10ef4e4e83e559369a40c802c34899 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* QMqttClient: make ClientState, ClientError and ProtocolVersion Q_ENUM-sv5.15.0-beta2Konstantin Ritt2020-03-061-0/+7
| | | | | Change-Id: I94e2b559e561d9c1dd93b82996a5748a841fca3e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Fix documentation for QMqtt::MessageStatus::PublishedKonstantin Ritt2020-03-061-1/+1
| | | | | | | | | As per 3.3.2.2 > The Packet Identifier field is only present in PUBLISH packets > where the QoS level is 1 or 2. Change-Id: I45a9a165d207e0e2a01c6b33b7f602cd2dff178f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Minor improvement to the ReasonCode documentationKonstantin Ritt2020-03-061-0/+6
| | | | | Change-Id: I4ef25313ab2abc8016b320f3fbc54df5bc4d834c Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Do not apply properties that weren't actually readKonstantin Ritt2020-02-281-1/+2
| | | | | Change-Id: Id42829b63d5bbab0dc2f930a3f313d1b4d68704a Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Fix build with CONFIG+=no-rttiKonstantin Ritt2020-02-281-2/+2
| | | | | Change-Id: I00d1f2b4f5057069b39e4d73d65621807c331b3b Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1c244a04eb78e16e46acf4a6beb87da26995b995
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| |
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\| | | | | | | Change-Id: I1d6b63c06e9bff4b1126034a9975ae9f22140fa0
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I6a46fa939bf016a091f3ffa24bcf4ac7c7d114c8
| | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-091-0/+20
| |/ | | | | | | | | Change-Id: I64d5ae34c78a5fa86586900efa0870554bbee588 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-133-0/+53
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id9db3547396bd82b170db8c3025e5060d4cbba3e
| * Bump versionDaniel Smith2019-12-161-1/+1
| |
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+24
| |\ | | | | | | | | | Change-Id: I3099c3a2e853ae9a8029395d2a051071002ed22f
| | * Merge 5.14 into 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Frederik Gladhorn2019-11-221-0/+27
| | |\
| | * | Add changes file for Qt 5.14.0Antti Kokko2019-11-211-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie02629aea603a7515ec0ddfdf045f9f0ae53306e Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Fix flaky installationMaurice Kalinowski2019-12-021-0/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In very few cases, the installation step for the console example might copy the configuration.h header of both subprojects concurrently. In that case Mac bails out with an error. Avoid this by iterating ordered. Change-Id: Ic9dde91b1200a04ae598210f8b432d6efdd5d5c8 Fixes: QTBUG-80363 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * | Add documentation for QMqttMessageStatusPropertiesMaurice Kalinowski2019-11-151-0/+27
| |/ | | | | | | | | | | Fixes: QTBUG-76427 Change-Id: Ibc9cb2abe1260b9b478965316ed1c0d24904ce8e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-050-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I74fc1506a8698b3feeeb0aad578ea3b40ed3e935
| | * Bump versionv5.13.25.13.25.13Frederik Gladhorn2019-10-141-1/+1
| | |
* | | Fix build with --no-widgetsMaurice Kalinowski2020-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently a new configuration in our CI. Fixes: QTBUG-81064 Task-number: QTQAINFRA-2576 Change-Id: I022b56fd4fae487dfb84041c30ce061a28e5484c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-266-50/+18
|\| | | | | | | | | | | Change-Id: I7e8a509e3939b973f9055cd45c7a3b6351905e2c
| * | Examples: Remove ping buttonsMaurice Kalinowski2019-10-246-48/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since dcf3bbb9802f9adf79ae08d5d697b3ded3f0cb97 introduced autoKeepAlive, users should not send a ping message manually unless it is disabled. Change-Id: I4b717e2aebc8f40cabf009d4df7e1d146988d434 Fixes: QTBUG-79444 Reviewed-by: hjk <hjk@qt.io>
| * | Use nullptr instead of 0Maurice Kalinowski2019-10-242-2/+2
| | | | | | | | | | | | | | | Change-Id: Id4c8b194ce8ff8ec94fafcf1169a0cc9717684ed Reviewed-by: hjk <hjk@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-283-3/+7
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-283-3/+7
|/| | | | |/ / | | | | | | Change-Id: I7cad0d6283cbf8fab69105b6e8a61bca9199c5d7
| * | Update usage for encrypted connectionv5.14.0-beta2v5.14.0-beta1Maurice Kalinowski2019-09-263-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use the QMqttClient::connectToHostEncrypted() version taking a QSslConfiguration instead of applying global settings. Furthermore, the deprecated version will be removed in Qt6. Change-Id: I4b2a9ff2616ed1c0c645d0081719f2d40c6e3b20 Reviewed-by: hjk <hjk@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-211-0/+29
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-211-0/+29
|/| | | | |/ / | | | | | | Change-Id: If192473ae5406d3eb825d8211cf8a91991adbed6
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-alpha1Qt Forward Merge Bot2019-09-171-0/+29
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-171-0/+29
| |/| | | | |/ | | | | | | Change-Id: If2fa8b871204df26a6bd6d20ac7f383c31570d5b
| | * Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+29
| | |\
| | | * Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+29
| | |/| | | | | | | | | | | | | Change-Id: Ie3a5d8e3b25e45bfa4202d9931323ab1c514a00c
| | | * Add changes file for Qt 5.13.1v5.13.15.13.1Maurice Kalinowski2019-07-301-0/+29
| | |/ | | | | | | | | | | | | Change-Id: I0711ea10c944951a0e285b9a68ce4a9decb3f8ff Reviewed-by: hjk <hjk@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-056-38/+165
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-056-38/+165
|/| | | | |/ / | | | | | | Change-Id: Ie1e39b575314673b158d281d02be6b0447ee4c62
| * | Simplify readBufferTyped() routinesKonstantin Ritt2019-08-281-30/+14
| | | | | | | | | | | | | | | | | | | | | get rid of dubious code by generalizing template specializations Change-Id: Ib23f423f10e63985a11d18a9cfd37178ad18551e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>