MQTTPacket fixes
Fork of MQTTPacket by
MQTTUnsubscribeClient.c@7:1b8fb13fc6ef, 2014-04-28 (annotated)
- Committer:
- icraggs
- Date:
- Mon Apr 28 16:07:08 2014 +0000
- Revision:
- 7:1b8fb13fc6ef
- Parent:
- 0:7734401cc1b4
- Child:
- 12:cd99ac9cb25a
Fix unsubscribe packet
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
icraggs | 0:7734401cc1b4 | 1 | /******************************************************************************* |
icraggs | 0:7734401cc1b4 | 2 | * Copyright (c) 2014 IBM Corp. |
icraggs | 0:7734401cc1b4 | 3 | * |
icraggs | 0:7734401cc1b4 | 4 | * All rights reserved. This program and the accompanying materials |
icraggs | 0:7734401cc1b4 | 5 | * are made available under the terms of the Eclipse Public License v1.0 |
icraggs | 0:7734401cc1b4 | 6 | * and Eclipse Distribution License v1.0 which accompany this distribution. |
icraggs | 0:7734401cc1b4 | 7 | * |
icraggs | 0:7734401cc1b4 | 8 | * The Eclipse Public License is available at |
icraggs | 0:7734401cc1b4 | 9 | * http://www.eclipse.org/legal/epl-v10.html |
icraggs | 0:7734401cc1b4 | 10 | * and the Eclipse Distribution License is available at |
icraggs | 0:7734401cc1b4 | 11 | * http://www.eclipse.org/org/documents/edl-v10.php. |
icraggs | 0:7734401cc1b4 | 12 | * |
icraggs | 0:7734401cc1b4 | 13 | * Contributors: |
icraggs | 0:7734401cc1b4 | 14 | * Ian Craggs - initial API and implementation and/or initial documentation |
icraggs | 0:7734401cc1b4 | 15 | *******************************************************************************/ |
icraggs | 0:7734401cc1b4 | 16 | |
icraggs | 0:7734401cc1b4 | 17 | #include "MQTTPacket.h" |
icraggs | 0:7734401cc1b4 | 18 | #include "StackTrace.h" |
icraggs | 0:7734401cc1b4 | 19 | |
icraggs | 0:7734401cc1b4 | 20 | #include <string.h> |
icraggs | 0:7734401cc1b4 | 21 | |
icraggs | 0:7734401cc1b4 | 22 | /** |
icraggs | 0:7734401cc1b4 | 23 | * Determines the length of the MQTT unsubscribe packet that would be produced using the supplied parameters |
icraggs | 0:7734401cc1b4 | 24 | * @param count the number of topic filter strings in topicFilters |
icraggs | 0:7734401cc1b4 | 25 | * @param topicFilters the array of topic filter strings to be used in the publish |
icraggs | 0:7734401cc1b4 | 26 | * @return the length of buffer needed to contain the serialized version of the packet |
icraggs | 0:7734401cc1b4 | 27 | */ |
icraggs | 0:7734401cc1b4 | 28 | int MQTTSerialize_unsubscribeLength(int count, MQTTString topicFilters[]) |
icraggs | 0:7734401cc1b4 | 29 | { |
icraggs | 0:7734401cc1b4 | 30 | int i; |
icraggs | 0:7734401cc1b4 | 31 | int len = 2; /* packetid */ |
icraggs | 0:7734401cc1b4 | 32 | |
icraggs | 0:7734401cc1b4 | 33 | for (i = 0; i < count; ++i) |
icraggs | 0:7734401cc1b4 | 34 | len += 2 + MQTTstrlen(topicFilters[i]); /* length + topic*/ |
icraggs | 0:7734401cc1b4 | 35 | return len; |
icraggs | 0:7734401cc1b4 | 36 | } |
icraggs | 0:7734401cc1b4 | 37 | |
icraggs | 0:7734401cc1b4 | 38 | |
icraggs | 0:7734401cc1b4 | 39 | /** |
icraggs | 0:7734401cc1b4 | 40 | * Serializes the supplied unsubscribe data into the supplied buffer, ready for sending |
icraggs | 0:7734401cc1b4 | 41 | * @param buf the raw buffer data, of the correct length determined by the remaining length field |
icraggs | 0:7734401cc1b4 | 42 | * @param buflen the length in bytes of the data in the supplied buffer |
icraggs | 0:7734401cc1b4 | 43 | * @param dup integer - the MQTT dup flag |
icraggs | 0:7734401cc1b4 | 44 | * @param packetid integer - the MQTT packet identifier |
icraggs | 0:7734401cc1b4 | 45 | * @param count - number of members in the topicFilters array |
icraggs | 0:7734401cc1b4 | 46 | * @param topicFilters - array of topic filter names |
icraggs | 0:7734401cc1b4 | 47 | * @return the length of the serialized data. <= 0 indicates error |
icraggs | 0:7734401cc1b4 | 48 | */ |
icraggs | 0:7734401cc1b4 | 49 | int MQTTSerialize_unsubscribe(char* buf, int buflen, int dup, int packetid, int count, MQTTString topicFilters[]) |
icraggs | 0:7734401cc1b4 | 50 | { |
icraggs | 0:7734401cc1b4 | 51 | char *ptr = buf; |
icraggs | 0:7734401cc1b4 | 52 | MQTTHeader header; |
icraggs | 0:7734401cc1b4 | 53 | int rem_len = 0; |
icraggs | 0:7734401cc1b4 | 54 | int rc = -1; |
icraggs | 0:7734401cc1b4 | 55 | int i = 0; |
icraggs | 0:7734401cc1b4 | 56 | |
icraggs | 0:7734401cc1b4 | 57 | FUNC_ENTRY; |
icraggs | 0:7734401cc1b4 | 58 | if (MQTTPacket_len(rem_len = MQTTSerialize_unsubscribeLength(count, topicFilters)) > buflen) |
icraggs | 0:7734401cc1b4 | 59 | { |
icraggs | 0:7734401cc1b4 | 60 | rc = MQTTPACKET_BUFFER_TOO_SHORT; |
icraggs | 0:7734401cc1b4 | 61 | goto exit; |
icraggs | 0:7734401cc1b4 | 62 | } |
icraggs | 0:7734401cc1b4 | 63 | |
icraggs | 0:7734401cc1b4 | 64 | header.byte = 0; |
icraggs | 7:1b8fb13fc6ef | 65 | header.bits.type = UNSUBSCRIBE; |
icraggs | 0:7734401cc1b4 | 66 | header.bits.dup = dup; |
icraggs | 0:7734401cc1b4 | 67 | header.bits.qos = 1; |
icraggs | 0:7734401cc1b4 | 68 | writeChar(&ptr, header.byte); /* write header */ |
icraggs | 0:7734401cc1b4 | 69 | |
icraggs | 0:7734401cc1b4 | 70 | ptr += MQTTPacket_encode(ptr, rem_len); /* write remaining length */; |
icraggs | 0:7734401cc1b4 | 71 | |
icraggs | 0:7734401cc1b4 | 72 | writeInt(&ptr, packetid); |
icraggs | 0:7734401cc1b4 | 73 | |
icraggs | 0:7734401cc1b4 | 74 | for (i = 0; i < count; ++i) |
icraggs | 0:7734401cc1b4 | 75 | writeMQTTString(&ptr, topicFilters[i]); |
icraggs | 0:7734401cc1b4 | 76 | |
icraggs | 0:7734401cc1b4 | 77 | rc = ptr - buf; |
icraggs | 0:7734401cc1b4 | 78 | exit: |
icraggs | 0:7734401cc1b4 | 79 | FUNC_EXIT_RC(rc); |
icraggs | 0:7734401cc1b4 | 80 | return rc; |
icraggs | 0:7734401cc1b4 | 81 | } |
icraggs | 0:7734401cc1b4 | 82 | |
icraggs | 0:7734401cc1b4 | 83 | |
icraggs | 0:7734401cc1b4 | 84 | /** |
icraggs | 0:7734401cc1b4 | 85 | * Deserializes the supplied (wire) buffer into unsuback data |
icraggs | 0:7734401cc1b4 | 86 | * @param packetid returned integer - the MQTT packet identifier |
icraggs | 0:7734401cc1b4 | 87 | * @param buf the raw buffer data, of the correct length determined by the remaining length field |
icraggs | 0:7734401cc1b4 | 88 | * @param buflen the length in bytes of the data in the supplied buffer |
icraggs | 0:7734401cc1b4 | 89 | * @return error code. 1 is success, 0 is failure |
icraggs | 0:7734401cc1b4 | 90 | */ |
icraggs | 0:7734401cc1b4 | 91 | int MQTTDeserialize_unsuback(int* packetid, char* buf, int buflen) |
icraggs | 0:7734401cc1b4 | 92 | { |
icraggs | 0:7734401cc1b4 | 93 | int type = 0; |
icraggs | 0:7734401cc1b4 | 94 | int dup = 0; |
icraggs | 0:7734401cc1b4 | 95 | int rc = 0; |
icraggs | 0:7734401cc1b4 | 96 | |
icraggs | 0:7734401cc1b4 | 97 | FUNC_ENTRY; |
icraggs | 0:7734401cc1b4 | 98 | rc = MQTTDeserialize_ack(&type, &dup, packetid, buf, buflen); |
icraggs | 0:7734401cc1b4 | 99 | if (type == UNSUBACK) |
icraggs | 0:7734401cc1b4 | 100 | rc = 1; |
icraggs | 0:7734401cc1b4 | 101 | FUNC_EXIT_RC(rc); |
icraggs | 0:7734401cc1b4 | 102 | return rc; |
icraggs | 0:7734401cc1b4 | 103 | } |
icraggs | 0:7734401cc1b4 | 104 | |
icraggs | 0:7734401cc1b4 | 105 |