Skip to content

fix: subscribe/unsubscribe message ID race condition (IDFGH-16024) #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: subscribe/unsubscribe message ID race condition (IDFGH-16024) #305

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions mqtt_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1946,8 +1946,10 @@ int esp_mqtt_client_subscribe_multiple(esp_mqtt_client_handle_t client,
}

ESP_LOGD(TAG, "Sent subscribe, first topic=%s, id: %d", topic_list[0].filter, client->mqtt_state.pending_msg_id);

int pending_msg_id = client->mqtt_state.pending_msg_id;
MQTT_API_UNLOCK(client);
return client->mqtt_state.pending_msg_id;
return pending_msg_id;

}
int esp_mqtt_client_subscribe_single(esp_mqtt_client_handle_t client, const char *topic, int qos)
Expand Down Expand Up @@ -2002,8 +2004,10 @@ int esp_mqtt_client_unsubscribe(esp_mqtt_client_handle_t client, const char *top
}

ESP_LOGD(TAG, "Sent Unsubscribe topic=%s, id: %d, successful", topic, client->mqtt_state.pending_msg_id);

int pending_msg_id = client->mqtt_state.pending_msg_id;
MQTT_API_UNLOCK(client);
return client->mqtt_state.pending_msg_id;
return pending_msg_id;
}

static int make_publish(esp_mqtt_client_handle_t client, const char *topic, const char *data,
Expand Down
Loading