Ian Craggs / MQTT

Better timing

Dependencies:   FP MQTTPacket

Fork of MQTT by MQTT

MQTTClient.h@55:71ae1a773b64, 2017-10-03 (annotated)

Committer:
icraggs
Date:
Tue Oct 03 22:51:58 2017 +0000
Revision:
55:71ae1a773b64
Parent:
54:ff9e5c4b52d0 
Allow acks to be sent at end of timeout

Who changed what in which revision?

UserRevisionLine numberNew contents of line
icraggs 6:4d312a49200b 1 /*******************************************************************************
icraggs 53:15b5a280d22d 2 * Copyright (c) 2014, 2017 IBM Corp.
sam_grove 0:fe461e4d7afe 3 *
icraggs 6:4d312a49200b 4 * All rights reserved. This program and the accompanying materials
icraggs 6:4d312a49200b 5 * are made available under the terms of the Eclipse Public License v1.0
icraggs 6:4d312a49200b 6 * and Eclipse Distribution License v1.0 which accompany this distribution.
sam_grove 0:fe461e4d7afe 7 *
icraggs 6:4d312a49200b 8 * The Eclipse Public License is available at
icraggs 6:4d312a49200b 9 * http://www.eclipse.org/legal/epl-v10.html
icraggs 6:4d312a49200b 10 * and the Eclipse Distribution License is available at
icraggs 6:4d312a49200b 11 * http://www.eclipse.org/org/documents/edl-v10.php.
sam_grove 0:fe461e4d7afe 12 *
icraggs 6:4d312a49200b 13 * Contributors:
icraggs 6:4d312a49200b 14 * Ian Craggs - initial API and implementation and/or initial documentation
icraggs 46:e335fcc1a663 15 * Ian Craggs - fix for bug 458512 - QoS 2 messages
icraggs 46:e335fcc1a663 16 * Ian Craggs - fix for bug 460389 - send loop uses wrong length
icraggs 46:e335fcc1a663 17 * Ian Craggs - fix for bug 464169 - clearing subscriptions
icraggs 46:e335fcc1a663 18 * Ian Craggs - fix for bug 464551 - enums and ints can be different size
icraggs 53:15b5a280d22d 19 * Mark Sonnentag - fix for bug 475204 - inefficient instantiation of Timer
icraggs 53:15b5a280d22d 20 * Ian Craggs - fix for bug 475749 - packetid modified twice
icraggs 53:15b5a280d22d 21 * Ian Craggs - add ability to set message handler separately #6
icraggs 6:4d312a49200b 22 *******************************************************************************/
sam_grove 0:fe461e4d7afe 23
icraggs 2:dcfdd2abfe71 24 #if !defined(MQTTCLIENT_H)
icraggs 2:dcfdd2abfe71 25 #define MQTTCLIENT_H
icraggs 2:dcfdd2abfe71 26
icraggs 34:e18a166198df 27 #include "FP.h"
icraggs 3:dbff6b768d28 28 #include "MQTTPacket.h"
icraggs 53:15b5a280d22d 29 #include <stdio.h>
icraggs 43:21da1f744243 30 #include "MQTTLogging.h"
icraggs 43:21da1f744243 31
icraggs 43:21da1f744243 32 #if !defined(MQTTCLIENT_QOS1)
icraggs 43:21da1f744243 33 #define MQTTCLIENT_QOS1 1
icraggs 43:21da1f744243 34 #endif
icraggs 43:21da1f744243 35 #if !defined(MQTTCLIENT_QOS2)
icraggs 43:21da1f744243 36 #define MQTTCLIENT_QOS2 0
icraggs 43:21da1f744243 37 #endif
icraggs 2:dcfdd2abfe71 38
icraggs 3:dbff6b768d28 39 namespace MQTT
icraggs 3:dbff6b768d28 40 {
icraggs 3:dbff6b768d28 41
icraggs 2:dcfdd2abfe71 42
icraggs 2:dcfdd2abfe71 43 enum QoS { QOS0, QOS1, QOS2 };
sam_grove 0:fe461e4d7afe 44
icraggs 31:a51dd239b78e 45 // all failure return codes must be negative
icraggs 23:05fc7de97d4a 46 enum returnCode { BUFFER_OVERFLOW = -2, FAILURE = -1, SUCCESS = 0 };
icraggs 23:05fc7de97d4a 47
icraggs 2:dcfdd2abfe71 48
icraggs 3:dbff6b768d28 49 struct Message
icraggs 2:dcfdd2abfe71 50 {
icraggs 2:dcfdd2abfe71 51 enum QoS qos;
icraggs 2:dcfdd2abfe71 52 bool retained;
icraggs 2:dcfdd2abfe71 53 bool dup;
Ian Craggs 12:cc7f2d62a393 54 unsigned short id;
icraggs 2:dcfdd2abfe71 55 void *payload;
icraggs 2:dcfdd2abfe71 56 size_t payloadlen;
sam_grove 0:fe461e4d7afe 57 };
sam_grove 0:fe461e4d7afe 58
icraggs 4:4ef00243708e 59
icraggs 20:cad3d54d7ecf 60 struct MessageData
icraggs 20:cad3d54d7ecf 61 {
icraggs 31:a51dd239b78e 62 MessageData(MQTTString &aTopicName, struct Message &aMessage) : message(aMessage), topicName(aTopicName)
icraggs 37:e3d64f9b986c 63 { }
icraggs 43:21da1f744243 64
icraggs 31:a51dd239b78e 65 struct Message &message;
icraggs 31:a51dd239b78e 66 MQTTString &topicName;
icraggs 20:cad3d54d7ecf 67 };
icraggs 20:cad3d54d7ecf 68
icraggs 20:cad3d54d7ecf 69
icraggs 53:15b5a280d22d 70 struct connackData
icraggs 53:15b5a280d22d 71 {
icraggs 53:15b5a280d22d 72 int rc;
icraggs 53:15b5a280d22d 73 bool sessionPresent;
icraggs 53:15b5a280d22d 74 };
icraggs 53:15b5a280d22d 75
icraggs 53:15b5a280d22d 76
icraggs 53:15b5a280d22d 77 struct subackData
icraggs 53:15b5a280d22d 78 {
icraggs 53:15b5a280d22d 79 int grantedQoS;
icraggs 53:15b5a280d22d 80 };
icraggs 53:15b5a280d22d 81
icraggs 53:15b5a280d22d 82
icraggs 9:01b8cc7d94cc 83 class PacketId
icraggs 9:01b8cc7d94cc 84 {
icraggs 9:01b8cc7d94cc 85 public:
icraggs 23:05fc7de97d4a 86 PacketId()
icraggs 23:05fc7de97d4a 87 {
icraggs 23:05fc7de97d4a 88 next = 0;
icraggs 23:05fc7de97d4a 89 }
icraggs 43:21da1f744243 90
icraggs 23:05fc7de97d4a 91 int getNext()
icraggs 23:05fc7de97d4a 92 {
icraggs 53:15b5a280d22d 93 return next = (next == MAX_PACKET_ID) ? 1 : next + 1;
icraggs 23:05fc7de97d4a 94 }
icraggs 43:21da1f744243 95
icraggs 9:01b8cc7d94cc 96 private:
icraggs 9:01b8cc7d94cc 97 static const int MAX_PACKET_ID = 65535;
icraggs 9:01b8cc7d94cc 98 int next;
icraggs 9:01b8cc7d94cc 99 };
icraggs 31:a51dd239b78e 100
icraggs 31:a51dd239b78e 101
icraggs 21:e918525e529d 102 /**
icraggs 21:e918525e529d 103 * @class Client
icraggs 22:aadb79d29330 104 * @brief blocking, non-threaded MQTT client API
icraggs 43:21da1f744243 105 *
icraggs 23:05fc7de97d4a 106 * This version of the API blocks on all method calls, until they are complete. This means that only one
icraggs 43:21da1f744243 107 * MQTT request can be in process at any one time.
icraggs 21:e918525e529d 108 * @param Network a network class which supports send, receive
icraggs 43:21da1f744243 109 * @param Timer a timer class with the methods:
icraggs 43:21da1f744243 110 */
icraggs 31:a51dd239b78e 111 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE = 100, int MAX_MESSAGE_HANDLERS = 5>
icraggs 31:a51dd239b78e 112 class Client
icraggs 2:dcfdd2abfe71 113 {
icraggs 43:21da1f744243 114
icraggs 22:aadb79d29330 115 public:
icraggs 43:21da1f744243 116
icraggs 31:a51dd239b78e 117 typedef void (*messageHandler)(MessageData&);
icraggs 23:05fc7de97d4a 118
icraggs 23:05fc7de97d4a 119 /** Construct the client
icraggs 23:05fc7de97d4a 120 * @param network - pointer to an instance of the Network class - must be connected to the endpoint
icraggs 23:05fc7de97d4a 121 * before calling MQTT connect
icraggs 23:05fc7de97d4a 122 * @param limits an instance of the Limit class - to alter limits as required
icraggs 23:05fc7de97d4a 123 */
icraggs 43:21da1f744243 124 Client(Network& network, unsigned int command_timeout_ms = 30000);
icraggs 43:21da1f744243 125
icraggs 20:cad3d54d7ecf 126 /** Set the default message handling callback - used for any message which does not match a subscription message handler
icraggs 53:15b5a280d22d 127 * @param mh - pointer to the callback function. Set to 0 to remove.
icraggs 20:cad3d54d7ecf 128 */
icraggs 20:cad3d54d7ecf 129 void setDefaultMessageHandler(messageHandler mh)
icraggs 20:cad3d54d7ecf 130 {
icraggs 53:15b5a280d22d 131 if (mh != 0)
icraggs 53:15b5a280d22d 132 defaultMessageHandler.attach(mh);
icraggs 53:15b5a280d22d 133 else
icraggs 53:15b5a280d22d 134 defaultMessageHandler.detach();
icraggs 20:cad3d54d7ecf 135 }
icraggs 42:f5beda831651 136
icraggs 53:15b5a280d22d 137 /** Set a message handling callback. This can be used outside of the the subscribe method.
icraggs 53:15b5a280d22d 138 * @param topicFilter - a topic pattern which can include wildcards
icraggs 53:15b5a280d22d 139 * @param mh - pointer to the callback function. If 0, removes the callback if any
icraggs 53:15b5a280d22d 140 */
icraggs 53:15b5a280d22d 141 int setMessageHandler(const char* topicFilter, messageHandler mh);
icraggs 53:15b5a280d22d 142
icraggs 43:21da1f744243 143 /** MQTT Connect - send an MQTT connect packet down the network and wait for a Connack
icraggs 43:21da1f744243 144 * The nework object must be connected to the network endpoint before calling this
icraggs 43:21da1f744243 145 * Default connect options are used
icraggs 43:21da1f744243 146 * @return success code -
icraggs 43:21da1f744243 147 */
icraggs 43:21da1f744243 148 int connect();
icraggs 53:15b5a280d22d 149
icraggs 53:15b5a280d22d 150 /** MQTT Connect - send an MQTT connect packet down the network and wait for a Connack
icraggs 43:21da1f744243 151 * The nework object must be connected to the network endpoint before calling this
icraggs 20:cad3d54d7ecf 152 * @param options - connect options
icraggs 43:21da1f744243 153 * @return success code -
icraggs 43:21da1f744243 154 */
icraggs 43:21da1f744243 155 int connect(MQTTPacket_connectData& options);
icraggs 43:21da1f744243 156
icraggs 53:15b5a280d22d 157 /** MQTT Connect - send an MQTT connect packet down the network and wait for a Connack
icraggs 53:15b5a280d22d 158 * The nework object must be connected to the network endpoint before calling this
icraggs 53:15b5a280d22d 159 * @param options - connect options
icraggs 53:15b5a280d22d 160 * @param connackData - connack data to be returned
icraggs 53:15b5a280d22d 161 * @return success code -
icraggs 53:15b5a280d22d 162 */
icraggs 53:15b5a280d22d 163 int connect(MQTTPacket_connectData& options, connackData& data);
icraggs 53:15b5a280d22d 164
icraggs 20:cad3d54d7ecf 165 /** MQTT Publish - send an MQTT publish packet and wait for all acks to complete for all QoSs
icraggs 20:cad3d54d7ecf 166 * @param topic - the topic to publish to
icraggs 20:cad3d54d7ecf 167 * @param message - the message to send
icraggs 43:21da1f744243 168 * @return success code -
icraggs 43:21da1f744243 169 */
icraggs 43:21da1f744243 170 int publish(const char* topicName, Message& message);
icraggs 53:15b5a280d22d 171
icraggs 43:21da1f744243 172 /** MQTT Publish - send an MQTT publish packet and wait for all acks to complete for all QoSs
icraggs 43:21da1f744243 173 * @param topic - the topic to publish to
icraggs 43:21da1f744243 174 * @param payload - the data to send
icraggs 43:21da1f744243 175 * @param payloadlen - the length of the data
icraggs 43:21da1f744243 176 * @param qos - the QoS to send the publish at
icraggs 43:21da1f744243 177 * @param retained - whether the message should be retained
icraggs 43:21da1f744243 178 * @return success code -
icraggs 43:21da1f744243 179 */
icraggs 43:21da1f744243 180 int publish(const char* topicName, void* payload, size_t payloadlen, enum QoS qos = QOS0, bool retained = false);
icraggs 53:15b5a280d22d 181
icraggs 43:21da1f744243 182 /** MQTT Publish - send an MQTT publish packet and wait for all acks to complete for all QoSs
icraggs 43:21da1f744243 183 * @param topic - the topic to publish to
icraggs 43:21da1f744243 184 * @param payload - the data to send
icraggs 43:21da1f744243 185 * @param payloadlen - the length of the data
icraggs 53:15b5a280d22d 186 * @param id - the packet id used - returned
icraggs 43:21da1f744243 187 * @param qos - the QoS to send the publish at
icraggs 43:21da1f744243 188 * @param retained - whether the message should be retained
icraggs 43:21da1f744243 189 * @return success code -
icraggs 43:21da1f744243 190 */
icraggs 43:21da1f744243 191 int publish(const char* topicName, void* payload, size_t payloadlen, unsigned short& id, enum QoS qos = QOS1, bool retained = false);
icraggs 43:21da1f744243 192
icraggs 20:cad3d54d7ecf 193 /** MQTT Subscribe - send an MQTT subscribe packet and wait for the suback
icraggs 20:cad3d54d7ecf 194 * @param topicFilter - a topic pattern which can include wildcards
icraggs 20:cad3d54d7ecf 195 * @param qos - the MQTT QoS to subscribe at
icraggs 20:cad3d54d7ecf 196 * @param mh - the callback function to be invoked when a message is received for this subscription
icraggs 43:21da1f744243 197 * @return success code -
icraggs 43:21da1f744243 198 */
icraggs 20:cad3d54d7ecf 199 int subscribe(const char* topicFilter, enum QoS qos, messageHandler mh);
icraggs 43:21da1f744243 200
icraggs 53:15b5a280d22d 201 /** MQTT Subscribe - send an MQTT subscribe packet and wait for the suback
icraggs 53:15b5a280d22d 202 * @param topicFilter - a topic pattern which can include wildcards
icraggs 53:15b5a280d22d 203 * @param qos - the MQTT QoS to subscribe at©
icraggs 53:15b5a280d22d 204 * @param mh - the callback function to be invoked when a message is received for this subscription
icraggs 53:15b5a280d22d 205 * @param
icraggs 53:15b5a280d22d 206 * @return success code -
icraggs 53:15b5a280d22d 207 */
icraggs 53:15b5a280d22d 208 int subscribe(const char* topicFilter, enum QoS qos, messageHandler mh, subackData &data);
icraggs 53:15b5a280d22d 209
icraggs 20:cad3d54d7ecf 210 /** MQTT Unsubscribe - send an MQTT unsubscribe packet and wait for the unsuback
icraggs 20:cad3d54d7ecf 211 * @param topicFilter - a topic pattern which can include wildcards
icraggs 43:21da1f744243 212 * @return success code -
icraggs 43:21da1f744243 213 */
icraggs 20:cad3d54d7ecf 214 int unsubscribe(const char* topicFilter);
icraggs 43:21da1f744243 215
icraggs 31:a51dd239b78e 216 /** MQTT Disconnect - send an MQTT disconnect packet, and clean up any state
icraggs 43:21da1f744243 217 * @return success code -
icraggs 20:cad3d54d7ecf 218 */
icraggs 20:cad3d54d7ecf 219 int disconnect();
icraggs 43:21da1f744243 220
icraggs 20:cad3d54d7ecf 221 /** A call to this API must be made within the keepAlive interval to keep the MQTT connection alive
icraggs 43:21da1f744243 222 * yield can be called if no other MQTT operation is needed. This will also allow messages to be
icraggs 20:cad3d54d7ecf 223 * received.
icraggs 23:05fc7de97d4a 224 * @param timeout_ms the time to wait, in milliseconds
icraggs 26:2658bb87c53d 225 * @return success code - on failure, this means the client has disconnected
icraggs 20:cad3d54d7ecf 226 */
icraggs 43:21da1f744243 227 int yield(unsigned long timeout_ms = 1000L);
icraggs 43:21da1f744243 228
icraggs 43:21da1f744243 229 /** Is the client connected?
icraggs 43:21da1f744243 230 * @return flag - is the client connected or not?
icraggs 43:21da1f744243 231 */
icraggs 43:21da1f744243 232 bool isConnected()
icraggs 43:21da1f744243 233 {
icraggs 43:21da1f744243 234 return isconnected;
icraggs 43:21da1f744243 235 }
icraggs 43:21da1f744243 236
icraggs 20:cad3d54d7ecf 237 private:
icraggs 20:cad3d54d7ecf 238
icraggs 53:15b5a280d22d 239 void closeSession();
icraggs 46:e335fcc1a663 240 void cleanSession();
icraggs 20:cad3d54d7ecf 241 int cycle(Timer& timer);
icraggs 20:cad3d54d7ecf 242 int waitfor(int packet_type, Timer& timer);
icraggs 20:cad3d54d7ecf 243 int keepalive();
icraggs 43:21da1f744243 244 int publish(int len, Timer& timer, enum QoS qos);
icraggs 2:dcfdd2abfe71 245
icraggs 3:dbff6b768d28 246 int decodePacket(int* value, int timeout);
icraggs 20:cad3d54d7ecf 247 int readPacket(Timer& timer);
icraggs 20:cad3d54d7ecf 248 int sendPacket(int length, Timer& timer);
icraggs 26:2658bb87c53d 249 int deliverMessage(MQTTString& topicName, Message& message);
icraggs 26:2658bb87c53d 250 bool isTopicMatched(char* topicFilter, MQTTString& topicName);
icraggs 43:21da1f744243 251
icraggs 23:05fc7de97d4a 252 Network& ipstack;
icraggs 43:21da1f744243 253 unsigned long command_timeout_ms;
icraggs 15:64a57183aa03 254
icraggs 43:21da1f744243 255 unsigned char sendbuf[MAX_MQTT_PACKET_SIZE];
icraggs 43:21da1f744243 256 unsigned char readbuf[MAX_MQTT_PACKET_SIZE];
icraggs 43:21da1f744243 257
icraggs 43:21da1f744243 258 Timer last_sent, last_received;
icraggs 15:64a57183aa03 259 unsigned int keepAliveInterval;
icraggs 20:cad3d54d7ecf 260 bool ping_outstanding;
icraggs 43:21da1f744243 261 bool cleansession;
icraggs 43:21da1f744243 262
icraggs 9:01b8cc7d94cc 263 PacketId packetid;
icraggs 43:21da1f744243 264
icraggs 16:91c2f9a144d4 265 struct MessageHandlers
icraggs 15:64a57183aa03 266 {
icraggs 26:2658bb87c53d 267 const char* topicFilter;
icraggs 31:a51dd239b78e 268 FP<void, MessageData&> fp;
icraggs 23:05fc7de97d4a 269 } messageHandlers[MAX_MESSAGE_HANDLERS]; // Message handlers are indexed by subscription topic
icraggs 43:21da1f744243 270
icraggs 31:a51dd239b78e 271 FP<void, MessageData&> defaultMessageHandler;
icraggs 43:21da1f744243 272
icraggs 26:2658bb87c53d 273 bool isconnected;
icraggs 43:21da1f744243 274
icraggs 43:21da1f744243 275 #if MQTTCLIENT_QOS1 || MQTTCLIENT_QOS2
icraggs 43:21da1f744243 276 unsigned char pubbuf[MAX_MQTT_PACKET_SIZE]; // store the last publish for sending on reconnect
icraggs 43:21da1f744243 277 int inflightLen;
icraggs 43:21da1f744243 278 unsigned short inflightMsgid;
icraggs 43:21da1f744243 279 enum QoS inflightQoS;
icraggs 43:21da1f744243 280 #endif
icraggs 43:21da1f744243 281
icraggs 43:21da1f744243 282 #if MQTTCLIENT_QOS2
icraggs 43:21da1f744243 283 bool pubrel;
icraggs 43:21da1f744243 284 #if !defined(MAX_INCOMING_QOS2_MESSAGES)
icraggs 43:21da1f744243 285 #define MAX_INCOMING_QOS2_MESSAGES 10
icraggs 43:21da1f744243 286 #endif
icraggs 43:21da1f744243 287 unsigned short incomingQoS2messages[MAX_INCOMING_QOS2_MESSAGES];
icraggs 43:21da1f744243 288 bool isQoS2msgidFree(unsigned short id);
icraggs 43:21da1f744243 289 bool useQoS2msgid(unsigned short id);
icraggs 46:e335fcc1a663 290 void freeQoS2msgid(unsigned short id);
icraggs 31:a51dd239b78e 291 #endif
icraggs 28:8b2abe9bd814 292
sam_grove 0:fe461e4d7afe 293 };
sam_grove 0:fe461e4d7afe 294
icraggs 15:64a57183aa03 295 }
icraggs 15:64a57183aa03 296
icraggs 15:64a57183aa03 297
icraggs 43:21da1f744243 298 template<class Network, class Timer, int a, int MAX_MESSAGE_HANDLERS>
icraggs 53:15b5a280d22d 299 void MQTT::Client<Network, Timer, a, MAX_MESSAGE_HANDLERS>::cleanSession()
icraggs 46:e335fcc1a663 300 {
icraggs 46:e335fcc1a663 301 for (int i = 0; i < MAX_MESSAGE_HANDLERS; ++i)
icraggs 46:e335fcc1a663 302 messageHandlers[i].topicFilter = 0;
icraggs 46:e335fcc1a663 303
icraggs 46:e335fcc1a663 304 #if MQTTCLIENT_QOS1 || MQTTCLIENT_QOS2
icraggs 46:e335fcc1a663 305 inflightMsgid = 0;
icraggs 46:e335fcc1a663 306 inflightQoS = QOS0;
icraggs 46:e335fcc1a663 307 #endif
icraggs 46:e335fcc1a663 308
icraggs 46:e335fcc1a663 309 #if MQTTCLIENT_QOS2
icraggs 46:e335fcc1a663 310 pubrel = false;
icraggs 46:e335fcc1a663 311 for (int i = 0; i < MAX_INCOMING_QOS2_MESSAGES; ++i)
icraggs 46:e335fcc1a663 312 incomingQoS2messages[i] = 0;
icraggs 46:e335fcc1a663 313 #endif
icraggs 46:e335fcc1a663 314 }
icraggs 46:e335fcc1a663 315
icraggs 46:e335fcc1a663 316
icraggs 46:e335fcc1a663 317 template<class Network, class Timer, int a, int MAX_MESSAGE_HANDLERS>
icraggs 53:15b5a280d22d 318 void MQTT::Client<Network, Timer, a, MAX_MESSAGE_HANDLERS>::closeSession()
icraggs 53:15b5a280d22d 319 {
icraggs 53:15b5a280d22d 320 ping_outstanding = false;
icraggs 53:15b5a280d22d 321 isconnected = false;
icraggs 53:15b5a280d22d 322 if (cleansession)
icraggs 53:15b5a280d22d 323 cleanSession();
icraggs 53:15b5a280d22d 324 }
icraggs 53:15b5a280d22d 325
icraggs 53:15b5a280d22d 326
icraggs 53:15b5a280d22d 327 template<class Network, class Timer, int a, int MAX_MESSAGE_HANDLERS>
icraggs 23:05fc7de97d4a 328 MQTT::Client<Network, Timer, a, MAX_MESSAGE_HANDLERS>::Client(Network& network, unsigned int command_timeout_ms) : ipstack(network), packetid()
icraggs 15:64a57183aa03 329 {
icraggs 43:21da1f744243 330 this->command_timeout_ms = command_timeout_ms;
icraggs 53:15b5a280d22d 331 cleansession = true;
icraggs 53:15b5a280d22d 332 closeSession();
icraggs 46:e335fcc1a663 333 }
icraggs 43:21da1f744243 334
icraggs 43:21da1f744243 335
icraggs 43:21da1f744243 336 #if MQTTCLIENT_QOS2
icraggs 43:21da1f744243 337 template<class Network, class Timer, int a, int b>
icraggs 43:21da1f744243 338 bool MQTT::Client<Network, Timer, a, b>::isQoS2msgidFree(unsigned short id)
icraggs 43:21da1f744243 339 {
icraggs 43:21da1f744243 340 for (int i = 0; i < MAX_INCOMING_QOS2_MESSAGES; ++i)
icraggs 43:21da1f744243 341 {
icraggs 43:21da1f744243 342 if (incomingQoS2messages[i] == id)
icraggs 43:21da1f744243 343 return false;
icraggs 43:21da1f744243 344 }
icraggs 43:21da1f744243 345 return true;
icraggs 11:db15da110a37 346 }
icraggs 11:db15da110a37 347
icraggs 11:db15da110a37 348
icraggs 43:21da1f744243 349 template<class Network, class Timer, int a, int b>
icraggs 43:21da1f744243 350 bool MQTT::Client<Network, Timer, a, b>::useQoS2msgid(unsigned short id)
icraggs 43:21da1f744243 351 {
icraggs 43:21da1f744243 352 for (int i = 0; i < MAX_INCOMING_QOS2_MESSAGES; ++i)
icraggs 43:21da1f744243 353 {
icraggs 43:21da1f744243 354 if (incomingQoS2messages[i] == 0)
icraggs 43:21da1f744243 355 {
icraggs 43:21da1f744243 356 incomingQoS2messages[i] = id;
icraggs 43:21da1f744243 357 return true;
icraggs 43:21da1f744243 358 }
icraggs 43:21da1f744243 359 }
icraggs 43:21da1f744243 360 return false;
icraggs 43:21da1f744243 361 }
icraggs 46:e335fcc1a663 362
icraggs 46:e335fcc1a663 363
icraggs 46:e335fcc1a663 364 template<class Network, class Timer, int a, int b>
icraggs 46:e335fcc1a663 365 void MQTT::Client<Network, Timer, a, b>::freeQoS2msgid(unsigned short id)
icraggs 46:e335fcc1a663 366 {
icraggs 46:e335fcc1a663 367 for (int i = 0; i < MAX_INCOMING_QOS2_MESSAGES; ++i)
icraggs 46:e335fcc1a663 368 {
icraggs 46:e335fcc1a663 369 if (incomingQoS2messages[i] == id)
icraggs 46:e335fcc1a663 370 {
icraggs 46:e335fcc1a663 371 incomingQoS2messages[i] = 0;
icraggs 46:e335fcc1a663 372 return;
icraggs 46:e335fcc1a663 373 }
icraggs 46:e335fcc1a663 374 }
icraggs 46:e335fcc1a663 375 }
icraggs 43:21da1f744243 376 #endif
icraggs 43:21da1f744243 377
icraggs 43:21da1f744243 378
icraggs 43:21da1f744243 379 template<class Network, class Timer, int a, int b>
icraggs 23:05fc7de97d4a 380 int MQTT::Client<Network, Timer, a, b>::sendPacket(int length, Timer& timer)
icraggs 8:c46930bd6c82 381 {
icraggs 43:21da1f744243 382 int rc = FAILURE,
icraggs 23:05fc7de97d4a 383 sent = 0;
icraggs 43:21da1f744243 384
icraggs 55:71ae1a773b64 385 do
icraggs 23:05fc7de97d4a 386 {
icraggs 46:e335fcc1a663 387 rc = ipstack.write(&sendbuf[sent], length - sent, timer.left_ms());
icraggs 26:2658bb87c53d 388 if (rc < 0) // there was an error writing the data
icraggs 26:2658bb87c53d 389 break;
icraggs 26:2658bb87c53d 390 sent += rc;
icraggs 55:71ae1a773b64 391 } while (sent < length && !timer.expired());
icraggs 20:cad3d54d7ecf 392 if (sent == length)
icraggs 23:05fc7de97d4a 393 {
icraggs 43:21da1f744243 394 if (this->keepAliveInterval > 0)
icraggs 43:21da1f744243 395 last_sent.countdown(this->keepAliveInterval); // record the fact that we have successfully sent the packet
icraggs 23:05fc7de97d4a 396 rc = SUCCESS;
icraggs 23:05fc7de97d4a 397 }
icraggs 23:05fc7de97d4a 398 else
icraggs 23:05fc7de97d4a 399 rc = FAILURE;
icraggs 53:15b5a280d22d 400
icraggs 43:21da1f744243 401 #if defined(MQTT_DEBUG)
icraggs 46:e335fcc1a663 402 char printbuf[150];
icraggs 55:71ae1a773b64 403 DEBUG("Rc %d from sending packet %s\r\n", rc,
icraggs 54:ff9e5c4b52d0 404 MQTTFormat_toServerString(printbuf, sizeof(printbuf), sendbuf, length));
icraggs 43:21da1f744243 405 #endif
icraggs 23:05fc7de97d4a 406 return rc;
icraggs 8:c46930bd6c82 407 }
icraggs 8:c46930bd6c82 408
icraggs 8:c46930bd6c82 409
icraggs 43:21da1f744243 410 template<class Network, class Timer, int a, int b>
icraggs 26:2658bb87c53d 411 int MQTT::Client<Network, Timer, a, b>::decodePacket(int* value, int timeout)
icraggs 8:c46930bd6c82 412 {
icraggs 36:2f1ada427e56 413 unsigned char c;
icraggs 8:c46930bd6c82 414 int multiplier = 1;
icraggs 8:c46930bd6c82 415 int len = 0;
icraggs 20:cad3d54d7ecf 416 const int MAX_NO_OF_REMAINING_LENGTH_BYTES = 4;
icraggs 8:c46930bd6c82 417
icraggs 8:c46930bd6c82 418 *value = 0;
icraggs 8:c46930bd6c82 419 do
icraggs 8:c46930bd6c82 420 {
icraggs 8:c46930bd6c82 421 int rc = MQTTPACKET_READ_ERROR;
icraggs 8:c46930bd6c82 422
icraggs 8:c46930bd6c82 423 if (++len > MAX_NO_OF_REMAINING_LENGTH_BYTES)
icraggs 8:c46930bd6c82 424 {
icraggs 8:c46930bd6c82 425 rc = MQTTPACKET_READ_ERROR; /* bad data */
icraggs 8:c46930bd6c82 426 goto exit;
icraggs 8:c46930bd6c82 427 }
icraggs 23:05fc7de97d4a 428 rc = ipstack.read(&c, 1, timeout);
icraggs 8:c46930bd6c82 429 if (rc != 1)
icraggs 8:c46930bd6c82 430 goto exit;
icraggs 8:c46930bd6c82 431 *value += (c & 127) * multiplier;
icraggs 8:c46930bd6c82 432 multiplier *= 128;
icraggs 8:c46930bd6c82 433 } while ((c & 128) != 0);
icraggs 8:c46930bd6c82 434 exit:
icraggs 8:c46930bd6c82 435 return len;
icraggs 8:c46930bd6c82 436 }
icraggs 8:c46930bd6c82 437
icraggs 8:c46930bd6c82 438
icraggs 8:c46930bd6c82 439 /**
icraggs 8:c46930bd6c82 440 * If any read fails in this method, then we should disconnect from the network, as on reconnect
icraggs 43:21da1f744243 441 * the packets can be retried.
icraggs 8:c46930bd6c82 442 * @param timeout the max time to wait for the packet read to complete, in milliseconds
icraggs 53:15b5a280d22d 443 * @return the MQTT packet type, 0 if none, -1 if error
icraggs 8:c46930bd6c82 444 */
icraggs 46:e335fcc1a663 445 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 46:e335fcc1a663 446 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::readPacket(Timer& timer)
icraggs 8:c46930bd6c82 447 {
icraggs 26:2658bb87c53d 448 int rc = FAILURE;
icraggs 8:c46930bd6c82 449 MQTTHeader header = {0};
icraggs 8:c46930bd6c82 450 int len = 0;
icraggs 8:c46930bd6c82 451 int rem_len = 0;
icraggs 8:c46930bd6c82 452
icraggs 8:c46930bd6c82 453 /* 1. read the header byte. This has the packet type in it */
icraggs 53:15b5a280d22d 454 rc = ipstack.read(readbuf, 1, timer.left_ms());
icraggs 53:15b5a280d22d 455 if (rc != 1)
icraggs 8:c46930bd6c82 456 goto exit;
icraggs 8:c46930bd6c82 457
icraggs 8:c46930bd6c82 458 len = 1;
icraggs 8:c46930bd6c82 459 /* 2. read the remaining length. This is variable in itself */
icraggs 20:cad3d54d7ecf 460 decodePacket(&rem_len, timer.left_ms());
icraggs 43:21da1f744243 461 len += MQTTPacket_encode(readbuf + 1, rem_len); /* put the original remaining length into the buffer */
icraggs 8:c46930bd6c82 462
icraggs 46:e335fcc1a663 463 if (rem_len > (MAX_MQTT_PACKET_SIZE - len))
icraggs 46:e335fcc1a663 464 {
icraggs 46:e335fcc1a663 465 rc = BUFFER_OVERFLOW;
icraggs 46:e335fcc1a663 466 goto exit;
icraggs 46:e335fcc1a663 467 }
icraggs 46:e335fcc1a663 468
icraggs 8:c46930bd6c82 469 /* 3. read the rest of the buffer using a callback to supply the rest of the data */
icraggs 43:21da1f744243 470 if (rem_len > 0 && (ipstack.read(readbuf + len, rem_len, timer.left_ms()) != rem_len))
icraggs 8:c46930bd6c82 471 goto exit;
icraggs 8:c46930bd6c82 472
icraggs 8:c46930bd6c82 473 header.byte = readbuf[0];
icraggs 8:c46930bd6c82 474 rc = header.bits.type;
icraggs 43:21da1f744243 475 if (this->keepAliveInterval > 0)
icraggs 43:21da1f744243 476 last_received.countdown(this->keepAliveInterval); // record the fact that we have successfully received a packet
icraggs 8:c46930bd6c82 477 exit:
icraggs 53:15b5a280d22d 478
icraggs 43:21da1f744243 479 #if defined(MQTT_DEBUG)
icraggs 46:e335fcc1a663 480 if (rc >= 0)
icraggs 46:e335fcc1a663 481 {
icraggs 46:e335fcc1a663 482 char printbuf[50];
icraggs 55:71ae1a773b64 483 DEBUG("Rc %d receiving packet %s\r\n", rc,
icraggs 53:15b5a280d22d 484 MQTTFormat_toClientString(printbuf, sizeof(printbuf), readbuf, len));
icraggs 46:e335fcc1a663 485 }
icraggs 43:21da1f744243 486 #endif
icraggs 8:c46930bd6c82 487 return rc;
icraggs 3:dbff6b768d28 488 }
icraggs 3:dbff6b768d28 489
icraggs 8:c46930bd6c82 490
icraggs 26:2658bb87c53d 491 // assume topic filter and name is in correct format
icraggs 26:2658bb87c53d 492 // # can only be at end
icraggs 26:2658bb87c53d 493 // + and # can only be next to separator
icraggs 43:21da1f744243 494 template<class Network, class Timer, int a, int b>
icraggs 26:2658bb87c53d 495 bool MQTT::Client<Network, Timer, a, b>::isTopicMatched(char* topicFilter, MQTTString& topicName)
icraggs 26:2658bb87c53d 496 {
icraggs 26:2658bb87c53d 497 char* curf = topicFilter;
icraggs 26:2658bb87c53d 498 char* curn = topicName.lenstring.data;
icraggs 26:2658bb87c53d 499 char* curn_end = curn + topicName.lenstring.len;
icraggs 43:21da1f744243 500
icraggs 26:2658bb87c53d 501 while (*curf && curn < curn_end)
icraggs 26:2658bb87c53d 502 {
icraggs 26:2658bb87c53d 503 if (*curn == '/' && *curf != '/')
icraggs 26:2658bb87c53d 504 break;
icraggs 26:2658bb87c53d 505 if (*curf != '+' && *curf != '#' && *curf != *curn)
icraggs 26:2658bb87c53d 506 break;
icraggs 26:2658bb87c53d 507 if (*curf == '+')
icraggs 26:2658bb87c53d 508 { // skip until we meet the next separator, or end of string
icraggs 26:2658bb87c53d 509 char* nextpos = curn + 1;
icraggs 26:2658bb87c53d 510 while (nextpos < curn_end && *nextpos != '/')
icraggs 26:2658bb87c53d 511 nextpos = ++curn + 1;
icraggs 26:2658bb87c53d 512 }
icraggs 26:2658bb87c53d 513 else if (*curf == '#')
icraggs 26:2658bb87c53d 514 curn = curn_end - 1; // skip until end of string
icraggs 26:2658bb87c53d 515 curf++;
icraggs 26:2658bb87c53d 516 curn++;
icraggs 26:2658bb87c53d 517 };
icraggs 43:21da1f744243 518
icraggs 26:2658bb87c53d 519 return (curn == curn_end) && (*curf == '\0');
icraggs 26:2658bb87c53d 520 }
icraggs 26:2658bb87c53d 521
icraggs 26:2658bb87c53d 522
icraggs 26:2658bb87c53d 523
icraggs 43:21da1f744243 524 template<class Network, class Timer, int a, int MAX_MESSAGE_HANDLERS>
icraggs 26:2658bb87c53d 525 int MQTT::Client<Network, Timer, a, MAX_MESSAGE_HANDLERS>::deliverMessage(MQTTString& topicName, Message& message)
icraggs 15:64a57183aa03 526 {
icraggs 26:2658bb87c53d 527 int rc = FAILURE;
icraggs 20:cad3d54d7ecf 528
icraggs 20:cad3d54d7ecf 529 // we have to find the right message handler - indexed by topic
icraggs 23:05fc7de97d4a 530 for (int i = 0; i < MAX_MESSAGE_HANDLERS; ++i)
icraggs 20:cad3d54d7ecf 531 {
icraggs 26:2658bb87c53d 532 if (messageHandlers[i].topicFilter != 0 && (MQTTPacket_equals(&topicName, (char*)messageHandlers[i].topicFilter) ||
icraggs 26:2658bb87c53d 533 isTopicMatched((char*)messageHandlers[i].topicFilter, topicName)))
icraggs 20:cad3d54d7ecf 534 {
icraggs 26:2658bb87c53d 535 if (messageHandlers[i].fp.attached())
icraggs 26:2658bb87c53d 536 {
icraggs 31:a51dd239b78e 537 MessageData md(topicName, message);
icraggs 31:a51dd239b78e 538 messageHandlers[i].fp(md);
icraggs 26:2658bb87c53d 539 rc = SUCCESS;
icraggs 26:2658bb87c53d 540 }
icraggs 20:cad3d54d7ecf 541 }
icraggs 20:cad3d54d7ecf 542 }
icraggs 43:21da1f744243 543
icraggs 43:21da1f744243 544 if (rc == FAILURE && defaultMessageHandler.attached())
icraggs 26:2658bb87c53d 545 {
icraggs 31:a51dd239b78e 546 MessageData md(topicName, message);
icraggs 31:a51dd239b78e 547 defaultMessageHandler(md);
icraggs 26:2658bb87c53d 548 rc = SUCCESS;
icraggs 43:21da1f744243 549 }
icraggs 43:21da1f744243 550
icraggs 20:cad3d54d7ecf 551 return rc;
icraggs 15:64a57183aa03 552 }
icraggs 15:64a57183aa03 553
icraggs 15:64a57183aa03 554
icraggs 20:cad3d54d7ecf 555
icraggs 43:21da1f744243 556 template<class Network, class Timer, int a, int b>
icraggs 43:21da1f744243 557 int MQTT::Client<Network, Timer, a, b>::yield(unsigned long timeout_ms)
icraggs 20:cad3d54d7ecf 558 {
icraggs 26:2658bb87c53d 559 int rc = SUCCESS;
icraggs 53:15b5a280d22d 560 Timer timer;
icraggs 43:21da1f744243 561
icraggs 23:05fc7de97d4a 562 timer.countdown_ms(timeout_ms);
icraggs 20:cad3d54d7ecf 563 while (!timer.expired())
icraggs 26:2658bb87c53d 564 {
icraggs 46:e335fcc1a663 565 if (cycle(timer) < 0)
icraggs 26:2658bb87c53d 566 {
icraggs 26:2658bb87c53d 567 rc = FAILURE;
icraggs 26:2658bb87c53d 568 break;
icraggs 26:2658bb87c53d 569 }
icraggs 26:2658bb87c53d 570 }
icraggs 43:21da1f744243 571
icraggs 26:2658bb87c53d 572 return rc;
icraggs 20:cad3d54d7ecf 573 }
icraggs 20:cad3d54d7ecf 574
icraggs 20:cad3d54d7ecf 575
icraggs 43:21da1f744243 576 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 23:05fc7de97d4a 577 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::cycle(Timer& timer)
icraggs 8:c46930bd6c82 578 {
icraggs 53:15b5a280d22d 579 // get one piece of work off the wire and one pass through
icraggs 26:2658bb87c53d 580 int len = 0,
icraggs 26:2658bb87c53d 581 rc = SUCCESS;
icraggs 28:8b2abe9bd814 582
icraggs 53:15b5a280d22d 583 int packet_type = readPacket(timer); // read the socket, see what work is due
icraggs 53:15b5a280d22d 584
icraggs 8:c46930bd6c82 585 switch (packet_type)
icraggs 8:c46930bd6c82 586 {
icraggs 53:15b5a280d22d 587 default:
icraggs 53:15b5a280d22d 588 // no more data to read, unrecoverable. Or read packet fails due to unexpected network error
icraggs 46:e335fcc1a663 589 rc = packet_type;
icraggs 53:15b5a280d22d 590 goto exit;
icraggs 53:15b5a280d22d 591 case 0: // timed out reading packet
icraggs 46:e335fcc1a663 592 break;
icraggs 15:64a57183aa03 593 case CONNACK:
icraggs 8:c46930bd6c82 594 case PUBACK:
icraggs 8:c46930bd6c82 595 case SUBACK:
icraggs 8:c46930bd6c82 596 break;
icraggs 15:64a57183aa03 597 case PUBLISH:
icraggs 46:e335fcc1a663 598 {
icraggs 46:e335fcc1a663 599 MQTTString topicName = MQTTString_initializer;
icraggs 20:cad3d54d7ecf 600 Message msg;
icraggs 46:e335fcc1a663 601 int intQoS;
icraggs 53:15b5a280d22d 602 msg.payloadlen = 0; /* this is a size_t, but deserialize publish sets this as int */
icraggs 46:e335fcc1a663 603 if (MQTTDeserialize_publish((unsigned char*)&msg.dup, &intQoS, (unsigned char*)&msg.retained, (unsigned short*)&msg.id, &topicName,
icraggs 36:2f1ada427e56 604 (unsigned char**)&msg.payload, (int*)&msg.payloadlen, readbuf, MAX_MQTT_PACKET_SIZE) != 1)
icraggs 26:2658bb87c53d 605 goto exit;
icraggs 46:e335fcc1a663 606 msg.qos = (enum QoS)intQoS;
icraggs 43:21da1f744243 607 #if MQTTCLIENT_QOS2
icraggs 43:21da1f744243 608 if (msg.qos != QOS2)
icraggs 43:21da1f744243 609 #endif
icraggs 31:a51dd239b78e 610 deliverMessage(topicName, msg);
icraggs 43:21da1f744243 611 #if MQTTCLIENT_QOS2
icraggs 31:a51dd239b78e 612 else if (isQoS2msgidFree(msg.id))
icraggs 31:a51dd239b78e 613 {
icraggs 43:21da1f744243 614 if (useQoS2msgid(msg.id))
icraggs 43:21da1f744243 615 deliverMessage(topicName, msg);
icraggs 43:21da1f744243 616 else
icraggs 43:21da1f744243 617 WARN("Maximum number of incoming QoS2 messages exceeded");
icraggs 46:e335fcc1a663 618 }
icraggs 31:a51dd239b78e 619 #endif
icraggs 43:21da1f744243 620 #if MQTTCLIENT_QOS1 || MQTTCLIENT_QOS2
icraggs 20:cad3d54d7ecf 621 if (msg.qos != QOS0)
icraggs 20:cad3d54d7ecf 622 {
icraggs 20:cad3d54d7ecf 623 if (msg.qos == QOS1)
icraggs 43:21da1f744243 624 len = MQTTSerialize_ack(sendbuf, MAX_MQTT_PACKET_SIZE, PUBACK, 0, msg.id);
icraggs 20:cad3d54d7ecf 625 else if (msg.qos == QOS2)
icraggs 43:21da1f744243 626 len = MQTTSerialize_ack(sendbuf, MAX_MQTT_PACKET_SIZE, PUBREC, 0, msg.id);
icraggs 26:2658bb87c53d 627 if (len <= 0)
icraggs 26:2658bb87c53d 628 rc = FAILURE;
icraggs 26:2658bb87c53d 629 else
icraggs 26:2658bb87c53d 630 rc = sendPacket(len, timer);
icraggs 26:2658bb87c53d 631 if (rc == FAILURE)
icraggs 20:cad3d54d7ecf 632 goto exit; // there was a problem
icraggs 20:cad3d54d7ecf 633 }
Ian Craggs 12:cc7f2d62a393 634 break;
icraggs 43:21da1f744243 635 #endif
icraggs 46:e335fcc1a663 636 }
icraggs 43:21da1f744243 637 #if MQTTCLIENT_QOS2
icraggs 15:64a57183aa03 638 case PUBREC:
icraggs 46:e335fcc1a663 639 case PUBREL:
icraggs 36:2f1ada427e56 640 unsigned short mypacketid;
icraggs 36:2f1ada427e56 641 unsigned char dup, type;
icraggs 26:2658bb87c53d 642 if (MQTTDeserialize_ack(&type, &dup, &mypacketid, readbuf, MAX_MQTT_PACKET_SIZE) != 1)
icraggs 26:2658bb87c53d 643 rc = FAILURE;
icraggs 53:15b5a280d22d 644 else if ((len = MQTTSerialize_ack(sendbuf, MAX_MQTT_PACKET_SIZE,
icraggs 53:15b5a280d22d 645 (packet_type == PUBREC) ? PUBREL : PUBCOMP, 0, mypacketid)) <= 0)
icraggs 26:2658bb87c53d 646 rc = FAILURE;
icraggs 26:2658bb87c53d 647 else if ((rc = sendPacket(len, timer)) != SUCCESS) // send the PUBREL packet
icraggs 26:2658bb87c53d 648 rc = FAILURE; // there was a problem
icraggs 26:2658bb87c53d 649 if (rc == FAILURE)
icraggs 20:cad3d54d7ecf 650 goto exit; // there was a problem
icraggs 46:e335fcc1a663 651 if (packet_type == PUBREL)
icraggs 46:e335fcc1a663 652 freeQoS2msgid(mypacketid);
icraggs 8:c46930bd6c82 653 break;
icraggs 53:15b5a280d22d 654
icraggs 8:c46930bd6c82 655 case PUBCOMP:
icraggs 8:c46930bd6c82 656 break;
icraggs 43:21da1f744243 657 #endif
icraggs 15:64a57183aa03 658 case PINGRESP:
icraggs 20:cad3d54d7ecf 659 ping_outstanding = false;
icraggs 8:c46930bd6c82 660 break;
icraggs 15:64a57183aa03 661 }
icraggs 53:15b5a280d22d 662
icraggs 53:15b5a280d22d 663 if (keepalive() != SUCCESS)
icraggs 53:15b5a280d22d 664 //check only keepalive FAILURE status so that previous FAILURE status can be considered as FAULT
icraggs 53:15b5a280d22d 665 rc = FAILURE;
icraggs 53:15b5a280d22d 666
Ian Craggs 12:cc7f2d62a393 667 exit:
icraggs 26:2658bb87c53d 668 if (rc == SUCCESS)
icraggs 26:2658bb87c53d 669 rc = packet_type;
icraggs 53:15b5a280d22d 670 else if (isconnected)
icraggs 53:15b5a280d22d 671 closeSession();
icraggs 26:2658bb87c53d 672 return rc;
icraggs 15:64a57183aa03 673 }
icraggs 15:64a57183aa03 674
icraggs 15:64a57183aa03 675
icraggs 23:05fc7de97d4a 676 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 23:05fc7de97d4a 677 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::keepalive()
icraggs 15:64a57183aa03 678 {
icraggs 53:15b5a280d22d 679 int rc = SUCCESS;
icraggs 54:ff9e5c4b52d0 680 static Timer ping_sent;
icraggs 15:64a57183aa03 681
icraggs 20:cad3d54d7ecf 682 if (keepAliveInterval == 0)
icraggs 20:cad3d54d7ecf 683 goto exit;
icraggs 54:ff9e5c4b52d0 684
icraggs 54:ff9e5c4b52d0 685 if (ping_outstanding)
icraggs 20:cad3d54d7ecf 686 {
icraggs 54:ff9e5c4b52d0 687 if (ping_sent.expired())
icraggs 53:15b5a280d22d 688 {
icraggs 53:15b5a280d22d 689 rc = FAILURE; // session failure
icraggs 53:15b5a280d22d 690 #if defined(MQTT_DEBUG)
icraggs 55:71ae1a773b64 691 DEBUG("PINGRESP not received in keepalive interval\r\n");
icraggs 53:15b5a280d22d 692 #endif
icraggs 53:15b5a280d22d 693 }
icraggs 54:ff9e5c4b52d0 694 }
icraggs 54:ff9e5c4b52d0 695 else if (last_sent.expired() || last_received.expired())
icraggs 54:ff9e5c4b52d0 696 {
icraggs 54:ff9e5c4b52d0 697 Timer timer(1000);
icraggs 54:ff9e5c4b52d0 698 int len = MQTTSerialize_pingreq(sendbuf, MAX_MQTT_PACKET_SIZE);
icraggs 54:ff9e5c4b52d0 699 if (len > 0 && (rc = sendPacket(len, timer)) == SUCCESS) // send the ping packet
icraggs 20:cad3d54d7ecf 700 {
icraggs 54:ff9e5c4b52d0 701 ping_outstanding = true;
icraggs 54:ff9e5c4b52d0 702 ping_sent.countdown(this->keepAliveInterval);
icraggs 20:cad3d54d7ecf 703 }
icraggs 20:cad3d54d7ecf 704 }
icraggs 15:64a57183aa03 705 exit:
icraggs 20:cad3d54d7ecf 706 return rc;
icraggs 8:c46930bd6c82 707 }
icraggs 8:c46930bd6c82 708
icraggs 8:c46930bd6c82 709
icraggs 16:91c2f9a144d4 710 // only used in single-threaded mode where one command at a time is in process
icraggs 43:21da1f744243 711 template<class Network, class Timer, int a, int b>
icraggs 23:05fc7de97d4a 712 int MQTT::Client<Network, Timer, a, b>::waitfor(int packet_type, Timer& timer)
icraggs 15:64a57183aa03 713 {
icraggs 26:2658bb87c53d 714 int rc = FAILURE;
icraggs 43:21da1f744243 715
icraggs 20:cad3d54d7ecf 716 do
icraggs 16:91c2f9a144d4 717 {
icraggs 43:21da1f744243 718 if (timer.expired())
icraggs 20:cad3d54d7ecf 719 break; // we timed out
icraggs 53:15b5a280d22d 720 rc = cycle(timer);
icraggs 20:cad3d54d7ecf 721 }
icraggs 53:15b5a280d22d 722 while (rc != packet_type && rc >= 0);
icraggs 43:21da1f744243 723
icraggs 20:cad3d54d7ecf 724 return rc;
icraggs 16:91c2f9a144d4 725 }
icraggs 16:91c2f9a144d4 726
icraggs 16:91c2f9a144d4 727
icraggs 43:21da1f744243 728 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 53:15b5a280d22d 729 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::connect(MQTTPacket_connectData& options, connackData& data)
icraggs 16:91c2f9a144d4 730 {
icraggs 46:e335fcc1a663 731 Timer connect_timer(command_timeout_ms);
icraggs 26:2658bb87c53d 732 int rc = FAILURE;
icraggs 31:a51dd239b78e 733 int len = 0;
icraggs 43:21da1f744243 734
icraggs 31:a51dd239b78e 735 if (isconnected) // don't send connect packet again if we are already connected
icraggs 31:a51dd239b78e 736 goto exit;
icraggs 8:c46930bd6c82 737
icraggs 43:21da1f744243 738 this->keepAliveInterval = options.keepAliveInterval;
icraggs 43:21da1f744243 739 this->cleansession = options.cleansession;
icraggs 43:21da1f744243 740 if ((len = MQTTSerialize_connect(sendbuf, MAX_MQTT_PACKET_SIZE, &options)) <= 0)
icraggs 26:2658bb87c53d 741 goto exit;
icraggs 26:2658bb87c53d 742 if ((rc = sendPacket(len, connect_timer)) != SUCCESS) // send the connect packet
icraggs 20:cad3d54d7ecf 743 goto exit; // there was a problem
icraggs 43:21da1f744243 744
icraggs 43:21da1f744243 745 if (this->keepAliveInterval > 0)
icraggs 43:21da1f744243 746 last_received.countdown(this->keepAliveInterval);
icraggs 20:cad3d54d7ecf 747 // this will be a blocking call, wait for the connack
icraggs 20:cad3d54d7ecf 748 if (waitfor(CONNACK, connect_timer) == CONNACK)
icraggs 15:64a57183aa03 749 {
icraggs 53:15b5a280d22d 750 data.rc = 0;
icraggs 53:15b5a280d22d 751 data.sessionPresent = false;
icraggs 53:15b5a280d22d 752 if (MQTTDeserialize_connack((unsigned char*)&data.sessionPresent,
icraggs 53:15b5a280d22d 753 (unsigned char*)&data.rc, readbuf, MAX_MQTT_PACKET_SIZE) == 1)
icraggs 53:15b5a280d22d 754 rc = data.rc;
icraggs 26:2658bb87c53d 755 else
icraggs 26:2658bb87c53d 756 rc = FAILURE;
icraggs 8:c46930bd6c82 757 }
icraggs 26:2658bb87c53d 758 else
icraggs 26:2658bb87c53d 759 rc = FAILURE;
icraggs 46:e335fcc1a663 760
icraggs 43:21da1f744243 761 #if MQTTCLIENT_QOS2
icraggs 46:e335fcc1a663 762 // resend any inflight publish
icraggs 46:e335fcc1a663 763 if (inflightMsgid > 0 && inflightQoS == QOS2 && pubrel)
icraggs 43:21da1f744243 764 {
icraggs 43:21da1f744243 765 if ((len = MQTTSerialize_ack(sendbuf, MAX_MQTT_PACKET_SIZE, PUBREL, 0, inflightMsgid)) <= 0)
icraggs 43:21da1f744243 766 rc = FAILURE;
icraggs 43:21da1f744243 767 else
icraggs 43:21da1f744243 768 rc = publish(len, connect_timer, inflightQoS);
icraggs 43:21da1f744243 769 }
icraggs 43:21da1f744243 770 else
icraggs 43:21da1f744243 771 #endif
icraggs 43:21da1f744243 772 #if MQTTCLIENT_QOS1 || MQTTCLIENT_QOS2
icraggs 43:21da1f744243 773 if (inflightMsgid > 0)
icraggs 43:21da1f744243 774 {
icraggs 43:21da1f744243 775 memcpy(sendbuf, pubbuf, MAX_MQTT_PACKET_SIZE);
icraggs 43:21da1f744243 776 rc = publish(inflightLen, connect_timer, inflightQoS);
icraggs 43:21da1f744243 777 }
icraggs 43:21da1f744243 778 #endif
icraggs 43:21da1f744243 779
icraggs 15:64a57183aa03 780 exit:
icraggs 26:2658bb87c53d 781 if (rc == SUCCESS)
icraggs 53:15b5a280d22d 782 {
icraggs 26:2658bb87c53d 783 isconnected = true;
icraggs 53:15b5a280d22d 784 ping_outstanding = false;
icraggs 53:15b5a280d22d 785 }
icraggs 8:c46930bd6c82 786 return rc;
icraggs 8:c46930bd6c82 787 }
icraggs 8:c46930bd6c82 788
icraggs 8:c46930bd6c82 789
icraggs 43:21da1f744243 790 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 53:15b5a280d22d 791 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::connect(MQTTPacket_connectData& options)
icraggs 53:15b5a280d22d 792 {
icraggs 53:15b5a280d22d 793 connackData data;
icraggs 53:15b5a280d22d 794 return connect(options, data);
icraggs 53:15b5a280d22d 795 }
icraggs 53:15b5a280d22d 796
icraggs 53:15b5a280d22d 797
icraggs 53:15b5a280d22d 798 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 43:21da1f744243 799 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::connect()
icraggs 43:21da1f744243 800 {
icraggs 43:21da1f744243 801 MQTTPacket_connectData default_options = MQTTPacket_connectData_initializer;
icraggs 43:21da1f744243 802 return connect(default_options);
icraggs 43:21da1f744243 803 }
icraggs 43:21da1f744243 804
icraggs 43:21da1f744243 805
icraggs 43:21da1f744243 806 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int MAX_MESSAGE_HANDLERS>
icraggs 53:15b5a280d22d 807 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, MAX_MESSAGE_HANDLERS>::setMessageHandler(const char* topicFilter, messageHandler messageHandler)
icraggs 53:15b5a280d22d 808 {
icraggs 53:15b5a280d22d 809 int rc = FAILURE;
icraggs 53:15b5a280d22d 810 int i = -1;
icraggs 53:15b5a280d22d 811
icraggs 53:15b5a280d22d 812 // first check for an existing matching slot
icraggs 53:15b5a280d22d 813 for (i = 0; i < MAX_MESSAGE_HANDLERS; ++i)
icraggs 53:15b5a280d22d 814 {
icraggs 53:15b5a280d22d 815 if (messageHandlers[i].topicFilter != 0 && strcmp(messageHandlers[i].topicFilter, topicFilter) == 0)
icraggs 53:15b5a280d22d 816 {
icraggs 53:15b5a280d22d 817 if (messageHandler == 0) // remove existing
icraggs 53:15b5a280d22d 818 {
icraggs 53:15b5a280d22d 819 messageHandlers[i].topicFilter = 0;
icraggs 53:15b5a280d22d 820 messageHandlers[i].fp.detach();
icraggs 53:15b5a280d22d 821 }
icraggs 53:15b5a280d22d 822 rc = SUCCESS; // return i when adding new subscription
icraggs 53:15b5a280d22d 823 break;
icraggs 53:15b5a280d22d 824 }
icraggs 53:15b5a280d22d 825 }
icraggs 53:15b5a280d22d 826 // if no existing, look for empty slot (unless we are removing)
icraggs 53:15b5a280d22d 827 if (messageHandler != 0) {
icraggs 53:15b5a280d22d 828 if (rc == FAILURE)
icraggs 53:15b5a280d22d 829 {
icraggs 53:15b5a280d22d 830 for (i = 0; i < MAX_MESSAGE_HANDLERS; ++i)
icraggs 53:15b5a280d22d 831 {
icraggs 53:15b5a280d22d 832 if (messageHandlers[i].topicFilter == 0)
icraggs 53:15b5a280d22d 833 {
icraggs 53:15b5a280d22d 834 rc = SUCCESS;
icraggs 53:15b5a280d22d 835 break;
icraggs 53:15b5a280d22d 836 }
icraggs 53:15b5a280d22d 837 }
icraggs 53:15b5a280d22d 838 }
icraggs 53:15b5a280d22d 839 if (i < MAX_MESSAGE_HANDLERS)
icraggs 53:15b5a280d22d 840 {
icraggs 53:15b5a280d22d 841 messageHandlers[i].topicFilter = topicFilter;
icraggs 53:15b5a280d22d 842 messageHandlers[i].fp.attach(messageHandler);
icraggs 53:15b5a280d22d 843 }
icraggs 53:15b5a280d22d 844 }
icraggs 53:15b5a280d22d 845 return rc;
icraggs 53:15b5a280d22d 846 }
icraggs 53:15b5a280d22d 847
icraggs 53:15b5a280d22d 848
icraggs 53:15b5a280d22d 849 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int MAX_MESSAGE_HANDLERS>
icraggs 53:15b5a280d22d 850 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, MAX_MESSAGE_HANDLERS>::subscribe(const char* topicFilter,
icraggs 53:15b5a280d22d 851 enum QoS qos, messageHandler messageHandler, subackData& data)
icraggs 43:21da1f744243 852 {
icraggs 43:21da1f744243 853 int rc = FAILURE;
icraggs 46:e335fcc1a663 854 Timer timer(command_timeout_ms);
icraggs 26:2658bb87c53d 855 int len = 0;
icraggs 46:e335fcc1a663 856 MQTTString topic = {(char*)topicFilter, {0, 0}};
icraggs 43:21da1f744243 857
icraggs 26:2658bb87c53d 858 if (!isconnected)
icraggs 20:cad3d54d7ecf 859 goto exit;
icraggs 43:21da1f744243 860
icraggs 43:21da1f744243 861 len = MQTTSerialize_subscribe(sendbuf, MAX_MQTT_PACKET_SIZE, 0, packetid.getNext(), 1, &topic, (int*)&qos);
icraggs 26:2658bb87c53d 862 if (len <= 0)
icraggs 26:2658bb87c53d 863 goto exit;
icraggs 23:05fc7de97d4a 864 if ((rc = sendPacket(len, timer)) != SUCCESS) // send the subscribe packet
icraggs 26:2658bb87c53d 865 goto exit; // there was a problem
icraggs 43:21da1f744243 866
icraggs 43:21da1f744243 867 if (waitfor(SUBACK, timer) == SUBACK) // wait for suback
icraggs 8:c46930bd6c82 868 {
icraggs 53:15b5a280d22d 869 int count = 0;
icraggs 36:2f1ada427e56 870 unsigned short mypacketid;
icraggs 53:15b5a280d22d 871 data.grantedQoS = 0;
icraggs 53:15b5a280d22d 872 if (MQTTDeserialize_suback(&mypacketid, 1, &count, &data.grantedQoS, readbuf, MAX_MQTT_PACKET_SIZE) == 1)
icraggs 8:c46930bd6c82 873 {
icraggs 53:15b5a280d22d 874 if (data.grantedQoS != 0x80)
icraggs 53:15b5a280d22d 875 rc = setMessageHandler(topicFilter, messageHandler);
icraggs 8:c46930bd6c82 876 }
icraggs 8:c46930bd6c82 877 }
icraggs 43:21da1f744243 878 else
icraggs 26:2658bb87c53d 879 rc = FAILURE;
icraggs 43:21da1f744243 880
icraggs 15:64a57183aa03 881 exit:
icraggs 53:15b5a280d22d 882 if (rc == FAILURE)
icraggs 53:15b5a280d22d 883 closeSession();
Ian Craggs 12:cc7f2d62a393 884 return rc;
icraggs 15:64a57183aa03 885 }
icraggs 15:64a57183aa03 886
icraggs 15:64a57183aa03 887
icraggs 43:21da1f744243 888 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int MAX_MESSAGE_HANDLERS>
icraggs 53:15b5a280d22d 889 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, MAX_MESSAGE_HANDLERS>::subscribe(const char* topicFilter, enum QoS qos, messageHandler messageHandler)
icraggs 53:15b5a280d22d 890 {
icraggs 53:15b5a280d22d 891 subackData data;
icraggs 53:15b5a280d22d 892 return subscribe(topicFilter, qos, messageHandler, data);
icraggs 53:15b5a280d22d 893 }
icraggs 53:15b5a280d22d 894
icraggs 53:15b5a280d22d 895
icraggs 53:15b5a280d22d 896 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int MAX_MESSAGE_HANDLERS>
icraggs 23:05fc7de97d4a 897 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, MAX_MESSAGE_HANDLERS>::unsubscribe(const char* topicFilter)
icraggs 43:21da1f744243 898 {
icraggs 26:2658bb87c53d 899 int rc = FAILURE;
icraggs 46:e335fcc1a663 900 Timer timer(command_timeout_ms);
icraggs 46:e335fcc1a663 901 MQTTString topic = {(char*)topicFilter, {0, 0}};
icraggs 31:a51dd239b78e 902 int len = 0;
icraggs 43:21da1f744243 903
icraggs 31:a51dd239b78e 904 if (!isconnected)
icraggs 31:a51dd239b78e 905 goto exit;
icraggs 43:21da1f744243 906
icraggs 43:21da1f744243 907 if ((len = MQTTSerialize_unsubscribe(sendbuf, MAX_MQTT_PACKET_SIZE, 0, packetid.getNext(), 1, &topic)) <= 0)
icraggs 20:cad3d54d7ecf 908 goto exit;
icraggs 43:21da1f744243 909 if ((rc = sendPacket(len, timer)) != SUCCESS) // send the unsubscribe packet
icraggs 20:cad3d54d7ecf 910 goto exit; // there was a problem
icraggs 43:21da1f744243 911
icraggs 20:cad3d54d7ecf 912 if (waitfor(UNSUBACK, timer) == UNSUBACK)
Ian Craggs 12:cc7f2d62a393 913 {
icraggs 36:2f1ada427e56 914 unsigned short mypacketid; // should be the same as the packetid above
icraggs 23:05fc7de97d4a 915 if (MQTTDeserialize_unsuback(&mypacketid, readbuf, MAX_MQTT_PACKET_SIZE) == 1)
icraggs 46:e335fcc1a663 916 {
icraggs 46:e335fcc1a663 917 // remove the subscription message handler associated with this topic, if there is one
icraggs 53:15b5a280d22d 918 setMessageHandler(topicFilter, 0);
icraggs 46:e335fcc1a663 919 }
Ian Craggs 12:cc7f2d62a393 920 }
icraggs 26:2658bb87c53d 921 else
icraggs 26:2658bb87c53d 922 rc = FAILURE;
icraggs 43:21da1f744243 923
icraggs 15:64a57183aa03 924 exit:
icraggs 43:21da1f744243 925 if (rc != SUCCESS)
icraggs 53:15b5a280d22d 926 closeSession();
Ian Craggs 12:cc7f2d62a393 927 return rc;
icraggs 15:64a57183aa03 928 }
icraggs 15:64a57183aa03 929
icraggs 15:64a57183aa03 930
icraggs 43:21da1f744243 931 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 43:21da1f744243 932 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::publish(int len, Timer& timer, enum QoS qos)
icraggs 20:cad3d54d7ecf 933 {
icraggs 43:21da1f744243 934 int rc;
icraggs 46:e335fcc1a663 935
icraggs 43:21da1f744243 936 if ((rc = sendPacket(len, timer)) != SUCCESS) // send the publish packet
icraggs 43:21da1f744243 937 goto exit; // there was a problem
icraggs 15:64a57183aa03 938
icraggs 46:e335fcc1a663 939 #if MQTTCLIENT_QOS1
icraggs 43:21da1f744243 940 if (qos == QOS1)
Ian Craggs 12:cc7f2d62a393 941 {
icraggs 20:cad3d54d7ecf 942 if (waitfor(PUBACK, timer) == PUBACK)
icraggs 20:cad3d54d7ecf 943 {
icraggs 36:2f1ada427e56 944 unsigned short mypacketid;
icraggs 36:2f1ada427e56 945 unsigned char dup, type;
icraggs 26:2658bb87c53d 946 if (MQTTDeserialize_ack(&type, &dup, &mypacketid, readbuf, MAX_MQTT_PACKET_SIZE) != 1)
icraggs 26:2658bb87c53d 947 rc = FAILURE;
icraggs 43:21da1f744243 948 else if (inflightMsgid == mypacketid)
icraggs 43:21da1f744243 949 inflightMsgid = 0;
icraggs 20:cad3d54d7ecf 950 }
icraggs 26:2658bb87c53d 951 else
icraggs 26:2658bb87c53d 952 rc = FAILURE;
Ian Craggs 12:cc7f2d62a393 953 }
icraggs 53:15b5a280d22d 954 #endif
icraggs 53:15b5a280d22d 955 #if MQTTCLIENT_QOS2
icraggs 43:21da1f744243 956 else if (qos == QOS2)
Ian Craggs 12:cc7f2d62a393 957 {
icraggs 20:cad3d54d7ecf 958 if (waitfor(PUBCOMP, timer) == PUBCOMP)
icraggs 20:cad3d54d7ecf 959 {
icraggs 36:2f1ada427e56 960 unsigned short mypacketid;
icraggs 36:2f1ada427e56 961 unsigned char dup, type;
icraggs 26:2658bb87c53d 962 if (MQTTDeserialize_ack(&type, &dup, &mypacketid, readbuf, MAX_MQTT_PACKET_SIZE) != 1)
icraggs 26:2658bb87c53d 963 rc = FAILURE;
icraggs 43:21da1f744243 964 else if (inflightMsgid == mypacketid)
icraggs 43:21da1f744243 965 inflightMsgid = 0;
icraggs 20:cad3d54d7ecf 966 }
icraggs 26:2658bb87c53d 967 else
icraggs 26:2658bb87c53d 968 rc = FAILURE;
Ian Craggs 12:cc7f2d62a393 969 }
icraggs 43:21da1f744243 970 #endif
icraggs 43:21da1f744243 971
icraggs 43:21da1f744243 972 exit:
icraggs 43:21da1f744243 973 if (rc != SUCCESS)
icraggs 53:15b5a280d22d 974 closeSession();
icraggs 43:21da1f744243 975 return rc;
icraggs 43:21da1f744243 976 }
icraggs 43:21da1f744243 977
icraggs 43:21da1f744243 978
icraggs 43:21da1f744243 979
icraggs 43:21da1f744243 980 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 43:21da1f744243 981 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::publish(const char* topicName, void* payload, size_t payloadlen, unsigned short& id, enum QoS qos, bool retained)
icraggs 43:21da1f744243 982 {
icraggs 43:21da1f744243 983 int rc = FAILURE;
icraggs 46:e335fcc1a663 984 Timer timer(command_timeout_ms);
icraggs 43:21da1f744243 985 MQTTString topicString = MQTTString_initializer;
icraggs 43:21da1f744243 986 int len = 0;
icraggs 43:21da1f744243 987
icraggs 43:21da1f744243 988 if (!isconnected)
icraggs 43:21da1f744243 989 goto exit;
icraggs 46:e335fcc1a663 990
icraggs 43:21da1f744243 991 topicString.cstring = (char*)topicName;
icraggs 43:21da1f744243 992
icraggs 43:21da1f744243 993 #if MQTTCLIENT_QOS1 || MQTTCLIENT_QOS2
icraggs 43:21da1f744243 994 if (qos == QOS1 || qos == QOS2)
icraggs 43:21da1f744243 995 id = packetid.getNext();
icraggs 43:21da1f744243 996 #endif
icraggs 43:21da1f744243 997
icraggs 43:21da1f744243 998 len = MQTTSerialize_publish(sendbuf, MAX_MQTT_PACKET_SIZE, 0, qos, retained, id,
icraggs 43:21da1f744243 999 topicString, (unsigned char*)payload, payloadlen);
icraggs 43:21da1f744243 1000 if (len <= 0)
icraggs 43:21da1f744243 1001 goto exit;
icraggs 46:e335fcc1a663 1002
icraggs 43:21da1f744243 1003 #if MQTTCLIENT_QOS1 || MQTTCLIENT_QOS2
icraggs 43:21da1f744243 1004 if (!cleansession)
icraggs 43:21da1f744243 1005 {
icraggs 43:21da1f744243 1006 memcpy(pubbuf, sendbuf, len);
icraggs 43:21da1f744243 1007 inflightMsgid = id;
icraggs 43:21da1f744243 1008 inflightLen = len;
icraggs 43:21da1f744243 1009 inflightQoS = qos;
icraggs 43:21da1f744243 1010 #if MQTTCLIENT_QOS2
icraggs 43:21da1f744243 1011 pubrel = false;
icraggs 43:21da1f744243 1012 #endif
icraggs 43:21da1f744243 1013 }
icraggs 43:21da1f744243 1014 #endif
icraggs 46:e335fcc1a663 1015
icraggs 43:21da1f744243 1016 rc = publish(len, timer, qos);
icraggs 15:64a57183aa03 1017 exit:
icraggs 8:c46930bd6c82 1018 return rc;
icraggs 8:c46930bd6c82 1019 }
icraggs 8:c46930bd6c82 1020
icraggs 8:c46930bd6c82 1021
icraggs 43:21da1f744243 1022 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 43:21da1f744243 1023 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::publish(const char* topicName, void* payload, size_t payloadlen, enum QoS qos, bool retained)
icraggs 43:21da1f744243 1024 {
icraggs 43:21da1f744243 1025 unsigned short id = 0; // dummy - not used for anything
icraggs 43:21da1f744243 1026 return publish(topicName, payload, payloadlen, id, qos, retained);
icraggs 43:21da1f744243 1027 }
icraggs 43:21da1f744243 1028
icraggs 43:21da1f744243 1029
icraggs 43:21da1f744243 1030 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 43:21da1f744243 1031 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::publish(const char* topicName, Message& message)
icraggs 43:21da1f744243 1032 {
icraggs 43:21da1f744243 1033 return publish(topicName, message.payload, message.payloadlen, message.qos, message.retained);
icraggs 43:21da1f744243 1034 }
icraggs 43:21da1f744243 1035
icraggs 43:21da1f744243 1036
icraggs 43:21da1f744243 1037 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 23:05fc7de97d4a 1038 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::disconnect()
icraggs 43:21da1f744243 1039 {
icraggs 26:2658bb87c53d 1040 int rc = FAILURE;
icraggs 53:15b5a280d22d 1041 Timer timer(command_timeout_ms); // we might wait for incomplete incoming publishes to complete
icraggs 44:c299463ae853 1042 int len = MQTTSerialize_disconnect(sendbuf, MAX_MQTT_PACKET_SIZE);
icraggs 26:2658bb87c53d 1043 if (len > 0)
icraggs 26:2658bb87c53d 1044 rc = sendPacket(len, timer); // send the disconnect packet
icraggs 53:15b5a280d22d 1045 closeSession();
icraggs 23:05fc7de97d4a 1046 return rc;
icraggs 20:cad3d54d7ecf 1047 }
icraggs 20:cad3d54d7ecf 1048
icraggs 53:15b5a280d22d 1049 #endif