From 510dd21158b094e48e3e46b806f54aca6af3c19d Mon Sep 17 00:00:00 2001
From: Tuan PM <tuanpm@live.com>
Date: Wed, 15 Feb 2017 13:16:44 +0700
Subject: [PATCH] add msg_len

---
 mqtt.c | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/mqtt.c b/mqtt.c
index eccbba8..3f1705a 100755
--- a/mqtt.c
+++ b/mqtt.c
@@ -2,7 +2,7 @@
 * @Author: Tuan PM
 * @Date:   2016-09-10 09:33:06
 * @Last Modified by:   Tuan PM
-* @Last Modified time: 2017-02-15 13:02:53
+* @Last Modified time: 2017-02-15 13:11:53
 */
 #include <stdio.h>
 #include "freertos/FreeRTOS.h"
@@ -33,6 +33,7 @@ static int resolve_dns(const char *host, struct sockaddr_in *ip) {
 }
 static void mqtt_queue(mqtt_client *client)
 {
+    int msg_len;
     while (rb_available(&client->send_rb) < client->mqtt_state.outbound_message->length) {
         xQueueReceive(client->xSendingQueue, &msg_len, 1000 / portTICK_RATE_MS);
         rb_read(&client->send_rb, client->mqtt_state.out_buffer, msg_len);
@@ -47,8 +48,8 @@ static bool client_connect(mqtt_client *client)
 {
     int ret;
     struct sockaddr_in remote_ip;
-    
-    while (1) {   
+
+    while (1) {
 
         bzero(&remote_ip, sizeof(struct sockaddr_in));
         remote_ip.sin_family = AF_INET;
@@ -77,7 +78,7 @@ static bool client_connect(mqtt_client *client)
         }
 #endif
 
-        client->socket = socket(PF_INET, SOCK_STREAM, 0); 
+        client->socket = socket(PF_INET, SOCK_STREAM, 0);
         if (client->socket == -1) {
             mqtt_error("Failed to create socket");
             goto failed2;
@@ -90,7 +91,7 @@ static bool client_connect(mqtt_client *client)
                   client->settings->port,
                   remote_ip.sin_port);
 
-     
+
         if (connect(client->socket, (struct sockaddr *)(&remote_ip), sizeof(struct sockaddr)) != 00) {
             mqtt_error("Connect failed");
             goto failed3;
@@ -119,11 +120,11 @@ static bool client_connect(mqtt_client *client)
         mqtt_info("Connected!");
 
         return true;
-              
+
         //failed5:
         //   SSL_shutdown(client->ssl);
 
-#if defined(CONFIG_MQTT_SECURITY_ON)          
+#if defined(CONFIG_MQTT_SECURITY_ON)
         failed4:
           SSL_free(client->ssl);
           client->ssl = NULL;
@@ -134,12 +135,12 @@ static bool client_connect(mqtt_client *client)
           client->socket = -1;
 
         failed2:
-#if defined(CONFIG_MQTT_SECURITY_ON)         
+#if defined(CONFIG_MQTT_SECURITY_ON)
           SSL_CTX_free(client->ctx);
 
         failed1:
           client->ctx = NULL;
-#endif        
+#endif
          vTaskDelay(1000 / portTICK_RATE_MS);
 
      }
@@ -151,7 +152,7 @@ static bool client_connect(mqtt_client *client)
 void closeclient(mqtt_client *client)
 {
 
-#if defined(CONFIG_MQTT_SECURITY_ON)          
+#if defined(CONFIG_MQTT_SECURITY_ON)
         if (client->ssl != NULL)
         {
           SSL_shutdown(client->ssl);
@@ -166,13 +167,13 @@ void closeclient(mqtt_client *client)
           client->socket = -1;
         }
 
-#if defined(CONFIG_MQTT_SECURITY_ON)         
+#if defined(CONFIG_MQTT_SECURITY_ON)
         if (client->ctx != NULL)
         {
           SSL_CTX_free(client->ctx);
           client->ctx = NULL;
         }
-#endif        
+#endif
 
 }
 /*
@@ -419,7 +420,7 @@ void mqtt_task(void *pvParameters)
 
     while (1) {
         client_connect(client);
-       
+
         mqtt_info("Connected to server %s:%d", client->settings->host, client->settings->port);
         if (!mqtt_connect(client)) {
             closeclient(client);
@@ -434,7 +435,7 @@ void mqtt_task(void *pvParameters)
 
         mqtt_info("mqtt_start_receive_schedule");
         mqtt_start_receive_schedule(client);
-    
+
         closeclient(client);
         vTaskDelete(xMqttSendingTask);
         vTaskDelay(1000 / portTICK_RATE_MS);