adafruit-mirror/Adafruit_MQTT_Library
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge ac3d5630ae into 0a19fd0b14

Browse source
This commit is contained in:
eutill 2025-08-19 17:34:36 +08:00 committed by GitHub
commit 758acebb60
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Adafruit_MQTT.cpp
View file

@ -693,7 +693,7 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
p[0] = MQTT_CONN_CLEANSESSION; p[0] = MQTT_CONN_CLEANSESSION;
// set the will flags if needed // set the will flags if needed
if (will_topic && pgm_read_byte(will_topic) != 0) { if (will_topic && will_topic[0] != 0) {
p[0] |= MQTT_CONN_WILLFLAG; p[0] |= MQTT_CONN_WILLFLAG;
@ -706,9 +706,9 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
p[0] |= MQTT_CONN_WILLRETAIN; p[0] |= MQTT_CONN_WILLRETAIN;
} }
if (pgm_read_byte(username) != 0) if (username[0] != 0)
p[0] |= MQTT_CONN_USERNAMEFLAG; p[0] |= MQTT_CONN_USERNAMEFLAG;
if (pgm_read_byte(password) != 0) if (password[0] != 0)
p[0] |= MQTT_CONN_PASSWORDFLAG; p[0] |= MQTT_CONN_PASSWORDFLAG;
p++; p++;
@ -720,7 +720,7 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
if (MQTT_PROTOCOL_LEVEL == 3) { if (MQTT_PROTOCOL_LEVEL == 3) {
p = stringprint(p, clientid, 23); // Limit client ID to first 23 characters. p = stringprint(p, clientid, 23); // Limit client ID to first 23 characters.
} else { } else {
if (pgm_read_byte(clientid) != 0) { if (clientid[0] != 0) {
p = stringprint(p, clientid); p = stringprint(p, clientid);
} else { } else {
p[0] = 0x0; p[0] = 0x0;
@ -731,15 +731,15 @@ uint8_t Adafruit_MQTT::connectPacket(uint8_t *packet) {
} }
} }
if (will_topic && pgm_read_byte(will_topic) != 0) { if (will_topic && will_topic[0] != 0) {
p = stringprint(p, will_topic); p = stringprint(p, will_topic);
p = stringprint(p, will_payload); p = stringprint(p, will_payload);
} }
if (pgm_read_byte(username) != 0) { if (username[0] != 0) {
p = stringprint(p, username); p = stringprint(p, username);
} }
if (pgm_read_byte(password) != 0) { if (password[0] != 0) {
p = stringprint(p, password); p = stringprint(p, password);
} }