espressif/esp-mqtt
1
0
Fork 1
mirror of https://github.com/espressif/esp-mqtt.git synced 2025-07-31 19:25:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Crash fixes and ssl connection (#29)

Browse Source 
* add missing config for setting default port for SSL in Kconfig

* free the TCP only after closing the connection , not before

* set the config in the client before we access the schema in the client

* fix typo

* dispatch also Publish event
This commit is contained in:
agmuntianu
2018-03-09 16:04:33 +01:00
committed by Tuan
parent 6d8a6c79bd
commit 5c46be5ada
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Kconfig
View File

@@ -39,6 +39,14 @@ config MQTT_TCP_DEFAULT_PORT
help help
Default MQTT over TCP port Default MQTT over TCP port
config MQTT_SSL_DEFAULT_PORT
int "Default MQTT over SSL port"
default 8883
depends on MQTT_USE_CUSTOM_CONFIG
depends on MQTT_TRANSPORT_SSL
help
Default MQTT over SSL port
config MQTT_WS_DEFAULT_PORT config MQTT_WS_DEFAULT_PORT
int "Default MQTT over Websocket port" int "Default MQTT over Websocket port"
default 80 default 80

2
lib/transport_tcp.c
View File

@@ -131,8 +131,8 @@ static int tcp_close(transport_handle_t t)
static esp_err_t tcp_destroy(transport_handle_t t) static esp_err_t tcp_destroy(transport_handle_t t)
{ {
transport_tcp_t *tcp = transport_get_data(t); transport_tcp_t *tcp = transport_get_data(t);
free(tcp);
transport_close(t); transport_close(t);
free(tcp);
return 0; return 0;
} }

13
mqtt_client.c
View File

@@ -48,7 +48,7 @@ typedef struct {
typedef enum { typedef enum {
MQTT_STATE_ERROR = -1, MQTT_STATE_ERROR = -1,
MQTT_STATE_UNKNOW = 0, MQTT_STATE_UNKNOWN = 0,
MQTT_STATE_INIT, MQTT_STATE_INIT,
MQTT_STATE_CONNECTED, MQTT_STATE_CONNECTED,
MQTT_STATE_WAIT_TIMEOUT, MQTT_STATE_WAIT_TIMEOUT,
@@ -269,6 +269,8 @@ esp_mqtt_client_handle_t esp_mqtt_client_init(const esp_mqtt_client_config_t *co
esp_mqtt_client_handle_t client = calloc(1, sizeof(struct esp_mqtt_client)); esp_mqtt_client_handle_t client = calloc(1, sizeof(struct esp_mqtt_client));
mem_assert(client); mem_assert(client);
esp_mqtt_set_config(client, config);
client->transport_list = transport_list_init(); client->transport_list = transport_list_init();
transport_handle_t tcp = transport_tcp_init(); transport_handle_t tcp = transport_tcp_init();
@@ -307,9 +309,6 @@ esp_mqtt_client_handle_t esp_mqtt_client_init(const esp_mqtt_client_config_t *co
client->config->scheme = create_string("wss", 3); client->config->scheme = create_string("wss", 3);
} }
#endif #endif
esp_mqtt_set_config(client, config);
if (client->config->uri) { if (client->config->uri) {
if (esp_mqtt_client_set_uri(client, client->config->uri) != ESP_OK) { if (esp_mqtt_client_set_uri(client, client->config->uri) != ESP_OK) {
return NULL; return NULL;
@@ -601,6 +600,8 @@ static esp_err_t mqtt_process_receive(esp_mqtt_client_handle_t client)
case MQTT_MSG_TYPE_PUBACK: case MQTT_MSG_TYPE_PUBACK:
if (is_valid_mqtt_msg(client, MQTT_MSG_TYPE_PUBLISH, msg_id)) { if (is_valid_mqtt_msg(client, MQTT_MSG_TYPE_PUBLISH, msg_id)) {
ESP_LOGD(TAG, "received MQTT_MSG_TYPE_PUBACK, finish QoS1 publish"); ESP_LOGD(TAG, "received MQTT_MSG_TYPE_PUBACK, finish QoS1 publish");
client->event.event_id = MQTT_EVENT_PUBLISHED;
esp_mqtt_dispatch_event(client);
} }
break; break;
@@ -619,6 +620,8 @@ static esp_err_t mqtt_process_receive(esp_mqtt_client_handle_t client)
ESP_LOGD(TAG, "received MQTT_MSG_TYPE_PUBCOMP"); ESP_LOGD(TAG, "received MQTT_MSG_TYPE_PUBCOMP");
if (is_valid_mqtt_msg(client, MQTT_MSG_TYPE_PUBREL, msg_id)) { if (is_valid_mqtt_msg(client, MQTT_MSG_TYPE_PUBREL, msg_id)) {
ESP_LOGD(TAG, "Receive MQTT_MSG_TYPE_PUBCOMP, finish QoS2 publish"); ESP_LOGD(TAG, "Receive MQTT_MSG_TYPE_PUBCOMP, finish QoS2 publish");
client->event.event_id = MQTT_EVENT_PUBLISHED;
esp_mqtt_dispatch_event(client);
} }
break; break;
case MQTT_MSG_TYPE_PINGREQ: case MQTT_MSG_TYPE_PINGREQ:
@@ -738,7 +741,7 @@ esp_err_t esp_mqtt_client_stop(esp_mqtt_client_handle_t client)
{ {
client->run = false; client->run = false;
xEventGroupWaitBits(client->status_bits, STOPPED_BIT, false, true, portMAX_DELAY); xEventGroupWaitBits(client->status_bits, STOPPED_BIT, false, true, portMAX_DELAY);
client->state = MQTT_STATE_UNKNOW; client->state = MQTT_STATE_UNKNOWN;
return ESP_OK; return ESP_OK;
} }