Ian Craggs / MQTT

Better timing

Dependencies:   FP MQTTPacket

Fork of MQTT by MQTT

MQTTClient.h@41:b7e86fa6dbb8, 2014-08-15 (annotated)

Committer:
icraggs
Date:
Fri Aug 15 10:23:56 2014 +0000
Revision:
41:b7e86fa6dbb8
Parent:
40:9623a2c9c8ac
Child:
42:f5beda831651
Add logging and getter for EthernetInterface object

Who changed what in which revision?

UserRevisionLine numberNew contents of line
icraggs 6:4d312a49200b 1 /*******************************************************************************
icraggs 6:4d312a49200b 2 * Copyright (c) 2014 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 6:4d312a49200b 15 *******************************************************************************/
icraggs 21:e918525e529d 16
icraggs 21:e918525e529d 17 /*
icraggs 21:e918525e529d 18
icraggs 21:e918525e529d 19 TODO:
icraggs 21:e918525e529d 20
icraggs 26:2658bb87c53d 21 ensure publish packets are retried on reconnect
icraggs 23:05fc7de97d4a 22
icraggs 21:e918525e529d 23 */
sam_grove 0:fe461e4d7afe 24
icraggs 2:dcfdd2abfe71 25 #if !defined(MQTTCLIENT_H)
icraggs 2:dcfdd2abfe71 26 #define MQTTCLIENT_H
icraggs 2:dcfdd2abfe71 27
icraggs 34:e18a166198df 28 #include "FP.h"
icraggs 3:dbff6b768d28 29 #include "MQTTPacket.h"
icraggs 6:4d312a49200b 30 #include "stdio.h"
icraggs 41:b7e86fa6dbb8 31 #include "MQTT_logging.h"
icraggs 2:dcfdd2abfe71 32
icraggs 3:dbff6b768d28 33 namespace MQTT
icraggs 3:dbff6b768d28 34 {
icraggs 3:dbff6b768d28 35
icraggs 2:dcfdd2abfe71 36
icraggs 2:dcfdd2abfe71 37 enum QoS { QOS0, QOS1, QOS2 };
sam_grove 0:fe461e4d7afe 38
icraggs 31:a51dd239b78e 39 // all failure return codes must be negative
icraggs 23:05fc7de97d4a 40 enum returnCode { BUFFER_OVERFLOW = -2, FAILURE = -1, SUCCESS = 0 };
icraggs 23:05fc7de97d4a 41
icraggs 2:dcfdd2abfe71 42
icraggs 3:dbff6b768d28 43 struct Message
icraggs 2:dcfdd2abfe71 44 {
icraggs 2:dcfdd2abfe71 45 enum QoS qos;
icraggs 2:dcfdd2abfe71 46 bool retained;
icraggs 2:dcfdd2abfe71 47 bool dup;
Ian Craggs 12:cc7f2d62a393 48 unsigned short id;
icraggs 2:dcfdd2abfe71 49 void *payload;
icraggs 2:dcfdd2abfe71 50 size_t payloadlen;
sam_grove 0:fe461e4d7afe 51 };
sam_grove 0:fe461e4d7afe 52
icraggs 4:4ef00243708e 53
icraggs 20:cad3d54d7ecf 54 struct MessageData
icraggs 20:cad3d54d7ecf 55 {
icraggs 31:a51dd239b78e 56 MessageData(MQTTString &aTopicName, struct Message &aMessage) : message(aMessage), topicName(aTopicName)
icraggs 37:e3d64f9b986c 57 { }
icraggs 31:a51dd239b78e 58
icraggs 31:a51dd239b78e 59 struct Message &message;
icraggs 31:a51dd239b78e 60 MQTTString &topicName;
icraggs 20:cad3d54d7ecf 61 };
icraggs 20:cad3d54d7ecf 62
icraggs 20:cad3d54d7ecf 63
icraggs 9:01b8cc7d94cc 64 class PacketId
icraggs 9:01b8cc7d94cc 65 {
icraggs 9:01b8cc7d94cc 66 public:
icraggs 23:05fc7de97d4a 67 PacketId()
icraggs 23:05fc7de97d4a 68 {
icraggs 23:05fc7de97d4a 69 next = 0;
icraggs 23:05fc7de97d4a 70 }
icraggs 9:01b8cc7d94cc 71
icraggs 23:05fc7de97d4a 72 int getNext()
icraggs 23:05fc7de97d4a 73 {
icraggs 23:05fc7de97d4a 74 return next = (next == MAX_PACKET_ID) ? 1 : ++next;
icraggs 23:05fc7de97d4a 75 }
Ian Craggs 12:cc7f2d62a393 76
icraggs 9:01b8cc7d94cc 77 private:
icraggs 9:01b8cc7d94cc 78 static const int MAX_PACKET_ID = 65535;
icraggs 9:01b8cc7d94cc 79 int next;
icraggs 9:01b8cc7d94cc 80 };
icraggs 31:a51dd239b78e 81
icraggs 31:a51dd239b78e 82
icraggs 31:a51dd239b78e 83 class QoS2
icraggs 31:a51dd239b78e 84 {
icraggs 31:a51dd239b78e 85 public:
icraggs 31:a51dd239b78e 86
icraggs 31:a51dd239b78e 87
icraggs 31:a51dd239b78e 88 private:
icraggs 31:a51dd239b78e 89
icraggs 31:a51dd239b78e 90
icraggs 31:a51dd239b78e 91 };
icraggs 2:dcfdd2abfe71 92
icraggs 16:91c2f9a144d4 93
icraggs 21:e918525e529d 94 /**
icraggs 21:e918525e529d 95 * @class Client
icraggs 22:aadb79d29330 96 * @brief blocking, non-threaded MQTT client API
icraggs 23:05fc7de97d4a 97 *
icraggs 23:05fc7de97d4a 98 * This version of the API blocks on all method calls, until they are complete. This means that only one
icraggs 23:05fc7de97d4a 99 * MQTT request can be in process at any one time.
icraggs 21:e918525e529d 100 * @param Network a network class which supports send, receive
icraggs 21:e918525e529d 101 * @param Timer a timer class with the methods:
icraggs 21:e918525e529d 102 */
icraggs 31:a51dd239b78e 103 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE = 100, int MAX_MESSAGE_HANDLERS = 5>
icraggs 31:a51dd239b78e 104 class Client
icraggs 2:dcfdd2abfe71 105 {
icraggs 2:dcfdd2abfe71 106
icraggs 22:aadb79d29330 107 public:
icraggs 26:2658bb87c53d 108
icraggs 31:a51dd239b78e 109 typedef void (*messageHandler)(MessageData&);
icraggs 23:05fc7de97d4a 110
icraggs 23:05fc7de97d4a 111 /** Construct the client
icraggs 23:05fc7de97d4a 112 * @param network - pointer to an instance of the Network class - must be connected to the endpoint
icraggs 23:05fc7de97d4a 113 * before calling MQTT connect
icraggs 23:05fc7de97d4a 114 * @param limits an instance of the Limit class - to alter limits as required
icraggs 23:05fc7de97d4a 115 */
icraggs 23:05fc7de97d4a 116 Client(Network& network, unsigned int command_timeout_ms = 30000);
icraggs 20:cad3d54d7ecf 117
icraggs 20:cad3d54d7ecf 118 /** Set the default message handling callback - used for any message which does not match a subscription message handler
icraggs 20:cad3d54d7ecf 119 * @param mh - pointer to the callback function
icraggs 20:cad3d54d7ecf 120 */
icraggs 20:cad3d54d7ecf 121 void setDefaultMessageHandler(messageHandler mh)
icraggs 20:cad3d54d7ecf 122 {
icraggs 20:cad3d54d7ecf 123 defaultMessageHandler.attach(mh);
icraggs 20:cad3d54d7ecf 124 }
icraggs 2:dcfdd2abfe71 125
icraggs 20:cad3d54d7ecf 126 /** MQTT Connect - send an MQTT connect packet down the network and wait for a Connack
icraggs 20:cad3d54d7ecf 127 * The nework object must be connected to the network endpoint before calling this
icraggs 20:cad3d54d7ecf 128 * @param options - connect options
icraggs 20:cad3d54d7ecf 129 * @return success code -
icraggs 20:cad3d54d7ecf 130 */
icraggs 20:cad3d54d7ecf 131 int connect(MQTTPacket_connectData* options = 0);
icraggs 20:cad3d54d7ecf 132
icraggs 20:cad3d54d7ecf 133 /** MQTT Publish - send an MQTT publish packet and wait for all acks to complete for all QoSs
icraggs 20:cad3d54d7ecf 134 * @param topic - the topic to publish to
icraggs 20:cad3d54d7ecf 135 * @param message - the message to send
icraggs 20:cad3d54d7ecf 136 * @return success code -
icraggs 20:cad3d54d7ecf 137 */
icraggs 20:cad3d54d7ecf 138 int publish(const char* topicName, Message* message);
icraggs 20:cad3d54d7ecf 139
icraggs 20:cad3d54d7ecf 140 /** MQTT Subscribe - send an MQTT subscribe packet and wait for the suback
icraggs 20:cad3d54d7ecf 141 * @param topicFilter - a topic pattern which can include wildcards
icraggs 20:cad3d54d7ecf 142 * @param qos - the MQTT QoS to subscribe at
icraggs 20:cad3d54d7ecf 143 * @param mh - the callback function to be invoked when a message is received for this subscription
icraggs 20:cad3d54d7ecf 144 * @return success code -
icraggs 20:cad3d54d7ecf 145 */
icraggs 20:cad3d54d7ecf 146 int subscribe(const char* topicFilter, enum QoS qos, messageHandler mh);
icraggs 9:01b8cc7d94cc 147
icraggs 20:cad3d54d7ecf 148 /** MQTT Unsubscribe - send an MQTT unsubscribe packet and wait for the unsuback
icraggs 20:cad3d54d7ecf 149 * @param topicFilter - a topic pattern which can include wildcards
icraggs 20:cad3d54d7ecf 150 * @return success code -
icraggs 20:cad3d54d7ecf 151 */
icraggs 20:cad3d54d7ecf 152 int unsubscribe(const char* topicFilter);
icraggs 20:cad3d54d7ecf 153
icraggs 31:a51dd239b78e 154 /** MQTT Disconnect - send an MQTT disconnect packet, and clean up any state
icraggs 20:cad3d54d7ecf 155 * @return success code -
icraggs 20:cad3d54d7ecf 156 */
icraggs 20:cad3d54d7ecf 157 int disconnect();
icraggs 8:c46930bd6c82 158
icraggs 20:cad3d54d7ecf 159 /** A call to this API must be made within the keepAlive interval to keep the MQTT connection alive
icraggs 20:cad3d54d7ecf 160 * yield can be called if no other MQTT operation is needed. This will also allow messages to be
icraggs 20:cad3d54d7ecf 161 * received.
icraggs 23:05fc7de97d4a 162 * @param timeout_ms the time to wait, in milliseconds
icraggs 26:2658bb87c53d 163 * @return success code - on failure, this means the client has disconnected
icraggs 20:cad3d54d7ecf 164 */
icraggs 26:2658bb87c53d 165 int yield(int timeout_ms = 1000);
icraggs 20:cad3d54d7ecf 166
icraggs 20:cad3d54d7ecf 167 private:
icraggs 20:cad3d54d7ecf 168
icraggs 20:cad3d54d7ecf 169 int cycle(Timer& timer);
icraggs 20:cad3d54d7ecf 170 int waitfor(int packet_type, Timer& timer);
icraggs 20:cad3d54d7ecf 171 int keepalive();
icraggs 2:dcfdd2abfe71 172
icraggs 3:dbff6b768d28 173 int decodePacket(int* value, int timeout);
icraggs 20:cad3d54d7ecf 174 int readPacket(Timer& timer);
icraggs 20:cad3d54d7ecf 175 int sendPacket(int length, Timer& timer);
icraggs 26:2658bb87c53d 176 int deliverMessage(MQTTString& topicName, Message& message);
icraggs 26:2658bb87c53d 177 bool isTopicMatched(char* topicFilter, MQTTString& topicName);
icraggs 3:dbff6b768d28 178
icraggs 23:05fc7de97d4a 179 Network& ipstack;
icraggs 23:05fc7de97d4a 180 unsigned int command_timeout_ms;
icraggs 16:91c2f9a144d4 181
icraggs 36:2f1ada427e56 182 unsigned char buf[MAX_MQTT_PACKET_SIZE];
icraggs 36:2f1ada427e56 183 unsigned char readbuf[MAX_MQTT_PACKET_SIZE];
icraggs 15:64a57183aa03 184
icraggs 20:cad3d54d7ecf 185 Timer ping_timer;
icraggs 15:64a57183aa03 186 unsigned int keepAliveInterval;
icraggs 20:cad3d54d7ecf 187 bool ping_outstanding;
icraggs 4:4ef00243708e 188
icraggs 9:01b8cc7d94cc 189 PacketId packetid;
icraggs 9:01b8cc7d94cc 190
icraggs 16:91c2f9a144d4 191 struct MessageHandlers
icraggs 15:64a57183aa03 192 {
icraggs 26:2658bb87c53d 193 const char* topicFilter;
icraggs 31:a51dd239b78e 194 FP<void, MessageData&> fp;
icraggs 23:05fc7de97d4a 195 } messageHandlers[MAX_MESSAGE_HANDLERS]; // Message handlers are indexed by subscription topic
icraggs 15:64a57183aa03 196
icraggs 31:a51dd239b78e 197 FP<void, MessageData&> defaultMessageHandler;
icraggs 28:8b2abe9bd814 198
icraggs 26:2658bb87c53d 199 bool isconnected;
icraggs 31:a51dd239b78e 200
icraggs 31:a51dd239b78e 201 #if 0
icraggs 31:a51dd239b78e 202 struct
icraggs 31:a51dd239b78e 203 {
icraggs 31:a51dd239b78e 204 bool used;
icraggs 31:a51dd239b78e 205 int id;
icraggs 31:a51dd239b78e 206 } QoS2messages[MAX_QOS2_MESSAGES];
icraggs 31:a51dd239b78e 207
icraggs 31:a51dd239b78e 208 #endif
icraggs 28:8b2abe9bd814 209
sam_grove 0:fe461e4d7afe 210 };
sam_grove 0:fe461e4d7afe 211
icraggs 15:64a57183aa03 212 }
icraggs 15:64a57183aa03 213
icraggs 15:64a57183aa03 214
icraggs 23:05fc7de97d4a 215 template<class Network, class Timer, int a, int MAX_MESSAGE_HANDLERS>
icraggs 23:05fc7de97d4a 216 MQTT::Client<Network, Timer, a, MAX_MESSAGE_HANDLERS>::Client(Network& network, unsigned int command_timeout_ms) : ipstack(network), packetid()
icraggs 15:64a57183aa03 217 {
icraggs 23:05fc7de97d4a 218 ping_timer = Timer();
icraggs 23:05fc7de97d4a 219 ping_outstanding = 0;
icraggs 23:05fc7de97d4a 220 for (int i = 0; i < MAX_MESSAGE_HANDLERS; ++i)
icraggs 26:2658bb87c53d 221 messageHandlers[i].topicFilter = 0;
icraggs 26:2658bb87c53d 222 this->command_timeout_ms = command_timeout_ms;
icraggs 26:2658bb87c53d 223 isconnected = false;
icraggs 11:db15da110a37 224 }
icraggs 11:db15da110a37 225
icraggs 11:db15da110a37 226
icraggs 23:05fc7de97d4a 227 template<class Network, class Timer, int a, int b>
icraggs 23:05fc7de97d4a 228 int MQTT::Client<Network, Timer, a, b>::sendPacket(int length, Timer& timer)
icraggs 8:c46930bd6c82 229 {
icraggs 23:05fc7de97d4a 230 int rc = FAILURE,
icraggs 23:05fc7de97d4a 231 sent = 0;
icraggs 8:c46930bd6c82 232
icraggs 23:05fc7de97d4a 233 while (sent < length && !timer.expired())
icraggs 23:05fc7de97d4a 234 {
icraggs 23:05fc7de97d4a 235 rc = ipstack.write(&buf[sent], length, timer.left_ms());
icraggs 26:2658bb87c53d 236 if (rc < 0) // there was an error writing the data
icraggs 26:2658bb87c53d 237 break;
icraggs 26:2658bb87c53d 238 sent += rc;
icraggs 23:05fc7de97d4a 239 }
icraggs 20:cad3d54d7ecf 240 if (sent == length)
icraggs 23:05fc7de97d4a 241 {
icraggs 20:cad3d54d7ecf 242 ping_timer.countdown(this->keepAliveInterval); // record the fact that we have successfully sent the packet
icraggs 23:05fc7de97d4a 243 rc = SUCCESS;
icraggs 23:05fc7de97d4a 244 }
icraggs 23:05fc7de97d4a 245 else
icraggs 23:05fc7de97d4a 246 rc = FAILURE;
icraggs 23:05fc7de97d4a 247 return rc;
icraggs 8:c46930bd6c82 248 }
icraggs 8:c46930bd6c82 249
icraggs 8:c46930bd6c82 250
icraggs 26:2658bb87c53d 251 template<class Network, class Timer, int a, int b>
icraggs 26:2658bb87c53d 252 int MQTT::Client<Network, Timer, a, b>::decodePacket(int* value, int timeout)
icraggs 8:c46930bd6c82 253 {
icraggs 36:2f1ada427e56 254 unsigned char c;
icraggs 8:c46930bd6c82 255 int multiplier = 1;
icraggs 8:c46930bd6c82 256 int len = 0;
icraggs 20:cad3d54d7ecf 257 const int MAX_NO_OF_REMAINING_LENGTH_BYTES = 4;
icraggs 8:c46930bd6c82 258
icraggs 8:c46930bd6c82 259 *value = 0;
icraggs 8:c46930bd6c82 260 do
icraggs 8:c46930bd6c82 261 {
icraggs 8:c46930bd6c82 262 int rc = MQTTPACKET_READ_ERROR;
icraggs 8:c46930bd6c82 263
icraggs 8:c46930bd6c82 264 if (++len > MAX_NO_OF_REMAINING_LENGTH_BYTES)
icraggs 8:c46930bd6c82 265 {
icraggs 8:c46930bd6c82 266 rc = MQTTPACKET_READ_ERROR; /* bad data */
icraggs 8:c46930bd6c82 267 goto exit;
icraggs 8:c46930bd6c82 268 }
icraggs 23:05fc7de97d4a 269 rc = ipstack.read(&c, 1, timeout);
icraggs 8:c46930bd6c82 270 if (rc != 1)
icraggs 8:c46930bd6c82 271 goto exit;
icraggs 8:c46930bd6c82 272 *value += (c & 127) * multiplier;
icraggs 8:c46930bd6c82 273 multiplier *= 128;
icraggs 8:c46930bd6c82 274 } while ((c & 128) != 0);
icraggs 8:c46930bd6c82 275 exit:
icraggs 8:c46930bd6c82 276 return len;
icraggs 8:c46930bd6c82 277 }
icraggs 8:c46930bd6c82 278
icraggs 8:c46930bd6c82 279
icraggs 8:c46930bd6c82 280 /**
icraggs 8:c46930bd6c82 281 * If any read fails in this method, then we should disconnect from the network, as on reconnect
icraggs 8:c46930bd6c82 282 * the packets can be retried.
icraggs 8:c46930bd6c82 283 * @param timeout the max time to wait for the packet read to complete, in milliseconds
icraggs 8:c46930bd6c82 284 * @return the MQTT packet type, or -1 if none
icraggs 8:c46930bd6c82 285 */
icraggs 23:05fc7de97d4a 286 template<class Network, class Timer, int a, int b>
icraggs 23:05fc7de97d4a 287 int MQTT::Client<Network, Timer, a, b>::readPacket(Timer& timer)
icraggs 8:c46930bd6c82 288 {
icraggs 26:2658bb87c53d 289 int rc = FAILURE;
icraggs 8:c46930bd6c82 290 MQTTHeader header = {0};
icraggs 8:c46930bd6c82 291 int len = 0;
icraggs 8:c46930bd6c82 292 int rem_len = 0;
icraggs 8:c46930bd6c82 293
icraggs 8:c46930bd6c82 294 /* 1. read the header byte. This has the packet type in it */
icraggs 23:05fc7de97d4a 295 if (ipstack.read(readbuf, 1, timer.left_ms()) != 1)
icraggs 8:c46930bd6c82 296 goto exit;
icraggs 8:c46930bd6c82 297
icraggs 8:c46930bd6c82 298 len = 1;
icraggs 8:c46930bd6c82 299 /* 2. read the remaining length. This is variable in itself */
icraggs 20:cad3d54d7ecf 300 decodePacket(&rem_len, timer.left_ms());
icraggs 8:c46930bd6c82 301 len += MQTTPacket_encode(readbuf + 1, rem_len); /* put the original remaining length back into the buffer */
icraggs 8:c46930bd6c82 302
icraggs 8:c46930bd6c82 303 /* 3. read the rest of the buffer using a callback to supply the rest of the data */
icraggs 23:05fc7de97d4a 304 if (ipstack.read(readbuf + len, rem_len, timer.left_ms()) != rem_len)
icraggs 8:c46930bd6c82 305 goto exit;
icraggs 8:c46930bd6c82 306
icraggs 8:c46930bd6c82 307 header.byte = readbuf[0];
icraggs 8:c46930bd6c82 308 rc = header.bits.type;
icraggs 8:c46930bd6c82 309 exit:
icraggs 8:c46930bd6c82 310 return rc;
icraggs 3:dbff6b768d28 311 }
icraggs 3:dbff6b768d28 312
icraggs 8:c46930bd6c82 313
icraggs 26:2658bb87c53d 314 // assume topic filter and name is in correct format
icraggs 26:2658bb87c53d 315 // # can only be at end
icraggs 26:2658bb87c53d 316 // + and # can only be next to separator
icraggs 26:2658bb87c53d 317 template<class Network, class Timer, int a, int b>
icraggs 26:2658bb87c53d 318 bool MQTT::Client<Network, Timer, a, b>::isTopicMatched(char* topicFilter, MQTTString& topicName)
icraggs 26:2658bb87c53d 319 {
icraggs 26:2658bb87c53d 320 char* curf = topicFilter;
icraggs 26:2658bb87c53d 321 char* curn = topicName.lenstring.data;
icraggs 26:2658bb87c53d 322 char* curn_end = curn + topicName.lenstring.len;
icraggs 26:2658bb87c53d 323
icraggs 26:2658bb87c53d 324 while (*curf && curn < curn_end)
icraggs 26:2658bb87c53d 325 {
icraggs 26:2658bb87c53d 326 if (*curn == '/' && *curf != '/')
icraggs 26:2658bb87c53d 327 break;
icraggs 26:2658bb87c53d 328 if (*curf != '+' && *curf != '#' && *curf != *curn)
icraggs 26:2658bb87c53d 329 break;
icraggs 26:2658bb87c53d 330 if (*curf == '+')
icraggs 26:2658bb87c53d 331 { // skip until we meet the next separator, or end of string
icraggs 26:2658bb87c53d 332 char* nextpos = curn + 1;
icraggs 26:2658bb87c53d 333 while (nextpos < curn_end && *nextpos != '/')
icraggs 26:2658bb87c53d 334 nextpos = ++curn + 1;
icraggs 26:2658bb87c53d 335 }
icraggs 26:2658bb87c53d 336 else if (*curf == '#')
icraggs 26:2658bb87c53d 337 curn = curn_end - 1; // skip until end of string
icraggs 26:2658bb87c53d 338 curf++;
icraggs 26:2658bb87c53d 339 curn++;
icraggs 26:2658bb87c53d 340 };
icraggs 26:2658bb87c53d 341
icraggs 26:2658bb87c53d 342 return (curn == curn_end) && (*curf == '\0');
icraggs 26:2658bb87c53d 343 }
icraggs 26:2658bb87c53d 344
icraggs 26:2658bb87c53d 345
icraggs 26:2658bb87c53d 346
icraggs 23:05fc7de97d4a 347 template<class Network, class Timer, int a, int MAX_MESSAGE_HANDLERS>
icraggs 26:2658bb87c53d 348 int MQTT::Client<Network, Timer, a, MAX_MESSAGE_HANDLERS>::deliverMessage(MQTTString& topicName, Message& message)
icraggs 15:64a57183aa03 349 {
icraggs 26:2658bb87c53d 350 int rc = FAILURE;
icraggs 20:cad3d54d7ecf 351
icraggs 20:cad3d54d7ecf 352 // we have to find the right message handler - indexed by topic
icraggs 23:05fc7de97d4a 353 for (int i = 0; i < MAX_MESSAGE_HANDLERS; ++i)
icraggs 20:cad3d54d7ecf 354 {
icraggs 26:2658bb87c53d 355 if (messageHandlers[i].topicFilter != 0 && (MQTTPacket_equals(&topicName, (char*)messageHandlers[i].topicFilter) ||
icraggs 26:2658bb87c53d 356 isTopicMatched((char*)messageHandlers[i].topicFilter, topicName)))
icraggs 20:cad3d54d7ecf 357 {
icraggs 26:2658bb87c53d 358 if (messageHandlers[i].fp.attached())
icraggs 26:2658bb87c53d 359 {
icraggs 31:a51dd239b78e 360 MessageData md(topicName, message);
icraggs 31:a51dd239b78e 361 messageHandlers[i].fp(md);
icraggs 26:2658bb87c53d 362 rc = SUCCESS;
icraggs 26:2658bb87c53d 363 }
icraggs 20:cad3d54d7ecf 364 }
icraggs 20:cad3d54d7ecf 365 }
icraggs 26:2658bb87c53d 366
icraggs 26:2658bb87c53d 367 if (rc == FAILURE && defaultMessageHandler.attached())
icraggs 26:2658bb87c53d 368 {
icraggs 31:a51dd239b78e 369 MessageData md(topicName, message);
icraggs 31:a51dd239b78e 370 defaultMessageHandler(md);
icraggs 26:2658bb87c53d 371 rc = SUCCESS;
icraggs 26:2658bb87c53d 372 }
icraggs 20:cad3d54d7ecf 373
icraggs 20:cad3d54d7ecf 374 return rc;
icraggs 15:64a57183aa03 375 }
icraggs 15:64a57183aa03 376
icraggs 15:64a57183aa03 377
icraggs 20:cad3d54d7ecf 378
icraggs 23:05fc7de97d4a 379 template<class Network, class Timer, int a, int b>
icraggs 26:2658bb87c53d 380 int MQTT::Client<Network, Timer, a, b>::yield(int timeout_ms)
icraggs 20:cad3d54d7ecf 381 {
icraggs 26:2658bb87c53d 382 int rc = SUCCESS;
icraggs 20:cad3d54d7ecf 383 Timer timer = Timer();
icraggs 20:cad3d54d7ecf 384
icraggs 23:05fc7de97d4a 385 timer.countdown_ms(timeout_ms);
icraggs 20:cad3d54d7ecf 386 while (!timer.expired())
icraggs 26:2658bb87c53d 387 {
icraggs 26:2658bb87c53d 388 if (cycle(timer) == FAILURE)
icraggs 26:2658bb87c53d 389 {
icraggs 26:2658bb87c53d 390 rc = FAILURE;
icraggs 26:2658bb87c53d 391 break;
icraggs 26:2658bb87c53d 392 }
icraggs 26:2658bb87c53d 393 }
icraggs 26:2658bb87c53d 394
icraggs 26:2658bb87c53d 395 return rc;
icraggs 20:cad3d54d7ecf 396 }
icraggs 20:cad3d54d7ecf 397
icraggs 20:cad3d54d7ecf 398
icraggs 23:05fc7de97d4a 399 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 23:05fc7de97d4a 400 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::cycle(Timer& timer)
icraggs 8:c46930bd6c82 401 {
icraggs 8:c46930bd6c82 402 /* get one piece of work off the wire and one pass through */
icraggs 20:cad3d54d7ecf 403
Ian Craggs 12:cc7f2d62a393 404 // read the socket, see what work is due
icraggs 36:2f1ada427e56 405 unsigned short packet_type = readPacket(timer);
icraggs 15:64a57183aa03 406
icraggs 26:2658bb87c53d 407 int len = 0,
icraggs 26:2658bb87c53d 408 rc = SUCCESS;
icraggs 28:8b2abe9bd814 409
icraggs 8:c46930bd6c82 410 switch (packet_type)
icraggs 8:c46930bd6c82 411 {
icraggs 15:64a57183aa03 412 case CONNACK:
icraggs 8:c46930bd6c82 413 case PUBACK:
icraggs 8:c46930bd6c82 414 case SUBACK:
icraggs 8:c46930bd6c82 415 break;
icraggs 15:64a57183aa03 416 case PUBLISH:
icraggs 20:cad3d54d7ecf 417 MQTTString topicName;
icraggs 20:cad3d54d7ecf 418 Message msg;
icraggs 36:2f1ada427e56 419 if (MQTTDeserialize_publish((unsigned char*)&msg.dup, (int*)&msg.qos, (unsigned char*)&msg.retained, (unsigned short*)&msg.id, &topicName,
icraggs 36:2f1ada427e56 420 (unsigned char**)&msg.payload, (int*)&msg.payloadlen, readbuf, MAX_MQTT_PACKET_SIZE) != 1)
icraggs 26:2658bb87c53d 421 goto exit;
icraggs 31:a51dd239b78e 422 // if (msg.qos != QOS2)
icraggs 31:a51dd239b78e 423 deliverMessage(topicName, msg);
icraggs 31:a51dd239b78e 424 #if 0
icraggs 31:a51dd239b78e 425 else if (isQoS2msgidFree(msg.id))
icraggs 31:a51dd239b78e 426 {
icraggs 31:a51dd239b78e 427 UseQoS2msgid(msg.id);
icraggs 31:a51dd239b78e 428 deliverMessage(topicName, msg);
icraggs 31:a51dd239b78e 429 }
icraggs 31:a51dd239b78e 430 #endif
icraggs 20:cad3d54d7ecf 431 if (msg.qos != QOS0)
icraggs 20:cad3d54d7ecf 432 {
icraggs 20:cad3d54d7ecf 433 if (msg.qos == QOS1)
icraggs 23:05fc7de97d4a 434 len = MQTTSerialize_ack(buf, MAX_MQTT_PACKET_SIZE, PUBACK, 0, msg.id);
icraggs 20:cad3d54d7ecf 435 else if (msg.qos == QOS2)
icraggs 23:05fc7de97d4a 436 len = MQTTSerialize_ack(buf, MAX_MQTT_PACKET_SIZE, PUBREC, 0, msg.id);
icraggs 26:2658bb87c53d 437 if (len <= 0)
icraggs 26:2658bb87c53d 438 rc = FAILURE;
icraggs 26:2658bb87c53d 439 else
icraggs 26:2658bb87c53d 440 rc = sendPacket(len, timer);
icraggs 26:2658bb87c53d 441 if (rc == FAILURE)
icraggs 20:cad3d54d7ecf 442 goto exit; // there was a problem
icraggs 20:cad3d54d7ecf 443 }
Ian Craggs 12:cc7f2d62a393 444 break;
icraggs 15:64a57183aa03 445 case PUBREC:
icraggs 36:2f1ada427e56 446 unsigned short mypacketid;
icraggs 36:2f1ada427e56 447 unsigned char dup, type;
icraggs 26:2658bb87c53d 448 if (MQTTDeserialize_ack(&type, &dup, &mypacketid, readbuf, MAX_MQTT_PACKET_SIZE) != 1)
icraggs 26:2658bb87c53d 449 rc = FAILURE;
icraggs 26:2658bb87c53d 450 else if ((len = MQTTSerialize_ack(buf, MAX_MQTT_PACKET_SIZE, PUBREL, 0, mypacketid)) <= 0)
icraggs 26:2658bb87c53d 451 rc = FAILURE;
icraggs 26:2658bb87c53d 452 else if ((rc = sendPacket(len, timer)) != SUCCESS) // send the PUBREL packet
icraggs 26:2658bb87c53d 453 rc = FAILURE; // there was a problem
icraggs 26:2658bb87c53d 454 if (rc == FAILURE)
icraggs 20:cad3d54d7ecf 455 goto exit; // there was a problem
icraggs 8:c46930bd6c82 456 break;
icraggs 8:c46930bd6c82 457 case PUBCOMP:
icraggs 8:c46930bd6c82 458 break;
icraggs 15:64a57183aa03 459 case PINGRESP:
icraggs 20:cad3d54d7ecf 460 ping_outstanding = false;
icraggs 8:c46930bd6c82 461 break;
icraggs 15:64a57183aa03 462 }
icraggs 20:cad3d54d7ecf 463 keepalive();
Ian Craggs 12:cc7f2d62a393 464 exit:
icraggs 26:2658bb87c53d 465 if (rc == SUCCESS)
icraggs 26:2658bb87c53d 466 rc = packet_type;
icraggs 26:2658bb87c53d 467 return rc;
icraggs 15:64a57183aa03 468 }
icraggs 15:64a57183aa03 469
icraggs 15:64a57183aa03 470
icraggs 23:05fc7de97d4a 471 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 23:05fc7de97d4a 472 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::keepalive()
icraggs 15:64a57183aa03 473 {
icraggs 26:2658bb87c53d 474 int rc = FAILURE;
icraggs 15:64a57183aa03 475
icraggs 20:cad3d54d7ecf 476 if (keepAliveInterval == 0)
icraggs 26:2658bb87c53d 477 {
icraggs 26:2658bb87c53d 478 rc = SUCCESS;
icraggs 20:cad3d54d7ecf 479 goto exit;
icraggs 26:2658bb87c53d 480 }
icraggs 15:64a57183aa03 481
icraggs 20:cad3d54d7ecf 482 if (ping_timer.expired())
icraggs 20:cad3d54d7ecf 483 {
icraggs 26:2658bb87c53d 484 if (!ping_outstanding)
icraggs 20:cad3d54d7ecf 485 {
icraggs 20:cad3d54d7ecf 486 Timer timer = Timer(1000);
icraggs 23:05fc7de97d4a 487 int len = MQTTSerialize_pingreq(buf, MAX_MQTT_PACKET_SIZE);
icraggs 26:2658bb87c53d 488 if (len > 0 && (rc = sendPacket(len, timer)) == SUCCESS) // send the ping packet
icraggs 20:cad3d54d7ecf 489 ping_outstanding = true;
icraggs 20:cad3d54d7ecf 490 }
icraggs 20:cad3d54d7ecf 491 }
icraggs 15:64a57183aa03 492
icraggs 15:64a57183aa03 493 exit:
icraggs 20:cad3d54d7ecf 494 return rc;
icraggs 8:c46930bd6c82 495 }
icraggs 8:c46930bd6c82 496
icraggs 8:c46930bd6c82 497
icraggs 16:91c2f9a144d4 498 // only used in single-threaded mode where one command at a time is in process
icraggs 23:05fc7de97d4a 499 template<class Network, class Timer, int a, int b>
icraggs 23:05fc7de97d4a 500 int MQTT::Client<Network, Timer, a, b>::waitfor(int packet_type, Timer& timer)
icraggs 15:64a57183aa03 501 {
icraggs 26:2658bb87c53d 502 int rc = FAILURE;
icraggs 20:cad3d54d7ecf 503
icraggs 20:cad3d54d7ecf 504 do
icraggs 16:91c2f9a144d4 505 {
icraggs 20:cad3d54d7ecf 506 if (timer.expired())
icraggs 20:cad3d54d7ecf 507 break; // we timed out
icraggs 20:cad3d54d7ecf 508 }
icraggs 20:cad3d54d7ecf 509 while ((rc = cycle(timer)) != packet_type);
icraggs 20:cad3d54d7ecf 510
icraggs 20:cad3d54d7ecf 511 return rc;
icraggs 16:91c2f9a144d4 512 }
icraggs 16:91c2f9a144d4 513
icraggs 16:91c2f9a144d4 514
icraggs 23:05fc7de97d4a 515 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 23:05fc7de97d4a 516 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::connect(MQTTPacket_connectData* options)
icraggs 16:91c2f9a144d4 517 {
icraggs 23:05fc7de97d4a 518 Timer connect_timer = Timer(command_timeout_ms);
icraggs 26:2658bb87c53d 519 int rc = FAILURE;
icraggs 31:a51dd239b78e 520 MQTTPacket_connectData default_options = MQTTPacket_connectData_initializer;
icraggs 31:a51dd239b78e 521 int len = 0;
icraggs 31:a51dd239b78e 522
icraggs 31:a51dd239b78e 523 if (isconnected) // don't send connect packet again if we are already connected
icraggs 31:a51dd239b78e 524 goto exit;
icraggs 8:c46930bd6c82 525
icraggs 8:c46930bd6c82 526 if (options == 0)
Ian Craggs 12:cc7f2d62a393 527 options = &default_options; // set default options if none were supplied
icraggs 8:c46930bd6c82 528
icraggs 15:64a57183aa03 529 this->keepAliveInterval = options->keepAliveInterval;
icraggs 20:cad3d54d7ecf 530 ping_timer.countdown(this->keepAliveInterval);
icraggs 31:a51dd239b78e 531 if ((len = MQTTSerialize_connect(buf, MAX_MQTT_PACKET_SIZE, options)) <= 0)
icraggs 26:2658bb87c53d 532 goto exit;
icraggs 26:2658bb87c53d 533 if ((rc = sendPacket(len, connect_timer)) != SUCCESS) // send the connect packet
icraggs 20:cad3d54d7ecf 534 goto exit; // there was a problem
icraggs 8:c46930bd6c82 535
icraggs 20:cad3d54d7ecf 536 // this will be a blocking call, wait for the connack
icraggs 20:cad3d54d7ecf 537 if (waitfor(CONNACK, connect_timer) == CONNACK)
icraggs 15:64a57183aa03 538 {
icraggs 36:2f1ada427e56 539 unsigned char connack_rc = 255;
icraggs 37:e3d64f9b986c 540 bool sessionPresent = false;
icraggs 37:e3d64f9b986c 541 if (MQTTDeserialize_connack((unsigned char*)&sessionPresent, &connack_rc, readbuf, MAX_MQTT_PACKET_SIZE) == 1)
icraggs 20:cad3d54d7ecf 542 rc = connack_rc;
icraggs 26:2658bb87c53d 543 else
icraggs 26:2658bb87c53d 544 rc = FAILURE;
icraggs 8:c46930bd6c82 545 }
icraggs 26:2658bb87c53d 546 else
icraggs 26:2658bb87c53d 547 rc = FAILURE;
icraggs 15:64a57183aa03 548
icraggs 15:64a57183aa03 549 exit:
icraggs 26:2658bb87c53d 550 if (rc == SUCCESS)
icraggs 26:2658bb87c53d 551 isconnected = true;
icraggs 8:c46930bd6c82 552 return rc;
icraggs 8:c46930bd6c82 553 }
icraggs 8:c46930bd6c82 554
icraggs 8:c46930bd6c82 555
icraggs 23:05fc7de97d4a 556 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int MAX_MESSAGE_HANDLERS>
icraggs 23:05fc7de97d4a 557 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, MAX_MESSAGE_HANDLERS>::subscribe(const char* topicFilter, enum QoS qos, messageHandler messageHandler)
icraggs 20:cad3d54d7ecf 558 {
icraggs 31:a51dd239b78e 559 int rc = FAILURE;
icraggs 23:05fc7de97d4a 560 Timer timer = Timer(command_timeout_ms);
icraggs 26:2658bb87c53d 561 int len = 0;
icraggs 31:a51dd239b78e 562 MQTTString topic = {(char*)topicFilter, 0, 0};
icraggs 20:cad3d54d7ecf 563
icraggs 26:2658bb87c53d 564 if (!isconnected)
icraggs 20:cad3d54d7ecf 565 goto exit;
icraggs 26:2658bb87c53d 566
icraggs 26:2658bb87c53d 567 len = MQTTSerialize_subscribe(buf, MAX_MQTT_PACKET_SIZE, 0, packetid.getNext(), 1, &topic, (int*)&qos);
icraggs 26:2658bb87c53d 568 if (len <= 0)
icraggs 26:2658bb87c53d 569 goto exit;
icraggs 23:05fc7de97d4a 570 if ((rc = sendPacket(len, timer)) != SUCCESS) // send the subscribe packet
icraggs 26:2658bb87c53d 571 goto exit; // there was a problem
icraggs 8:c46930bd6c82 572
icraggs 20:cad3d54d7ecf 573 if (waitfor(SUBACK, timer) == SUBACK) // wait for suback
icraggs 8:c46930bd6c82 574 {
icraggs 36:2f1ada427e56 575 int count = 0, grantedQoS = -1;
icraggs 36:2f1ada427e56 576 unsigned short mypacketid;
icraggs 23:05fc7de97d4a 577 if (MQTTDeserialize_suback(&mypacketid, 1, &count, &grantedQoS, readbuf, MAX_MQTT_PACKET_SIZE) == 1)
icraggs 20:cad3d54d7ecf 578 rc = grantedQoS; // 0, 1, 2 or 0x80
icraggs 20:cad3d54d7ecf 579 if (rc != 0x80)
icraggs 8:c46930bd6c82 580 {
icraggs 23:05fc7de97d4a 581 for (int i = 0; i < MAX_MESSAGE_HANDLERS; ++i)
icraggs 16:91c2f9a144d4 582 {
icraggs 26:2658bb87c53d 583 if (messageHandlers[i].topicFilter == 0)
icraggs 20:cad3d54d7ecf 584 {
icraggs 26:2658bb87c53d 585 messageHandlers[i].topicFilter = topicFilter;
icraggs 20:cad3d54d7ecf 586 messageHandlers[i].fp.attach(messageHandler);
icraggs 20:cad3d54d7ecf 587 rc = 0;
icraggs 20:cad3d54d7ecf 588 break;
icraggs 20:cad3d54d7ecf 589 }
icraggs 16:91c2f9a144d4 590 }
icraggs 8:c46930bd6c82 591 }
icraggs 8:c46930bd6c82 592 }
icraggs 26:2658bb87c53d 593 else
icraggs 26:2658bb87c53d 594 rc = FAILURE;
icraggs 26:2658bb87c53d 595
icraggs 15:64a57183aa03 596 exit:
Ian Craggs 12:cc7f2d62a393 597 return rc;
icraggs 15:64a57183aa03 598 }
icraggs 15:64a57183aa03 599
icraggs 15:64a57183aa03 600
icraggs 23:05fc7de97d4a 601 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int MAX_MESSAGE_HANDLERS>
icraggs 23:05fc7de97d4a 602 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, MAX_MESSAGE_HANDLERS>::unsubscribe(const char* topicFilter)
icraggs 20:cad3d54d7ecf 603 {
icraggs 26:2658bb87c53d 604 int rc = FAILURE;
icraggs 31:a51dd239b78e 605 Timer timer = Timer(command_timeout_ms);
Ian Craggs 12:cc7f2d62a393 606 MQTTString topic = {(char*)topicFilter, 0, 0};
icraggs 31:a51dd239b78e 607 int len = 0;
icraggs 8:c46930bd6c82 608
icraggs 31:a51dd239b78e 609 if (!isconnected)
icraggs 31:a51dd239b78e 610 goto exit;
icraggs 31:a51dd239b78e 611
icraggs 31:a51dd239b78e 612 if ((len = MQTTSerialize_unsubscribe(buf, MAX_MQTT_PACKET_SIZE, 0, packetid.getNext(), 1, &topic)) <= 0)
icraggs 20:cad3d54d7ecf 613 goto exit;
icraggs 23:05fc7de97d4a 614 if ((rc = sendPacket(len, timer)) != SUCCESS) // send the subscribe packet
icraggs 20:cad3d54d7ecf 615 goto exit; // there was a problem
Ian Craggs 12:cc7f2d62a393 616
icraggs 20:cad3d54d7ecf 617 if (waitfor(UNSUBACK, timer) == UNSUBACK)
Ian Craggs 12:cc7f2d62a393 618 {
icraggs 36:2f1ada427e56 619 unsigned short mypacketid; // should be the same as the packetid above
icraggs 23:05fc7de97d4a 620 if (MQTTDeserialize_unsuback(&mypacketid, readbuf, MAX_MQTT_PACKET_SIZE) == 1)
icraggs 20:cad3d54d7ecf 621 rc = 0;
Ian Craggs 12:cc7f2d62a393 622 }
icraggs 26:2658bb87c53d 623 else
icraggs 26:2658bb87c53d 624 rc = FAILURE;
icraggs 15:64a57183aa03 625
icraggs 15:64a57183aa03 626 exit:
Ian Craggs 12:cc7f2d62a393 627 return rc;
icraggs 15:64a57183aa03 628 }
icraggs 15:64a57183aa03 629
icraggs 15:64a57183aa03 630
icraggs 15:64a57183aa03 631
icraggs 23:05fc7de97d4a 632 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 23:05fc7de97d4a 633 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::publish(const char* topicName, Message* message)
icraggs 20:cad3d54d7ecf 634 {
icraggs 26:2658bb87c53d 635 int rc = FAILURE;
icraggs 31:a51dd239b78e 636 Timer timer = Timer(command_timeout_ms);
icraggs 31:a51dd239b78e 637 MQTTString topicString = {(char*)topicName, 0, 0};
icraggs 31:a51dd239b78e 638 int len = 0;
icraggs 20:cad3d54d7ecf 639
icraggs 31:a51dd239b78e 640 if (!isconnected)
icraggs 31:a51dd239b78e 641 goto exit;
icraggs 15:64a57183aa03 642
icraggs 20:cad3d54d7ecf 643 if (message->qos == QOS1 || message->qos == QOS2)
icraggs 20:cad3d54d7ecf 644 message->id = packetid.getNext();
icraggs 15:64a57183aa03 645
icraggs 31:a51dd239b78e 646 len = MQTTSerialize_publish(buf, MAX_MQTT_PACKET_SIZE, 0, message->qos, message->retained, message->id,
icraggs 36:2f1ada427e56 647 topicString, (unsigned char*)message->payload, message->payloadlen);
icraggs 26:2658bb87c53d 648 if (len <= 0)
icraggs 26:2658bb87c53d 649 goto exit;
icraggs 26:2658bb87c53d 650 if ((rc = sendPacket(len, timer)) != SUCCESS) // send the subscribe packet
icraggs 20:cad3d54d7ecf 651 goto exit; // there was a problem
Ian Craggs 12:cc7f2d62a393 652
icraggs 20:cad3d54d7ecf 653 if (message->qos == QOS1)
Ian Craggs 12:cc7f2d62a393 654 {
icraggs 20:cad3d54d7ecf 655 if (waitfor(PUBACK, timer) == PUBACK)
icraggs 20:cad3d54d7ecf 656 {
icraggs 36:2f1ada427e56 657 unsigned short mypacketid;
icraggs 36:2f1ada427e56 658 unsigned char dup, type;
icraggs 26:2658bb87c53d 659 if (MQTTDeserialize_ack(&type, &dup, &mypacketid, readbuf, MAX_MQTT_PACKET_SIZE) != 1)
icraggs 26:2658bb87c53d 660 rc = FAILURE;
icraggs 20:cad3d54d7ecf 661 }
icraggs 26:2658bb87c53d 662 else
icraggs 26:2658bb87c53d 663 rc = FAILURE;
Ian Craggs 12:cc7f2d62a393 664 }
icraggs 20:cad3d54d7ecf 665 else if (message->qos == QOS2)
Ian Craggs 12:cc7f2d62a393 666 {
icraggs 20:cad3d54d7ecf 667 if (waitfor(PUBCOMP, timer) == PUBCOMP)
icraggs 20:cad3d54d7ecf 668 {
icraggs 36:2f1ada427e56 669 unsigned short mypacketid;
icraggs 36:2f1ada427e56 670 unsigned char dup, type;
icraggs 26:2658bb87c53d 671 if (MQTTDeserialize_ack(&type, &dup, &mypacketid, readbuf, MAX_MQTT_PACKET_SIZE) != 1)
icraggs 26:2658bb87c53d 672 rc = FAILURE;
icraggs 20:cad3d54d7ecf 673 }
icraggs 26:2658bb87c53d 674 else
icraggs 26:2658bb87c53d 675 rc = FAILURE;
Ian Craggs 12:cc7f2d62a393 676 }
icraggs 15:64a57183aa03 677
icraggs 15:64a57183aa03 678 exit:
icraggs 8:c46930bd6c82 679 return rc;
icraggs 8:c46930bd6c82 680 }
icraggs 8:c46930bd6c82 681
icraggs 8:c46930bd6c82 682
icraggs 23:05fc7de97d4a 683 template<class Network, class Timer, int MAX_MQTT_PACKET_SIZE, int b>
icraggs 23:05fc7de97d4a 684 int MQTT::Client<Network, Timer, MAX_MQTT_PACKET_SIZE, b>::disconnect()
icraggs 20:cad3d54d7ecf 685 {
icraggs 26:2658bb87c53d 686 int rc = FAILURE;
icraggs 23:05fc7de97d4a 687 Timer timer = Timer(command_timeout_ms); // we might wait for incomplete incoming publishes to complete
icraggs 23:05fc7de97d4a 688 int len = MQTTSerialize_disconnect(buf, MAX_MQTT_PACKET_SIZE);
icraggs 26:2658bb87c53d 689 if (len > 0)
icraggs 26:2658bb87c53d 690 rc = sendPacket(len, timer); // send the disconnect packet
icraggs 31:a51dd239b78e 691
icraggs 31:a51dd239b78e 692 isconnected = false;
icraggs 23:05fc7de97d4a 693 return rc;
icraggs 20:cad3d54d7ecf 694 }
icraggs 20:cad3d54d7ecf 695
icraggs 20:cad3d54d7ecf 696
icraggs 20:cad3d54d7ecf 697 #endif