--- libaitmqtt/inc/aitmqtt.h 2013/05/30 09:18:33 1.3 +++ libaitmqtt/inc/aitmqtt.h 2022/09/12 22:09:29 1.3.4.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitmqtt.h,v 1.3 2013/05/30 09:18:33 misho Exp $ +* $Id: aitmqtt.h,v 1.3.4.3 2022/09/12 22:09:29 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2022 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -49,7 +49,8 @@ SUCH DAMAGE. #define MAX_CONNID 24 #define MAX_CRED 13 -#define MQTTMSG_MAX 65529 +#define MQTTMSG_MAX 65535 +#define MQTTMSG_BIN_MAX 65535 #define MQTT_DATA_MAX 268435455 #define MQTT_PROTO_VER 3 @@ -69,27 +70,29 @@ struct mqtthdr { unsigned char val; } mqtt_msg; unsigned char mqtt_len[1]; /* may be grow to 4 bytes */ -} __packed; -#define MQTTHDR_MSGINIT(x) (assert((x)), (x)->mqtt_msg.val ^= (x)->mqtt_msg.val) +} __attribute__((packed)); +#define MQTTHDR_MSGINIT(x) (assert((x)), (x)->mqtt_msg.val ^= (x)->mqtt_msg.val, *mqtt_len = 0) #define MQTTHDR_DATA_SIZEOF(x) (assert((x)), mqtt_decodeLen((x)->mqtt_len, NULL)) #define MQTT_TYPE_UNKNOWN 0 /* reserved */ -#define MQTT_TYPE_CONNECT 1 /* client request to connect to server */ -#define MQTT_TYPE_CONNACK 2 /* connect acknowledgment */ +#define MQTT_TYPE_CONNECT 1 /* client request to connect to server (CLI) */ +#define MQTT_TYPE_CONNACK 2 /* connect acknowledgment (SRV) */ #define MQTT_TYPE_PUBLISH 3 /* publish message */ #define MQTT_TYPE_PUBACK 4 /* publish acknowledgment */ #define MQTT_TYPE_PUBREC 5 /* publish received (assured delivery part 1) */ #define MQTT_TYPE_PUBREL 6 /* publish release (assured delivery part 2) */ #define MQTT_TYPE_PUBCOMP 7 /* publish complete (assured delivery part 3) */ -#define MQTT_TYPE_SUBSCRIBE 8 /* client subscribe request */ -#define MQTT_TYPE_SUBACK 9 /* subscribe acknowledgment */ -#define MQTT_TYPE_UNSUBSCRIBE 10 /* client unsubscribe request */ -#define MQTT_TYPE_UNSUBACK 11 /* unsubscribe acknowledgment */ -#define MQTT_TYPE_PINGREQ 12 /* PING request */ -#define MQTT_TYPE_PINGRESP 13 /* PING response */ +#define MQTT_TYPE_SUBSCRIBE 8 /* client subscribe request (CLI) */ +#define MQTT_TYPE_SUBACK 9 /* subscribe acknowledgment (SRV) */ +#define MQTT_TYPE_UNSUBSCRIBE 10 /* client unsubscribe request (CLI) */ +#define MQTT_TYPE_UNSUBACK 11 /* unsubscribe acknowledgment (SRV) */ +#define MQTT_TYPE_PINGREQ 12 /* PING request (CLI) */ +#define MQTT_TYPE_PINGRESP 13 /* PING response (SRV) */ #define MQTT_TYPE_DISCONNECT 14 /* client is disconnecting */ -#define MQTT_TYPE_MAX 15 /* reserved */ +#define MQTT_TYPE_AUTH 15 /* authentication exchange */ +#define MQTT_TYPE_MAX 15 + #define MQTT_FLAG_DUP 1 /* This flag is set when the client or server attempts to re-deliver a PUBLISH, PUBREL, SUBSCRIBE or UNSUBSCRIBE message. This applies to messages where the value of QoS is greater than @@ -170,7 +173,7 @@ typedef struct { typedef struct { mqtt_len_t var_sb; unsigned char var_data[0]; -} __packed mqtthdr_var_t; +} __attribute__((packed)) mqtthdr_var_t; #define MQTTHDR_VAR_SIZEOF(x) (assert((x)), sizeof(mqtt_len_t) + ntohs((x)->var_sb.val)) typedef unsigned char mqtthdr_protover_t; @@ -186,12 +189,12 @@ typedef union { username:1; }; unsigned char flags; -} __packed mqtthdr_connflgs_t; +} __attribute__((packed)) mqtthdr_connflgs_t; typedef struct { unsigned char reserved; unsigned char retcode; -} __packed mqtthdr_connack_t; +} __attribute__((packed)) mqtthdr_connack_t; // -------------------------------------------------------