Merge branch 'bugfix/mqtt_wolfssl' into 'master'

donghengqaz · donghengqaz · commit c74d4f19d29c · 2019-06-10T15:56:01.000+08:00
Fix a bug of MQTT when disable WS or WSS

See merge request sdk/ESP8266_RTOS_SDK!971
diff --git a/components/mqtt/esp-mqtt/mqtt_client.c b/components/mqtt/esp-mqtt/mqtt_client.c
@@ -406,6 +406,7 @@ esp_err_t esp_mqtt_client_set_uri(esp_mqtt_client_handle_t client, const char *u
         client->config->path = create_string(uri + puri.field_data[UF_PATH].off, puri.field_data[UF_PATH].len);
     }
     if (client->config->path) {
+#if MQTT_ENABLE_WSS || MQTT_ENABLE_WS
         esp_transport_handle_t trans = esp_transport_list_get_transport(client->transport_list, "ws");
         if (trans) {
             esp_transport_ws_set_path(trans, client->config->path);
@@ -414,6 +415,7 @@ esp_err_t esp_mqtt_client_set_uri(esp_mqtt_client_handle_t client, const char *u
         if (trans) {
             esp_transport_ws_set_path(trans, client->config->path);
         }
+#endif
     }
 
     if (puri.field_data[UF_PORT].len) {

Original file line number	Diff line number	Diff line change
`@@ -406,6 +406,7 @@ esp_err_t esp_mqtt_client_set_uri(esp_mqtt_client_handle_t client, const char *u`
`406`	`406`	`client->config->path = create_string(uri + puri.field_data[UF_PATH].off, puri.field_data[UF_PATH].len);`
`407`	`407`	`}`
`408`	`408`	`if (client->config->path) {`
	`409`	`+#if MQTT_ENABLE_WSS \|\| MQTT_ENABLE_WS`
`409`	`410`	`esp_transport_handle_t trans = esp_transport_list_get_transport(client->transport_list, "ws");`
`410`	`411`	`if (trans) {`
`411`	`412`	`esp_transport_ws_set_path(trans, client->config->path);`
`@@ -414,6 +415,7 @@ esp_err_t esp_mqtt_client_set_uri(esp_mqtt_client_handle_t client, const char *u`
`414`	`415`	`if (trans) {`
`415`	`416`	`esp_transport_ws_set_path(trans, client->config->path);`
`416`	`417`	`}`
	`418`	`+#endif`
`417`	`419`	`}`
`418`	`420`
`419`	`421`	`if (puri.field_data[UF_PORT].len) {`