From 40b06deb10d27219c66ddb2e1a628caf0fc2547f Mon Sep 17 00:00:00 2001 From: Marius Vikhammer Date: Mon, 29 Jun 2020 10:14:56 +0800 Subject: [PATCH] Allow the query part of the uri to be a part of the path Closes IDFGH-3565 Closes https://github.com/espressif/esp-mqtt/issues/161 --- mqtt_client.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/mqtt_client.c b/mqtt_client.c index bf2e818..9e3729b 100644 --- a/mqtt_client.c +++ b/mqtt_client.c @@ -761,7 +761,22 @@ esp_err_t esp_mqtt_client_set_uri(esp_mqtt_client_handle_t client, const char *u client->config->scheme = create_string(uri + puri.field_data[UF_SCHEMA].off, puri.field_data[UF_SCHEMA].len); client->config->host = create_string(uri + puri.field_data[UF_HOST].off, puri.field_data[UF_HOST].len); - client->config->path = create_string(uri + puri.field_data[UF_PATH].off, puri.field_data[UF_PATH].len); + client->config->path = NULL; + + if (puri.field_data[UF_PATH].len || puri.field_data[UF_QUERY].len) { + if (puri.field_data[UF_QUERY].len == 0) { + asprintf(&client->config->path, "%.*s", puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off); + } else if (puri.field_data[UF_PATH].len == 0) { + asprintf(&client->config->path, "/?%.*s", puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off); + } else { + asprintf(&client->config->path, "%.*s?%.*s", puri.field_data[UF_PATH].len, uri + puri.field_data[UF_PATH].off, + puri.field_data[UF_QUERY].len, uri + puri.field_data[UF_QUERY].off); + } + ESP_MEM_CHECK(TAG, client->config->path, { + MQTT_API_UNLOCK(client); + return ESP_ERR_NO_MEM; + }); + } if (client->config->path) { esp_transport_handle_t trans = esp_transport_list_get_transport(client->transport_list, "ws");