add missing consts

.gitignore

@@ -1,7 +1,8 @@
+*.swp
 .cproject
 .project
 build/
 firmware/
 .settings/
 .DS_Store
-include/user_config.local.h
+include/user_config.local.h

mqtt/CMakeLists.txt

@@ -0,0 +1 @@
+ADD_LIBRARY("mqtt" mqtt.c mqtt_msg.c proto.c queue.c ringbuf.c utils.c)

mqtt/include/mqtt.h

@@ -33,7 +33,9 @@
 #include "mqtt_msg.h"
 #include "user_interface.h"
 
-#include "queue.h"
+#include "mqtt_queue.h"
+
+
 typedef struct mqtt_event_data_t
 {
   uint8_t type;
@@ -130,17 +132,17 @@ typedef struct  {
 #define MQTT_EVENT_TYPE_EXITED      7
 #define MQTT_EVENT_TYPE_PUBLISH_CONTINUATION 8
 
-void ICACHE_FLASH_ATTR MQTT_InitConnection(MQTT_Client *mqttClient, uint8_t* host, uint32_t port, uint8_t security);
-BOOL ICACHE_FLASH_ATTR MQTT_InitClient(MQTT_Client *mqttClient, uint8_t* client_id, uint8_t* client_user, uint8_t* client_pass, uint32_t keepAliveTime, uint8_t cleanSession);
+void ICACHE_FLASH_ATTR MQTT_InitConnection(MQTT_Client *mqttClient, const uint8_t* host, uint32_t port, uint8_t security);
+BOOL ICACHE_FLASH_ATTR MQTT_InitClient(MQTT_Client *mqttClient, const uint8_t* client_id, const uint8_t* client_user, const uint8_t* client_pass, uint32_t keepAliveTime, uint8_t cleanSession);
 void ICACHE_FLASH_ATTR MQTT_DeleteClient(MQTT_Client *mqttClient);
-void ICACHE_FLASH_ATTR MQTT_InitLWT(MQTT_Client *mqttClient, uint8_t* will_topic, uint8_t* will_msg, uint8_t will_qos, uint8_t will_retain);
+void ICACHE_FLASH_ATTR MQTT_InitLWT(MQTT_Client *mqttClient, const uint8_t* will_topic, const uint8_t* will_msg, uint8_t will_qos, uint8_t will_retain);
 void ICACHE_FLASH_ATTR MQTT_OnConnected(MQTT_Client *mqttClient, MqttCallback connectedCb);
 void ICACHE_FLASH_ATTR MQTT_OnDisconnected(MQTT_Client *mqttClient, MqttCallback disconnectedCb);
 void ICACHE_FLASH_ATTR MQTT_OnPublished(MQTT_Client *mqttClient, MqttCallback publishedCb);
 void ICACHE_FLASH_ATTR MQTT_OnTimeout(MQTT_Client *mqttClient, MqttCallback timeoutCb);
 void ICACHE_FLASH_ATTR MQTT_OnData(MQTT_Client *mqttClient, MqttDataCallback dataCb);
-BOOL ICACHE_FLASH_ATTR MQTT_Subscribe(MQTT_Client *client, char* topic, uint8_t qos);
-BOOL ICACHE_FLASH_ATTR MQTT_UnSubscribe(MQTT_Client *client, char* topic);
+BOOL ICACHE_FLASH_ATTR MQTT_Subscribe(MQTT_Client *client, const char* topic, uint8_t qos);
+BOOL ICACHE_FLASH_ATTR MQTT_UnSubscribe(MQTT_Client *client, const char* topic);
 void ICACHE_FLASH_ATTR MQTT_Connect(MQTT_Client *mqttClient);
 void ICACHE_FLASH_ATTR MQTT_Disconnect(MQTT_Client *mqttClient);
 BOOL ICACHE_FLASH_ATTR MQTT_Publish(MQTT_Client *client, const char* topic, const char* data, int data_length, int qos, int retain);

mqtt/include/mqtt_msg.h

@@ -108,17 +108,17 @@ typedef struct mqtt_connect_info
 } mqtt_connect_info_t;
 
 
-static inline int ICACHE_FLASH_ATTR mqtt_get_type(uint8_t* buffer) { return (buffer[0] & 0xf0) >> 4; }
-static inline int ICACHE_FLASH_ATTR mqtt_get_connect_return_code(uint8_t* buffer) { return buffer[3]; }
-static inline int ICACHE_FLASH_ATTR mqtt_get_dup(uint8_t* buffer) { return (buffer[0] & 0x08) >> 3; }
-static inline int ICACHE_FLASH_ATTR mqtt_get_qos(uint8_t* buffer) { return (buffer[0] & 0x06) >> 1; }
-static inline int ICACHE_FLASH_ATTR mqtt_get_retain(uint8_t* buffer) { return (buffer[0] & 0x01); }
+static inline int ICACHE_FLASH_ATTR mqtt_get_type(const uint8_t* buffer) { return (buffer[0] & 0xf0) >> 4; }
+static inline int ICACHE_FLASH_ATTR mqtt_get_connect_return_code(const uint8_t* buffer) { return buffer[3]; }
+static inline int ICACHE_FLASH_ATTR mqtt_get_dup(const uint8_t* buffer) { return (buffer[0] & 0x08) >> 3; }
+static inline int ICACHE_FLASH_ATTR mqtt_get_qos(const uint8_t* buffer) { return (buffer[0] & 0x06) >> 1; }
+static inline int ICACHE_FLASH_ATTR mqtt_get_retain(const uint8_t* buffer) { return (buffer[0] & 0x01); }
 
 void ICACHE_FLASH_ATTR mqtt_msg_init(mqtt_connection_t* connection, uint8_t* buffer, uint16_t buffer_length);
-int ICACHE_FLASH_ATTR mqtt_get_total_length(uint8_t* buffer, uint16_t length);
-const char* ICACHE_FLASH_ATTR mqtt_get_publish_topic(uint8_t* buffer, uint16_t* length);
-const char* ICACHE_FLASH_ATTR mqtt_get_publish_data(uint8_t* buffer, uint16_t* length);
-uint16_t ICACHE_FLASH_ATTR mqtt_get_id(uint8_t* buffer, uint16_t length);
+int ICACHE_FLASH_ATTR mqtt_get_total_length(const uint8_t* buffer, uint16_t length);
+const char* ICACHE_FLASH_ATTR mqtt_get_publish_topic(const uint8_t* buffer, uint16_t* length);
+const char* ICACHE_FLASH_ATTR mqtt_get_publish_data(const uint8_t* buffer, uint16_t* length);
+uint16_t ICACHE_FLASH_ATTR mqtt_get_id(const uint8_t* buffer, uint16_t length);
 
 mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_connect(mqtt_connection_t* connection, mqtt_connect_info_t* info);
 mqtt_message_t* ICACHE_FLASH_ATTR mqtt_msg_publish(mqtt_connection_t* connection, const char* topic, const char* data, int data_length, int qos, int retain, uint16_t* message_id);

mqtt/include/queue.h → mqtt/include/mqtt_queue.h

@@ -38,7 +38,7 @@ typedef struct {
 } QUEUE;
 
 void ICACHE_FLASH_ATTR QUEUE_Init(QUEUE *queue, int bufferSize);
-int32_t ICACHE_FLASH_ATTR QUEUE_Puts(QUEUE *queue, uint8_t* buffer, uint16_t len);
+int32_t ICACHE_FLASH_ATTR QUEUE_Puts(QUEUE *queue, const uint8_t* buffer, uint16_t len);
 int32_t ICACHE_FLASH_ATTR QUEUE_Gets(QUEUE *queue, uint8_t* buffer, uint16_t* len, uint16_t maxLen);
 BOOL ICACHE_FLASH_ATTR QUEUE_IsEmpty(QUEUE *queue);
 #endif /* USER_QUEUE_H_ */

mqtt/include/utils.h

@@ -5,5 +5,5 @@
 
 uint32_t ICACHE_FLASH_ATTR UTILS_Atoh(const int8_t *s);
 uint8_t ICACHE_FLASH_ATTR UTILS_StrToIP(const int8_t* str, void *ip);
-uint8_t ICACHE_FLASH_ATTR UTILS_IsIPV4 (int8_t *str);
+uint8_t ICACHE_FLASH_ATTR UTILS_IsIPV4 (const int8_t *str);
 #endif

mqtt/mqtt.c

@@ -38,7 +38,7 @@
 #include "debug.h"
 #include "user_config.h"
 #include "mqtt.h"
-#include "queue.h"
+#include "mqtt_queue.h"
 
 #define MQTT_TASK_PRIO            2
 #define MQTT_TASK_QUEUE_SIZE      1
@@ -108,7 +108,7 @@ mqtt_dns_found(const char *name, ip_addr_t *ipaddr, void *arg)
 
 
 LOCAL void ICACHE_FLASH_ATTR
-deliver_publish(MQTT_Client* client, uint8_t* message, int length)
+deliver_publish(MQTT_Client* client, const uint8_t* message, int length)
 {
   mqtt_event_data_t event_data;
 
@@ -617,7 +617,7 @@ MQTT_Publish(MQTT_Client *client, const char* topic, const char* data, int data_
   * @retval TRUE if success queue
   */
 BOOL ICACHE_FLASH_ATTR
-MQTT_Subscribe(MQTT_Client *client, char* topic, uint8_t qos)
+MQTT_Subscribe(MQTT_Client *client, const char* topic, uint8_t qos)
 {
   uint8_t dataBuffer[MQTT_BUF_SIZE];
   uint16_t dataLen;
@@ -645,7 +645,7 @@ MQTT_Subscribe(MQTT_Client *client, char* topic, uint8_t qos)
   * @retval TRUE if success queue
   */
 BOOL ICACHE_FLASH_ATTR
-MQTT_UnSubscribe(MQTT_Client *client, char* topic)
+MQTT_UnSubscribe(MQTT_Client *client, const char* topic)
 {
   uint8_t dataBuffer[MQTT_BUF_SIZE];
   uint16_t dataLen;
@@ -773,7 +773,7 @@ MQTT_Task(os_event_t *e)
   * @retval None
   */
 void ICACHE_FLASH_ATTR
-MQTT_InitConnection(MQTT_Client *mqttClient, uint8_t* host, uint32_t port, uint8_t security)
+MQTT_InitConnection(MQTT_Client *mqttClient, const uint8_t* host, uint32_t port, uint8_t security)
 {
   uint32_t temp;
   MQTT_INFO("MQTT:InitConnection\r\n");
@@ -797,7 +797,7 @@ MQTT_InitConnection(MQTT_Client *mqttClient, uint8_t* host, uint32_t port, uint8
   * @retval None
   */
 BOOL ICACHE_FLASH_ATTR
-MQTT_InitClient(MQTT_Client *mqttClient, uint8_t* client_id, uint8_t* client_user, uint8_t* client_pass, uint32_t keepAliveTime, uint8_t cleanSession)
+MQTT_InitClient(MQTT_Client *mqttClient, const uint8_t* client_id, const uint8_t* client_user, const uint8_t* client_pass, uint32_t keepAliveTime, uint8_t cleanSession)
 {
   uint32_t temp;
   MQTT_INFO("MQTT:InitClient\r\n");
@@ -867,7 +867,7 @@ MQTT_InitClient(MQTT_Client *mqttClient, uint8_t* client_id, uint8_t* client_use
   return true;
 }
 void ICACHE_FLASH_ATTR
-MQTT_InitLWT(MQTT_Client *mqttClient, uint8_t* will_topic, uint8_t* will_msg, uint8_t will_qos, uint8_t will_retain)
+MQTT_InitLWT(MQTT_Client *mqttClient, const uint8_t* will_topic, const uint8_t* will_msg, uint8_t will_qos, uint8_t will_retain)
 {
   uint32_t temp;
   temp = os_strlen(will_topic);

mqtt/mqtt_msg.c

@@ -132,7 +132,7 @@ void ICACHE_FLASH_ATTR mqtt_msg_init(mqtt_connection_t* connection, uint8_t* buf
   connection->buffer_length = buffer_length;
 }
 
-int ICACHE_FLASH_ATTR mqtt_get_total_length(uint8_t* buffer, uint16_t length)
+int ICACHE_FLASH_ATTR mqtt_get_total_length(const uint8_t* buffer, uint16_t length)
 {
   int i;
   int totlen = 0;
@@ -151,7 +151,7 @@ int ICACHE_FLASH_ATTR mqtt_get_total_length(uint8_t* buffer, uint16_t length)
   return totlen;
 }
 
-const char* ICACHE_FLASH_ATTR mqtt_get_publish_topic(uint8_t* buffer, uint16_t* length)
+const char* ICACHE_FLASH_ATTR mqtt_get_publish_topic(const uint8_t* buffer, uint16_t* length)
 {
   int i;
   int totlen = 0;
@@ -180,7 +180,7 @@ const char* ICACHE_FLASH_ATTR mqtt_get_publish_topic(uint8_t* buffer, uint16_t*
   return (const char*)(buffer + i);
 }
 
-const char* ICACHE_FLASH_ATTR mqtt_get_publish_data(uint8_t* buffer, uint16_t* length)
+const char* ICACHE_FLASH_ATTR mqtt_get_publish_data(const uint8_t* buffer, uint16_t* length)
 {
   int i;
   int totlen = 0;
@@ -226,7 +226,7 @@ const char* ICACHE_FLASH_ATTR mqtt_get_publish_data(uint8_t* buffer, uint16_t* l
   return (const char*)(buffer + i);
 }
 
-uint16_t ICACHE_FLASH_ATTR mqtt_get_id(uint8_t* buffer, uint16_t length)
+uint16_t ICACHE_FLASH_ATTR mqtt_get_id(const uint8_t* buffer, uint16_t length)
 {
   if (length < 1)
     return 0;

mqtt/queue.c

@@ -27,7 +27,7 @@
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
-#include "queue.h"
+#include "mqtt_queue.h"
 
 #include "user_interface.h"
 #include "osapi.h"
@@ -44,7 +44,7 @@ void ICACHE_FLASH_ATTR QUEUE_Init(QUEUE *queue, int bufferSize)
   queue->buf = (uint8_t*)os_zalloc(bufferSize);
   RINGBUF_Init(&queue->rb, queue->buf, bufferSize);
 }
-int32_t ICACHE_FLASH_ATTR QUEUE_Puts(QUEUE *queue, uint8_t* buffer, uint16_t len)
+int32_t ICACHE_FLASH_ATTR QUEUE_Puts(QUEUE *queue, const uint8_t* buffer, uint16_t len)
 {
   uint32_t ret;
 

mqtt/utils.c

@@ -38,7 +38,7 @@
 #include "utils.h"
 
 
-uint8_t ICACHE_FLASH_ATTR UTILS_IsIPV4 (int8_t *str)
+uint8_t ICACHE_FLASH_ATTR UTILS_IsIPV4 (const int8_t *str)
 {
   uint8_t segs = 0;   /* Segment count. */
   uint8_t chcnt = 0;  /* Character count within segment. */