patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

mqtt: Allow client to override keepalive

Browse source 
This change will allow an MQTT client to override the compile-time
keepalive if desired.  The change is structured such that the
compile-time default will still be setup by calling mqtt_client_init,
but can be changed by the application before calling mqtt_connect if
desired.

Signed-off-by: Justin Brzozoski <justin.brzozoski@signal-fire.com>
This commit is contained in:
Justin Brzozoski 2019-06-27 14:24:23 -04:00 committed by Anas Nashif
parent fb898e3532
commit ffe25df82a
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/net/mqtt.h
View file

@ -476,6 +476,11 @@ struct mqtt_client {
/** Size of transmit buffer. */
u32_t tx_buf_size;
/** Keepalive interval for this client in seconds.
* Default is CONFIG_MQTT_KEEPALIVE.
*/
u16_t keepalive;
/** MQTT protocol version. */
u8_t protocol_version;

5
subsys/net/lib/mqtt/mqtt.c
View file

@ -168,6 +168,7 @@ void mqtt_client_init(struct mqtt_client *client)
client->protocol_version = MQTT_VERSION_3_1_1;
client->clean_session = 1U;
client->keepalive = MQTT_KEEPALIVE;
}
int mqtt_connect(struct mqtt_client *client)
@ -562,8 +563,8 @@ int mqtt_live(struct mqtt_client *client)
elapsed_time = mqtt_elapsed_time_in_ms_get(
client->internal.last_activity);
if ((MQTT_KEEPALIVE > 0) &&
(elapsed_time >= (MQTT_KEEPALIVE * 1000))) {
if ((client->keepalive > 0) &&
(elapsed_time >= (client->keepalive * 1000))) {
(void)mqtt_ping(client);
}
}

4
subsys/net/lib/mqtt/mqtt_encoder.c
View file

@ -325,8 +325,8 @@ int connect_request_encode(const struct mqtt_client *client,
return err_code;
}
MQTT_TRC("Encoding Keep Alive Time %04x.", MQTT_KEEPALIVE);
err_code = pack_uint16(MQTT_KEEPALIVE, buf);
MQTT_TRC("Encoding Keep Alive Time %04x.", client->keepalive);
err_code = pack_uint16(client->keepalive, buf);
if (err_code != 0) {
return err_code;
}