Ian Craggs / MQTT

Better timing

Dependencies:   FP MQTTPacket

Fork of MQTT by MQTT

MQTTClient.h@53:15b5a280d22d, 2017-09-25 (annotated)

Committer:
icraggs
Date:
Mon Sep 25 12:06:28 2017 +0000
Revision:
53:15b5a280d22d
Parent:
46:e335fcc1a663
Child:
54:ff9e5c4b52d0
Latest code update from Paho - 1.1

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 23:05fc7de97d4a 385 while (sent < length && !timer.expired())
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 23:05fc7de97d4a 391 }
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 46:e335fcc1a663 403 DEBUG("Rc %d from sending packet %s\n", rc, MQTTFormat_toServerString(printbuf, sizeof(printbuf), sendbuf, length));
icraggs 43:21da1f744243 404 #endif
icraggs 23:05fc7de97d4a 405 return rc;
icraggs 8:c46930bd6c82 406 }
icraggs 8:c46930bd6c82 407
icraggs 8:c46930bd6c82 408
icraggs 43:21da1f744243 409 template<class Network, class Timer, int a, int b>
icraggs 26:2658bb87c53d 410 int MQTT::Client<Network, Timer, a, b>::decodePacket(int* value, int timeout)
icraggs 8:c46930bd6c82 411 {
icraggs 36:2f1ada427e56 412 unsigned char c;
icraggs 8:c46930bd6c82 413 int multiplier = 1;
icraggs 8:c46930bd6c82 414 int len = 0;
icraggs 20:cad3d54d7ecf 415 const int MAX_NO_OF_REMAINING_LENGTH_BYTES = 4;
icraggs 8:c46930bd6c82 416
icraggs 8:c46930bd6c82 417 *value = 0;
icraggs 8:c46930bd6c82 418 do
icraggs 8:c46930bd6c82 419 {
icraggs 8:c46930bd6c82 420 int rc = MQTTPACKET_READ_ERROR;
icraggs 8:c46930bd6c82 421
icraggs 8:c46930bd6c82 422 if (++len > MAX_NO_OF_REMAINING_LENGTH_BYTES)
icraggs 8:c46930bd6c82 423 {
icraggs 8:c46930bd6c82 424 rc = MQTTPACKET_READ_ERROR; /* bad data */
icraggs 8:c46930bd6c82 425 goto exit;
icraggs 8:c46930bd6c82 426 }
icraggs 23:05fc7de97d4a 427 rc = ipstack.read(&c, 1, timeout);
icraggs 8:c46930bd6c82 428 if (rc != 1)
icraggs 8:c46930bd6c82 429 goto exit;
icraggs 8:c46930bd6c82 430 *value += (c & 127) * multiplier;
icraggs 8:c46930bd6c82 431 multiplier *= 128;
icraggs 8:c46930bd6c82 432 } while ((c & 128) != 0);
icraggs 8:c46930bd6c82 433 exit:
icraggs 8:c46930bd6c82 434 return len;
icraggs 8:c46930bd6c82 435 }
icraggs 8:c46930bd6c82 436
icraggs 8:c46930bd6c82 437
icraggs 8:c46930bd6c82 438 /**
icraggs 8:c46930bd6c82 439 * If any read fails in this method, then we should disconnect from the network, as on reconnect
icraggs 43:21da1f744243 440 * the packets can be retried.
icraggs 8:c46930bd6c82 441 * @param timeout the max time to wait for the packet read to complete, in milliseconds
icraggs 53:15b5a280d22d 442 * @return the MQTT packet type, 0 if none, -1 if error
icraggs 8:c46930bd6c82 443 */
icraggs 46:e335fcc1a663 444 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 46:e335fcc1a663 445 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::readPacket(Timer& timer)
icraggs 8:c46930bd6c82 446 {
icraggs 26:2658bb87c53d 447 int rc = FAILURE;
icraggs 8:c46930bd6c82 448 MQTTHeader header = {0};
icraggs 8:c46930bd6c82 449 int len = 0;
icraggs 8:c46930bd6c82 450 int rem_len = 0;
icraggs 8:c46930bd6c82 451
icraggs 8:c46930bd6c82 452 /* 1. read the header byte. This has the packet type in it */
icraggs 53:15b5a280d22d 453 rc = ipstack.read(readbuf, 1, timer.left_ms());
icraggs 53:15b5a280d22d 454 if (rc != 1)
icraggs 8:c46930bd6c82 455 goto exit;
icraggs 8:c46930bd6c82 456
icraggs 8:c46930bd6c82 457 len = 1;
icraggs 8:c46930bd6c82 458 /* 2. read the remaining length. This is variable in itself */
icraggs 20:cad3d54d7ecf 459 decodePacket(&rem_len, timer.left_ms());
icraggs 43:21da1f744243 460 len += MQTTPacket_encode(readbuf + 1, rem_len); /* put the original remaining length into the buffer */
icraggs 8:c46930bd6c82 461
icraggs 46:e335fcc1a663 462 if (rem_len > (MAX_MQTT_PACKET_SIZE - len))
icraggs 46:e335fcc1a663 463 {
icraggs 46:e335fcc1a663 464 rc = BUFFER_OVERFLOW;
icraggs 46:e335fcc1a663 465 goto exit;
icraggs 46:e335fcc1a663 466 }
icraggs 46:e335fcc1a663 467
icraggs 8:c46930bd6c82 468 /* 3. read the rest of the buffer using a callback to supply the rest of the data */
icraggs 43:21da1f744243 469 if (rem_len > 0 && (ipstack.read(readbuf + len, rem_len, timer.left_ms()) != rem_len))
icraggs 8:c46930bd6c82 470 goto exit;
icraggs 8:c46930bd6c82 471
icraggs 8:c46930bd6c82 472 header.byte = readbuf[0];
icraggs 8:c46930bd6c82 473 rc = header.bits.type;
icraggs 43:21da1f744243 474 if (this->keepAliveInterval > 0)
icraggs 43:21da1f744243 475 last_received.countdown(this->keepAliveInterval); // record the fact that we have successfully received a packet
icraggs 8:c46930bd6c82 476 exit:
icraggs 53:15b5a280d22d 477
icraggs 43:21da1f744243 478 #if defined(MQTT_DEBUG)
icraggs 46:e335fcc1a663 479 if (rc >= 0)
icraggs 46:e335fcc1a663 480 {
icraggs 46:e335fcc1a663 481 char printbuf[50];
icraggs 53:15b5a280d22d 482 DEBUG("Rc %d from receiving packet %s\n", rc,
icraggs 53:15b5a280d22d 483 MQTTFormat_toClientString(printbuf, sizeof(printbuf), readbuf, len));
icraggs 46:e335fcc1a663 484 }
icraggs 43:21da1f744243 485 #endif
icraggs 8:c46930bd6c82 486 return rc;
icraggs 3:dbff6b768d28 487 }
icraggs 3:dbff6b768d28 488
icraggs 8:c46930bd6c82 489
icraggs 26:2658bb87c53d 490 // assume topic filter and name is in correct format
icraggs 26:2658bb87c53d 491 // # can only be at end
icraggs 26:2658bb87c53d 492 // + and # can only be next to separator
icraggs 43:21da1f744243 493 template<class Network, class Timer, int a, int b>
icraggs 26:2658bb87c53d 494 bool MQTT::Client<Network, Timer, a, b>::isTopicMatched(char* topicFilter, MQTTString& topicName)
icraggs 26:2658bb87c53d 495 {
icraggs 26:2658bb87c53d 496 char* curf = topicFilter;
icraggs 26:2658bb87c53d 497 char* curn = topicName.lenstring.data;
icraggs 26:2658bb87c53d 498 char* curn_end = curn + topicName.lenstring.len;
icraggs 43:21da1f744243 499
icraggs 26:2658bb87c53d 500 while (*curf && curn < curn_end)
icraggs 26:2658bb87c53d 501 {
icraggs 26:2658bb87c53d 502 if (*curn == '/' && *curf != '/')
icraggs 26:2658bb87c53d 503 break;
icraggs 26:2658bb87c53d 504 if (*curf != '+' && *curf != '#' && *curf != *curn)
icraggs 26:2658bb87c53d 505 break;
icraggs 26:2658bb87c53d 506 if (*curf == '+')
icraggs 26:2658bb87c53d 507 { // skip until we meet the next separator, or end of string
icraggs 26:2658bb87c53d 508 char* nextpos = curn + 1;
icraggs 26:2658bb87c53d 509 while (nextpos < curn_end && *nextpos != '/')
icraggs 26:2658bb87c53d 510 nextpos = ++curn + 1;
icraggs 26:2658bb87c53d 511 }
icraggs 26:2658bb87c53d 512 else if (*curf == '#')
icraggs 26:2658bb87c53d 513 curn = curn_end - 1; // skip until end of string
icraggs 26:2658bb87c53d 514 curf++;
icraggs 26:2658bb87c53d 515 curn++;
icraggs 26:2658bb87c53d 516 };
icraggs 43:21da1f744243 517
icraggs 26:2658bb87c53d 518 return (curn == curn_end) && (*curf == '\0');
icraggs 26:2658bb87c53d 519 }
icraggs 26:2658bb87c53d 520
icraggs 26:2658bb87c53d 521
icraggs 26:2658bb87c53d 522
icraggs 43:21da1f744243 523 template<class Network, class Timer, int a, int MAX_MESSAGE_HANDLERS>
icraggs 26:2658bb87c53d 524 int MQTT::Client<Network, Timer, a, MAX_MESSAGE_HANDLERS>::deliverMessage(MQTTString& topicName, Message& message)
icraggs 15:64a57183aa03 525 {
icraggs 26:2658bb87c53d 526 int rc = FAILURE;
icraggs 20:cad3d54d7ecf 527
icraggs 20:cad3d54d7ecf 528 // we have to find the right message handler - indexed by topic
icraggs 23:05fc7de97d4a 529 for (int i = 0; i < MAX_MESSAGE_HANDLERS; ++i)
icraggs 20:cad3d54d7ecf 530 {
icraggs 26:2658bb87c53d 531 if (messageHandlers[i].topicFilter != 0 && (MQTTPacket_equals(&topicName, (char*)messageHandlers[i].topicFilter) ||
icraggs 26:2658bb87c53d 532 isTopicMatched((char*)messageHandlers[i].topicFilter, topicName)))
icraggs 20:cad3d54d7ecf 533 {
icraggs 26:2658bb87c53d 534 if (messageHandlers[i].fp.attached())
icraggs 26:2658bb87c53d 535 {
icraggs 31:a51dd239b78e 536 MessageData md(topicName, message);
icraggs 31:a51dd239b78e 537 messageHandlers[i].fp(md);
icraggs 26:2658bb87c53d 538 rc = SUCCESS;
icraggs 26:2658bb87c53d 539 }
icraggs 20:cad3d54d7ecf 540 }
icraggs 20:cad3d54d7ecf 541 }
icraggs 43:21da1f744243 542
icraggs 43:21da1f744243 543 if (rc == FAILURE && defaultMessageHandler.attached())
icraggs 26:2658bb87c53d 544 {
icraggs 31:a51dd239b78e 545 MessageData md(topicName, message);
icraggs 31:a51dd239b78e 546 defaultMessageHandler(md);
icraggs 26:2658bb87c53d 547 rc = SUCCESS;
icraggs 43:21da1f744243 548 }
icraggs 43:21da1f744243 549
icraggs 20:cad3d54d7ecf 550 return rc;
icraggs 15:64a57183aa03 551 }
icraggs 15:64a57183aa03 552
icraggs 15:64a57183aa03 553
icraggs 20:cad3d54d7ecf 554
icraggs 43:21da1f744243 555 template<class Network, class Timer, int a, int b>
icraggs 43:21da1f744243 556 int MQTT::Client<Network, Timer, a, b>::yield(unsigned long timeout_ms)
icraggs 20:cad3d54d7ecf 557 {
icraggs 26:2658bb87c53d 558 int rc = SUCCESS;
icraggs 53:15b5a280d22d 559 Timer timer;
icraggs 43:21da1f744243 560
icraggs 23:05fc7de97d4a 561 timer.countdown_ms(timeout_ms);
icraggs 20:cad3d54d7ecf 562 while (!timer.expired())
icraggs 26:2658bb87c53d 563 {
icraggs 46:e335fcc1a663 564 if (cycle(timer) < 0)
icraggs 26:2658bb87c53d 565 {
icraggs 26:2658bb87c53d 566 rc = FAILURE;
icraggs 26:2658bb87c53d 567 break;
icraggs 26:2658bb87c53d 568 }
icraggs 26:2658bb87c53d 569 }
icraggs 43:21da1f744243 570
icraggs 26:2658bb87c53d 571 return rc;
icraggs 20:cad3d54d7ecf 572 }
icraggs 20:cad3d54d7ecf 573
icraggs 20:cad3d54d7ecf 574
icraggs 43:21da1f744243 575 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 23:05fc7de97d4a 576 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::cycle(Timer& timer)
icraggs 8:c46930bd6c82 577 {
icraggs 53:15b5a280d22d 578 // get one piece of work off the wire and one pass through
icraggs 26:2658bb87c53d 579 int len = 0,
icraggs 26:2658bb87c53d 580 rc = SUCCESS;
icraggs 28:8b2abe9bd814 581
icraggs 53:15b5a280d22d 582 int packet_type = readPacket(timer); // read the socket, see what work is due
icraggs 53:15b5a280d22d 583
icraggs 8:c46930bd6c82 584 switch (packet_type)
icraggs 8:c46930bd6c82 585 {
icraggs 53:15b5a280d22d 586 default:
icraggs 53:15b5a280d22d 587 // no more data to read, unrecoverable. Or read packet fails due to unexpected network error
icraggs 46:e335fcc1a663 588 rc = packet_type;
icraggs 53:15b5a280d22d 589 goto exit;
icraggs 53:15b5a280d22d 590 case 0: // timed out reading packet
icraggs 46:e335fcc1a663 591 break;
icraggs 15:64a57183aa03 592 case CONNACK:
icraggs 8:c46930bd6c82 593 case PUBACK:
icraggs 8:c46930bd6c82 594 case SUBACK:
icraggs 8:c46930bd6c82 595 break;
icraggs 15:64a57183aa03 596 case PUBLISH:
icraggs 46:e335fcc1a663 597 {
icraggs 46:e335fcc1a663 598 MQTTString topicName = MQTTString_initializer;
icraggs 20:cad3d54d7ecf 599 Message msg;
icraggs 46:e335fcc1a663 600 int intQoS;
icraggs 53:15b5a280d22d 601 msg.payloadlen = 0; /* this is a size_t, but deserialize publish sets this as int */
icraggs 46:e335fcc1a663 602 if (MQTTDeserialize_publish((unsigned char*)&msg.dup, &intQoS, (unsigned char*)&msg.retained, (unsigned short*)&msg.id, &topicName,
icraggs 36:2f1ada427e56 603 (unsigned char**)&msg.payload, (int*)&msg.payloadlen, readbuf, MAX_MQTT_PACKET_SIZE) != 1)
icraggs 26:2658bb87c53d 604 goto exit;
icraggs 46:e335fcc1a663 605 msg.qos = (enum QoS)intQoS;
icraggs 43:21da1f744243 606 #if MQTTCLIENT_QOS2
icraggs 43:21da1f744243 607 if (msg.qos != QOS2)
icraggs 43:21da1f744243 608 #endif
icraggs 31:a51dd239b78e 609 deliverMessage(topicName, msg);
icraggs 43:21da1f744243 610 #if MQTTCLIENT_QOS2
icraggs 31:a51dd239b78e 611 else if (isQoS2msgidFree(msg.id))
icraggs 31:a51dd239b78e 612 {
icraggs 43:21da1f744243 613 if (useQoS2msgid(msg.id))
icraggs 43:21da1f744243 614 deliverMessage(topicName, msg);
icraggs 43:21da1f744243 615 else
icraggs 43:21da1f744243 616 WARN("Maximum number of incoming QoS2 messages exceeded");
icraggs 46:e335fcc1a663 617 }
icraggs 31:a51dd239b78e 618 #endif
icraggs 43:21da1f744243 619 #if MQTTCLIENT_QOS1 || MQTTCLIENT_QOS2
icraggs 20:cad3d54d7ecf 620 if (msg.qos != QOS0)
icraggs 20:cad3d54d7ecf 621 {
icraggs 20:cad3d54d7ecf 622 if (msg.qos == QOS1)
icraggs 43:21da1f744243 623 len = MQTTSerialize_ack(sendbuf, MAX_MQTT_PACKET_SIZE, PUBACK, 0, msg.id);
icraggs 20:cad3d54d7ecf 624 else if (msg.qos == QOS2)
icraggs 43:21da1f744243 625 len = MQTTSerialize_ack(sendbuf, MAX_MQTT_PACKET_SIZE, PUBREC, 0, msg.id);
icraggs 26:2658bb87c53d 626 if (len <= 0)
icraggs 26:2658bb87c53d 627 rc = FAILURE;
icraggs 26:2658bb87c53d 628 else
icraggs 26:2658bb87c53d 629 rc = sendPacket(len, timer);
icraggs 26:2658bb87c53d 630 if (rc == FAILURE)
icraggs 20:cad3d54d7ecf 631 goto exit; // there was a problem
icraggs 20:cad3d54d7ecf 632 }
Ian Craggs 12:cc7f2d62a393 633 break;
icraggs 43:21da1f744243 634 #endif
icraggs 46:e335fcc1a663 635 }
icraggs 43:21da1f744243 636 #if MQTTCLIENT_QOS2
icraggs 15:64a57183aa03 637 case PUBREC:
icraggs 46:e335fcc1a663 638 case PUBREL:
icraggs 36:2f1ada427e56 639 unsigned short mypacketid;
icraggs 36:2f1ada427e56 640 unsigned char dup, type;
icraggs 26:2658bb87c53d 641 if (MQTTDeserialize_ack(&type, &dup, &mypacketid, readbuf, MAX_MQTT_PACKET_SIZE) != 1)
icraggs 26:2658bb87c53d 642 rc = FAILURE;
icraggs 53:15b5a280d22d 643 else if ((len = MQTTSerialize_ack(sendbuf, MAX_MQTT_PACKET_SIZE,
icraggs 53:15b5a280d22d 644 (packet_type == PUBREC) ? PUBREL : PUBCOMP, 0, mypacketid)) <= 0)
icraggs 26:2658bb87c53d 645 rc = FAILURE;
icraggs 26:2658bb87c53d 646 else if ((rc = sendPacket(len, timer)) != SUCCESS) // send the PUBREL packet
icraggs 26:2658bb87c53d 647 rc = FAILURE; // there was a problem
icraggs 26:2658bb87c53d 648 if (rc == FAILURE)
icraggs 20:cad3d54d7ecf 649 goto exit; // there was a problem
icraggs 46:e335fcc1a663 650 if (packet_type == PUBREL)
icraggs 46:e335fcc1a663 651 freeQoS2msgid(mypacketid);
icraggs 8:c46930bd6c82 652 break;
icraggs 53:15b5a280d22d 653
icraggs 8:c46930bd6c82 654 case PUBCOMP:
icraggs 8:c46930bd6c82 655 break;
icraggs 43:21da1f744243 656 #endif
icraggs 15:64a57183aa03 657 case PINGRESP:
icraggs 20:cad3d54d7ecf 658 ping_outstanding = false;
icraggs 8:c46930bd6c82 659 break;
icraggs 15:64a57183aa03 660 }
icraggs 53:15b5a280d22d 661
icraggs 53:15b5a280d22d 662 if (keepalive() != SUCCESS)
icraggs 53:15b5a280d22d 663 //check only keepalive FAILURE status so that previous FAILURE status can be considered as FAULT
icraggs 53:15b5a280d22d 664 rc = FAILURE;
icraggs 53:15b5a280d22d 665
Ian Craggs 12:cc7f2d62a393 666 exit:
icraggs 26:2658bb87c53d 667 if (rc == SUCCESS)
icraggs 26:2658bb87c53d 668 rc = packet_type;
icraggs 53:15b5a280d22d 669 else if (isconnected)
icraggs 53:15b5a280d22d 670 closeSession();
icraggs 26:2658bb87c53d 671 return rc;
icraggs 15:64a57183aa03 672 }
icraggs 15:64a57183aa03 673
icraggs 15:64a57183aa03 674
icraggs 23:05fc7de97d4a 675 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 23:05fc7de97d4a 676 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::keepalive()
icraggs 15:64a57183aa03 677 {
icraggs 53:15b5a280d22d 678 int rc = SUCCESS;
icraggs 15:64a57183aa03 679
icraggs 20:cad3d54d7ecf 680 if (keepAliveInterval == 0)
icraggs 20:cad3d54d7ecf 681 goto exit;
icraggs 15:64a57183aa03 682
icraggs 43:21da1f744243 683 if (last_sent.expired() || last_received.expired())
icraggs 20:cad3d54d7ecf 684 {
icraggs 53:15b5a280d22d 685 if (ping_outstanding)
icraggs 53:15b5a280d22d 686 {
icraggs 53:15b5a280d22d 687 rc = FAILURE; // session failure
icraggs 53:15b5a280d22d 688 #if defined(MQTT_DEBUG)
icraggs 53:15b5a280d22d 689 char printbuf[150];
icraggs 53:15b5a280d22d 690 DEBUG("PINGRESP not received in keepalive interval\n");
icraggs 53:15b5a280d22d 691 #endif
icraggs 53:15b5a280d22d 692 }
icraggs 53:15b5a280d22d 693 else
icraggs 20:cad3d54d7ecf 694 {
icraggs 46:e335fcc1a663 695 Timer timer(1000);
icraggs 43:21da1f744243 696 int len = MQTTSerialize_pingreq(sendbuf, MAX_MQTT_PACKET_SIZE);
icraggs 26:2658bb87c53d 697 if (len > 0 && (rc = sendPacket(len, timer)) == SUCCESS) // send the ping packet
icraggs 20:cad3d54d7ecf 698 ping_outstanding = true;
icraggs 20:cad3d54d7ecf 699 }
icraggs 20:cad3d54d7ecf 700 }
icraggs 15:64a57183aa03 701
icraggs 15:64a57183aa03 702 exit:
icraggs 20:cad3d54d7ecf 703 return rc;
icraggs 8:c46930bd6c82 704 }
icraggs 8:c46930bd6c82 705
icraggs 8:c46930bd6c82 706
icraggs 16:91c2f9a144d4 707 // only used in single-threaded mode where one command at a time is in process
icraggs 43:21da1f744243 708 template<class Network, class Timer, int a, int b>
icraggs 23:05fc7de97d4a 709 int MQTT::Client<Network, Timer, a, b>::waitfor(int packet_type, Timer& timer)
icraggs 15:64a57183aa03 710 {
icraggs 26:2658bb87c53d 711 int rc = FAILURE;
icraggs 43:21da1f744243 712
icraggs 20:cad3d54d7ecf 713 do
icraggs 16:91c2f9a144d4 714 {
icraggs 43:21da1f744243 715 if (timer.expired())
icraggs 20:cad3d54d7ecf 716 break; // we timed out
icraggs 53:15b5a280d22d 717 rc = cycle(timer);
icraggs 20:cad3d54d7ecf 718 }
icraggs 53:15b5a280d22d 719 while (rc != packet_type && rc >= 0);
icraggs 43:21da1f744243 720
icraggs 20:cad3d54d7ecf 721 return rc;
icraggs 16:91c2f9a144d4 722 }
icraggs 16:91c2f9a144d4 723
icraggs 16:91c2f9a144d4 724
icraggs 43:21da1f744243 725 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 53:15b5a280d22d 726 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::connect(MQTTPacket_connectData& options, connackData& data)
icraggs 16:91c2f9a144d4 727 {
icraggs 46:e335fcc1a663 728 Timer connect_timer(command_timeout_ms);
icraggs 26:2658bb87c53d 729 int rc = FAILURE;
icraggs 31:a51dd239b78e 730 int len = 0;
icraggs 43:21da1f744243 731
icraggs 31:a51dd239b78e 732 if (isconnected) // don't send connect packet again if we are already connected
icraggs 31:a51dd239b78e 733 goto exit;
icraggs 8:c46930bd6c82 734
icraggs 43:21da1f744243 735 this->keepAliveInterval = options.keepAliveInterval;
icraggs 43:21da1f744243 736 this->cleansession = options.cleansession;
icraggs 43:21da1f744243 737 if ((len = MQTTSerialize_connect(sendbuf, MAX_MQTT_PACKET_SIZE, &options)) <= 0)
icraggs 26:2658bb87c53d 738 goto exit;
icraggs 26:2658bb87c53d 739 if ((rc = sendPacket(len, connect_timer)) != SUCCESS) // send the connect packet
icraggs 20:cad3d54d7ecf 740 goto exit; // there was a problem
icraggs 43:21da1f744243 741
icraggs 43:21da1f744243 742 if (this->keepAliveInterval > 0)
icraggs 43:21da1f744243 743 last_received.countdown(this->keepAliveInterval);
icraggs 20:cad3d54d7ecf 744 // this will be a blocking call, wait for the connack
icraggs 20:cad3d54d7ecf 745 if (waitfor(CONNACK, connect_timer) == CONNACK)
icraggs 15:64a57183aa03 746 {
icraggs 53:15b5a280d22d 747 data.rc = 0;
icraggs 53:15b5a280d22d 748 data.sessionPresent = false;
icraggs 53:15b5a280d22d 749 if (MQTTDeserialize_connack((unsigned char*)&data.sessionPresent,
icraggs 53:15b5a280d22d 750 (unsigned char*)&data.rc, readbuf, MAX_MQTT_PACKET_SIZE) == 1)
icraggs 53:15b5a280d22d 751 rc = data.rc;
icraggs 26:2658bb87c53d 752 else
icraggs 26:2658bb87c53d 753 rc = FAILURE;
icraggs 8:c46930bd6c82 754 }
icraggs 26:2658bb87c53d 755 else
icraggs 26:2658bb87c53d 756 rc = FAILURE;
icraggs 46:e335fcc1a663 757
icraggs 43:21da1f744243 758 #if MQTTCLIENT_QOS2
icraggs 46:e335fcc1a663 759 // resend any inflight publish
icraggs 46:e335fcc1a663 760 if (inflightMsgid > 0 && inflightQoS == QOS2 && pubrel)
icraggs 43:21da1f744243 761 {
icraggs 43:21da1f744243 762 if ((len = MQTTSerialize_ack(sendbuf, MAX_MQTT_PACKET_SIZE, PUBREL, 0, inflightMsgid)) <= 0)
icraggs 43:21da1f744243 763 rc = FAILURE;
icraggs 43:21da1f744243 764 else
icraggs 43:21da1f744243 765 rc = publish(len, connect_timer, inflightQoS);
icraggs 43:21da1f744243 766 }
icraggs 43:21da1f744243 767 else
icraggs 43:21da1f744243 768 #endif
icraggs 43:21da1f744243 769 #if MQTTCLIENT_QOS1 || MQTTCLIENT_QOS2
icraggs 43:21da1f744243 770 if (inflightMsgid > 0)
icraggs 43:21da1f744243 771 {
icraggs 43:21da1f744243 772 memcpy(sendbuf, pubbuf, MAX_MQTT_PACKET_SIZE);
icraggs 43:21da1f744243 773 rc = publish(inflightLen, connect_timer, inflightQoS);
icraggs 43:21da1f744243 774 }
icraggs 43:21da1f744243 775 #endif
icraggs 43:21da1f744243 776
icraggs 15:64a57183aa03 777 exit:
icraggs 26:2658bb87c53d 778 if (rc == SUCCESS)
icraggs 53:15b5a280d22d 779 {
icraggs 26:2658bb87c53d 780 isconnected = true;
icraggs 53:15b5a280d22d 781 ping_outstanding = false;
icraggs 53:15b5a280d22d 782 }
icraggs 8:c46930bd6c82 783 return rc;
icraggs 8:c46930bd6c82 784 }
icraggs 8:c46930bd6c82 785
icraggs 8:c46930bd6c82 786
icraggs 43:21da1f744243 787 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 53:15b5a280d22d 788 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::connect(MQTTPacket_connectData& options)
icraggs 53:15b5a280d22d 789 {
icraggs 53:15b5a280d22d 790 connackData data;
icraggs 53:15b5a280d22d 791 return connect(options, data);
icraggs 53:15b5a280d22d 792 }
icraggs 53:15b5a280d22d 793
icraggs 53:15b5a280d22d 794
icraggs 53:15b5a280d22d 795 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 43:21da1f744243 796 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::connect()
icraggs 43:21da1f744243 797 {
icraggs 43:21da1f744243 798 MQTTPacket_connectData default_options = MQTTPacket_connectData_initializer;
icraggs 43:21da1f744243 799 return connect(default_options);
icraggs 43:21da1f744243 800 }
icraggs 43:21da1f744243 801
icraggs 43:21da1f744243 802
icraggs 43:21da1f744243 803 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int MAX_MESSAGE_HANDLERS>
icraggs 53:15b5a280d22d 804 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, MAX_MESSAGE_HANDLERS>::setMessageHandler(const char* topicFilter, messageHandler messageHandler)
icraggs 53:15b5a280d22d 805 {
icraggs 53:15b5a280d22d 806 int rc = FAILURE;
icraggs 53:15b5a280d22d 807 int i = -1;
icraggs 53:15b5a280d22d 808
icraggs 53:15b5a280d22d 809 // first check for an existing matching slot
icraggs 53:15b5a280d22d 810 for (i = 0; i < MAX_MESSAGE_HANDLERS; ++i)
icraggs 53:15b5a280d22d 811 {
icraggs 53:15b5a280d22d 812 if (messageHandlers[i].topicFilter != 0 && strcmp(messageHandlers[i].topicFilter, topicFilter) == 0)
icraggs 53:15b5a280d22d 813 {
icraggs 53:15b5a280d22d 814 if (messageHandler == 0) // remove existing
icraggs 53:15b5a280d22d 815 {
icraggs 53:15b5a280d22d 816 messageHandlers[i].topicFilter = 0;
icraggs 53:15b5a280d22d 817 messageHandlers[i].fp.detach();
icraggs 53:15b5a280d22d 818 }
icraggs 53:15b5a280d22d 819 rc = SUCCESS; // return i when adding new subscription
icraggs 53:15b5a280d22d 820 break;
icraggs 53:15b5a280d22d 821 }
icraggs 53:15b5a280d22d 822 }
icraggs 53:15b5a280d22d 823 // if no existing, look for empty slot (unless we are removing)
icraggs 53:15b5a280d22d 824 if (messageHandler != 0) {
icraggs 53:15b5a280d22d 825 if (rc == FAILURE)
icraggs 53:15b5a280d22d 826 {
icraggs 53:15b5a280d22d 827 for (i = 0; i < MAX_MESSAGE_HANDLERS; ++i)
icraggs 53:15b5a280d22d 828 {
icraggs 53:15b5a280d22d 829 if (messageHandlers[i].topicFilter == 0)
icraggs 53:15b5a280d22d 830 {
icraggs 53:15b5a280d22d 831 rc = SUCCESS;
icraggs 53:15b5a280d22d 832 break;
icraggs 53:15b5a280d22d 833 }
icraggs 53:15b5a280d22d 834 }
icraggs 53:15b5a280d22d 835 }
icraggs 53:15b5a280d22d 836 if (i < MAX_MESSAGE_HANDLERS)
icraggs 53:15b5a280d22d 837 {
icraggs 53:15b5a280d22d 838 messageHandlers[i].topicFilter = topicFilter;
icraggs 53:15b5a280d22d 839 messageHandlers[i].fp.attach(messageHandler);
icraggs 53:15b5a280d22d 840 }
icraggs 53:15b5a280d22d 841 }
icraggs 53:15b5a280d22d 842 return rc;
icraggs 53:15b5a280d22d 843 }
icraggs 53:15b5a280d22d 844
icraggs 53:15b5a280d22d 845
icraggs 53:15b5a280d22d 846 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int MAX_MESSAGE_HANDLERS>
icraggs 53:15b5a280d22d 847 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, MAX_MESSAGE_HANDLERS>::subscribe(const char* topicFilter,
icraggs 53:15b5a280d22d 848 enum QoS qos, messageHandler messageHandler, subackData& data)
icraggs 43:21da1f744243 849 {
icraggs 43:21da1f744243 850 int rc = FAILURE;
icraggs 46:e335fcc1a663 851 Timer timer(command_timeout_ms);
icraggs 26:2658bb87c53d 852 int len = 0;
icraggs 46:e335fcc1a663 853 MQTTString topic = {(char*)topicFilter, {0, 0}};
icraggs 43:21da1f744243 854
icraggs 26:2658bb87c53d 855 if (!isconnected)
icraggs 20:cad3d54d7ecf 856 goto exit;
icraggs 43:21da1f744243 857
icraggs 43:21da1f744243 858 len = MQTTSerialize_subscribe(sendbuf, MAX_MQTT_PACKET_SIZE, 0, packetid.getNext(), 1, &topic, (int*)&qos);
icraggs 26:2658bb87c53d 859 if (len <= 0)
icraggs 26:2658bb87c53d 860 goto exit;
icraggs 23:05fc7de97d4a 861 if ((rc = sendPacket(len, timer)) != SUCCESS) // send the subscribe packet
icraggs 26:2658bb87c53d 862 goto exit; // there was a problem
icraggs 43:21da1f744243 863
icraggs 43:21da1f744243 864 if (waitfor(SUBACK, timer) == SUBACK) // wait for suback
icraggs 8:c46930bd6c82 865 {
icraggs 53:15b5a280d22d 866 int count = 0;
icraggs 36:2f1ada427e56 867 unsigned short mypacketid;
icraggs 53:15b5a280d22d 868 data.grantedQoS = 0;
icraggs 53:15b5a280d22d 869 if (MQTTDeserialize_suback(&mypacketid, 1, &count, &data.grantedQoS, readbuf, MAX_MQTT_PACKET_SIZE) == 1)
icraggs 8:c46930bd6c82 870 {
icraggs 53:15b5a280d22d 871 if (data.grantedQoS != 0x80)
icraggs 53:15b5a280d22d 872 rc = setMessageHandler(topicFilter, messageHandler);
icraggs 8:c46930bd6c82 873 }
icraggs 8:c46930bd6c82 874 }
icraggs 43:21da1f744243 875 else
icraggs 26:2658bb87c53d 876 rc = FAILURE;
icraggs 43:21da1f744243 877
icraggs 15:64a57183aa03 878 exit:
icraggs 53:15b5a280d22d 879 if (rc == FAILURE)
icraggs 53:15b5a280d22d 880 closeSession();
Ian Craggs 12:cc7f2d62a393 881 return rc;
icraggs 15:64a57183aa03 882 }
icraggs 15:64a57183aa03 883
icraggs 15:64a57183aa03 884
icraggs 43:21da1f744243 885 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int MAX_MESSAGE_HANDLERS>
icraggs 53:15b5a280d22d 886 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, MAX_MESSAGE_HANDLERS>::subscribe(const char* topicFilter, enum QoS qos, messageHandler messageHandler)
icraggs 53:15b5a280d22d 887 {
icraggs 53:15b5a280d22d 888 subackData data;
icraggs 53:15b5a280d22d 889 return subscribe(topicFilter, qos, messageHandler, data);
icraggs 53:15b5a280d22d 890 }
icraggs 53:15b5a280d22d 891
icraggs 53:15b5a280d22d 892
icraggs 53:15b5a280d22d 893 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int MAX_MESSAGE_HANDLERS>
icraggs 23:05fc7de97d4a 894 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, MAX_MESSAGE_HANDLERS>::unsubscribe(const char* topicFilter)
icraggs 43:21da1f744243 895 {
icraggs 26:2658bb87c53d 896 int rc = FAILURE;
icraggs 46:e335fcc1a663 897 Timer timer(command_timeout_ms);
icraggs 46:e335fcc1a663 898 MQTTString topic = {(char*)topicFilter, {0, 0}};
icraggs 31:a51dd239b78e 899 int len = 0;
icraggs 43:21da1f744243 900
icraggs 31:a51dd239b78e 901 if (!isconnected)
icraggs 31:a51dd239b78e 902 goto exit;
icraggs 43:21da1f744243 903
icraggs 43:21da1f744243 904 if ((len = MQTTSerialize_unsubscribe(sendbuf, MAX_MQTT_PACKET_SIZE, 0, packetid.getNext(), 1, &topic)) <= 0)
icraggs 20:cad3d54d7ecf 905 goto exit;
icraggs 43:21da1f744243 906 if ((rc = sendPacket(len, timer)) != SUCCESS) // send the unsubscribe packet
icraggs 20:cad3d54d7ecf 907 goto exit; // there was a problem
icraggs 43:21da1f744243 908
icraggs 20:cad3d54d7ecf 909 if (waitfor(UNSUBACK, timer) == UNSUBACK)
Ian Craggs 12:cc7f2d62a393 910 {
icraggs 36:2f1ada427e56 911 unsigned short mypacketid; // should be the same as the packetid above
icraggs 23:05fc7de97d4a 912 if (MQTTDeserialize_unsuback(&mypacketid, readbuf, MAX_MQTT_PACKET_SIZE) == 1)
icraggs 46:e335fcc1a663 913 {
icraggs 46:e335fcc1a663 914 // remove the subscription message handler associated with this topic, if there is one
icraggs 53:15b5a280d22d 915 setMessageHandler(topicFilter, 0);
icraggs 46:e335fcc1a663 916 }
Ian Craggs 12:cc7f2d62a393 917 }
icraggs 26:2658bb87c53d 918 else
icraggs 26:2658bb87c53d 919 rc = FAILURE;
icraggs 43:21da1f744243 920
icraggs 15:64a57183aa03 921 exit:
icraggs 43:21da1f744243 922 if (rc != SUCCESS)
icraggs 53:15b5a280d22d 923 closeSession();
Ian Craggs 12:cc7f2d62a393 924 return rc;
icraggs 15:64a57183aa03 925 }
icraggs 15:64a57183aa03 926
icraggs 15:64a57183aa03 927
icraggs 43:21da1f744243 928 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 43:21da1f744243 929 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::publish(int len, Timer& timer, enum QoS qos)
icraggs 20:cad3d54d7ecf 930 {
icraggs 43:21da1f744243 931 int rc;
icraggs 46:e335fcc1a663 932
icraggs 43:21da1f744243 933 if ((rc = sendPacket(len, timer)) != SUCCESS) // send the publish packet
icraggs 43:21da1f744243 934 goto exit; // there was a problem
icraggs 15:64a57183aa03 935
icraggs 46:e335fcc1a663 936 #if MQTTCLIENT_QOS1
icraggs 43:21da1f744243 937 if (qos == QOS1)
Ian Craggs 12:cc7f2d62a393 938 {
icraggs 20:cad3d54d7ecf 939 if (waitfor(PUBACK, timer) == PUBACK)
icraggs 20:cad3d54d7ecf 940 {
icraggs 36:2f1ada427e56 941 unsigned short mypacketid;
icraggs 36:2f1ada427e56 942 unsigned char dup, type;
icraggs 26:2658bb87c53d 943 if (MQTTDeserialize_ack(&type, &dup, &mypacketid, readbuf, MAX_MQTT_PACKET_SIZE) != 1)
icraggs 26:2658bb87c53d 944 rc = FAILURE;
icraggs 43:21da1f744243 945 else if (inflightMsgid == mypacketid)
icraggs 43:21da1f744243 946 inflightMsgid = 0;
icraggs 20:cad3d54d7ecf 947 }
icraggs 26:2658bb87c53d 948 else
icraggs 26:2658bb87c53d 949 rc = FAILURE;
Ian Craggs 12:cc7f2d62a393 950 }
icraggs 53:15b5a280d22d 951 #endif
icraggs 53:15b5a280d22d 952 #if MQTTCLIENT_QOS2
icraggs 43:21da1f744243 953 else if (qos == QOS2)
Ian Craggs 12:cc7f2d62a393 954 {
icraggs 20:cad3d54d7ecf 955 if (waitfor(PUBCOMP, timer) == PUBCOMP)
icraggs 20:cad3d54d7ecf 956 {
icraggs 36:2f1ada427e56 957 unsigned short mypacketid;
icraggs 36:2f1ada427e56 958 unsigned char dup, type;
icraggs 26:2658bb87c53d 959 if (MQTTDeserialize_ack(&type, &dup, &mypacketid, readbuf, MAX_MQTT_PACKET_SIZE) != 1)
icraggs 26:2658bb87c53d 960 rc = FAILURE;
icraggs 43:21da1f744243 961 else if (inflightMsgid == mypacketid)
icraggs 43:21da1f744243 962 inflightMsgid = 0;
icraggs 20:cad3d54d7ecf 963 }
icraggs 26:2658bb87c53d 964 else
icraggs 26:2658bb87c53d 965 rc = FAILURE;
Ian Craggs 12:cc7f2d62a393 966 }
icraggs 43:21da1f744243 967 #endif
icraggs 43:21da1f744243 968
icraggs 43:21da1f744243 969 exit:
icraggs 43:21da1f744243 970 if (rc != SUCCESS)
icraggs 53:15b5a280d22d 971 closeSession();
icraggs 43:21da1f744243 972 return rc;
icraggs 43:21da1f744243 973 }
icraggs 43:21da1f744243 974
icraggs 43:21da1f744243 975
icraggs 43:21da1f744243 976
icraggs 43:21da1f744243 977 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 43:21da1f744243 978 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 979 {
icraggs 43:21da1f744243 980 int rc = FAILURE;
icraggs 46:e335fcc1a663 981 Timer timer(command_timeout_ms);
icraggs 43:21da1f744243 982 MQTTString topicString = MQTTString_initializer;
icraggs 43:21da1f744243 983 int len = 0;
icraggs 43:21da1f744243 984
icraggs 43:21da1f744243 985 if (!isconnected)
icraggs 43:21da1f744243 986 goto exit;
icraggs 46:e335fcc1a663 987
icraggs 43:21da1f744243 988 topicString.cstring = (char*)topicName;
icraggs 43:21da1f744243 989
icraggs 43:21da1f744243 990 #if MQTTCLIENT_QOS1 || MQTTCLIENT_QOS2
icraggs 43:21da1f744243 991 if (qos == QOS1 || qos == QOS2)
icraggs 43:21da1f744243 992 id = packetid.getNext();
icraggs 43:21da1f744243 993 #endif
icraggs 43:21da1f744243 994
icraggs 43:21da1f744243 995 len = MQTTSerialize_publish(sendbuf, MAX_MQTT_PACKET_SIZE, 0, qos, retained, id,
icraggs 43:21da1f744243 996 topicString, (unsigned char*)payload, payloadlen);
icraggs 43:21da1f744243 997 if (len <= 0)
icraggs 43:21da1f744243 998 goto exit;
icraggs 46:e335fcc1a663 999
icraggs 43:21da1f744243 1000 #if MQTTCLIENT_QOS1 || MQTTCLIENT_QOS2
icraggs 43:21da1f744243 1001 if (!cleansession)
icraggs 43:21da1f744243 1002 {
icraggs 43:21da1f744243 1003 memcpy(pubbuf, sendbuf, len);
icraggs 43:21da1f744243 1004 inflightMsgid = id;
icraggs 43:21da1f744243 1005 inflightLen = len;
icraggs 43:21da1f744243 1006 inflightQoS = qos;
icraggs 43:21da1f744243 1007 #if MQTTCLIENT_QOS2
icraggs 43:21da1f744243 1008 pubrel = false;
icraggs 43:21da1f744243 1009 #endif
icraggs 43:21da1f744243 1010 }
icraggs 43:21da1f744243 1011 #endif
icraggs 46:e335fcc1a663 1012
icraggs 43:21da1f744243 1013 rc = publish(len, timer, qos);
icraggs 15:64a57183aa03 1014 exit:
icraggs 8:c46930bd6c82 1015 return rc;
icraggs 8:c46930bd6c82 1016 }
icraggs 8:c46930bd6c82 1017
icraggs 8:c46930bd6c82 1018
icraggs 43:21da1f744243 1019 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 43:21da1f744243 1020 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 1021 {
icraggs 43:21da1f744243 1022 unsigned short id = 0; // dummy - not used for anything
icraggs 43:21da1f744243 1023 return publish(topicName, payload, payloadlen, id, qos, retained);
icraggs 43:21da1f744243 1024 }
icraggs 43:21da1f744243 1025
icraggs 43:21da1f744243 1026
icraggs 43:21da1f744243 1027 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 43:21da1f744243 1028 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::publish(const char* topicName, Message& message)
icraggs 43:21da1f744243 1029 {
icraggs 43:21da1f744243 1030 return publish(topicName, message.payload, message.payloadlen, message.qos, message.retained);
icraggs 43:21da1f744243 1031 }
icraggs 43:21da1f744243 1032
icraggs 43:21da1f744243 1033
icraggs 43:21da1f744243 1034 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 23:05fc7de97d4a 1035 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::disconnect()
icraggs 43:21da1f744243 1036 {
icraggs 26:2658bb87c53d 1037 int rc = FAILURE;
icraggs 53:15b5a280d22d 1038 Timer timer(command_timeout_ms); // we might wait for incomplete incoming publishes to complete
icraggs 44:c299463ae853 1039 int len = MQTTSerialize_disconnect(sendbuf, MAX_MQTT_PACKET_SIZE);
icraggs 26:2658bb87c53d 1040 if (len > 0)
icraggs 26:2658bb87c53d 1041 rc = sendPacket(len, timer); // send the disconnect packet
icraggs 53:15b5a280d22d 1042 closeSession();
icraggs 23:05fc7de97d4a 1043 return rc;
icraggs 20:cad3d54d7ecf 1044 }
icraggs 20:cad3d54d7ecf 1045
icraggs 53:15b5a280d22d 1046 #endif