Skip to content
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

manifest: Pull MQTT 5.0 support from upstream #21185

Merged
merged 1 commit into from
Mar 28, 2025
Merged

manifest: Pull MQTT 5.0 support from upstream #21185

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion applications/serial_lte_modem/src/mqtt_c/slm_at_mqtt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ static int do_mqtt_disconnect(void)
return -ENOTCONN;
}

err = mqtt_disconnect(&client);
err = mqtt_disconnect(&client, NULL);
if (err) {
LOG_ERR("ERROR: mqtt_disconnect %d", err);
return err;
Expand Down
2 changes: 1 addition & 1 deletion subsys/net/lib/mqtt_helper/mqtt_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ int mqtt_helper_disconnect(void)

mqtt_state_set(MQTT_STATE_DISCONNECTING);

err = mqtt_disconnect(&mqtt_client);
err = mqtt_disconnect(&mqtt_client, NULL);
if (err) {
/* Treat the sitation as an ungraceful disconnect */
LOG_ERR("Failed to send disconnection request, treating as disconnected");
Expand Down
2 changes: 1 addition & 1 deletion subsys/net/lib/nrf_cloud/src/nrf_cloud_transport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,7 @@ int nct_disconnect(void)
LOG_DBG("Disconnecting");

dc_endpoint_free();
return mqtt_disconnect(&nct.client);
return mqtt_disconnect(&nct.client, NULL);
}

int nct_process(void)
Expand Down
4 changes: 2 additions & 2 deletions tests/subsys/net/lib/mqtt_helper/src/mqtt_helper_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ void test_on_publish_too_large_incoming_msg(void)

void test_mqtt_helper_disconnect_when_connected(void)
{
__cmock_mqtt_disconnect_ExpectAndReturn(&mqtt_client, 0);
__cmock_mqtt_disconnect_ExpectAndReturn(&mqtt_client, NULL, 0);

mqtt_state = MQTT_STATE_CONNECTED;

Expand All @@ -410,7 +410,7 @@ void test_mqtt_helper_disconnect_when_connected(void)

void test_mqtt_helper_disconnect_when_connected_mqtt_api_error(void)
{
__cmock_mqtt_disconnect_ExpectAndReturn(&mqtt_client, -1);
__cmock_mqtt_disconnect_ExpectAndReturn(&mqtt_client, NULL, -1);

mqtt_state = MQTT_STATE_CONNECTED;

Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 9442059bfd79de2f8e8ad858e7ad064694493bc1
revision: 1a2d42b0aa3b4bc2148d4c1ae2ccc977cf6282c5
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading