test/acl
1
0
Fork 0
mirror of https://gitee.com/acl-dev/acl.git synced 2024-11-29 18:37:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bugs in mqtt_connect.cpp for parsing package.

Browse Source
This commit is contained in:
shuxin 　　zheng 2024-09-29 17:15:56 +08:00
parent 4963936de2
commit 1ea0139062
1 changed files with 60 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
lib_acl_cpp/src/mqtt/mqtt_connect.cpp
View File

@ -270,12 +270,12 @@ int mqtt_connect::update_cid_len(const char* data, int dlen) {
if (dlen_ > 0) {
status_ = MQTT_STAT_CID_VAL;
} else if ((conn_flags_ & 0x04)) {
status_ = MQTT_STAT_WILL_TOPIC_LEN;
} else if ((conn_flags_ & 0x80)) {
status_ = MQTT_STAT_USERNAME_LEN;
} else if ((conn_flags_ & 0x40)) {
status_ = MQTT_STAT_PASSWD_LEN;
} else if ((conn_flags_ & 0x04)) {
status_ = MQTT_STAT_WILL_TOPIC_LEN;
} else {
finished_ = true;
}
@ -303,69 +303,12 @@ int mqtt_connect::update_cid_len(const char* data, int dlen) {
int mqtt_connect::update_cid_val(const char* data, int dlen) {
SAVE_DATA(cid_);
if ((conn_flags_ & 0x80)) {
if ((conn_flags_ & 0x04)) {
status_ = MQTT_STAT_WILL_TOPIC_LEN;
} else if ((conn_flags_ & 0x80)) {
status_ = MQTT_STAT_USERNAME_LEN;
} else if ((conn_flags_ & 0x40)) {
status_ = MQTT_STAT_PASSWD_LEN;
} else if ((conn_flags_ & 0x04)) {
status_ = MQTT_STAT_WILL_TOPIC_LEN;
} else {
finished_ = true;
}
return dlen;
}
int mqtt_connect::update_username_len(const char* data, int dlen) {
SAVE_LENGTH(dlen_);
if (dlen_ > 0) {
status_ = MQTT_STAT_USERNAME_VAL;
} else if ((conn_flags_ & 0x40)) {
status_ = MQTT_STAT_PASSWD_LEN;
} else if ((conn_flags_ & 0x04)) {
status_ = MQTT_STAT_WILL_TOPIC_LEN;
} else {
finished_ = true;
return dlen;
}
return dlen;
}
int mqtt_connect::update_username_val(const char* data, int dlen) {
SAVE_DATA(username_);
if ((conn_flags_ & 0x40)) {
status_ = MQTT_STAT_PASSWD_LEN;
} else if ((conn_flags_ & 0x04)) {
status_ = MQTT_STAT_WILL_TOPIC_LEN;
} else {
finished_ = true;
}
return dlen;
}
int mqtt_connect::update_passwd_len(const char* data, int dlen) {
SAVE_LENGTH(dlen_);
if (dlen_ > 0) {
status_ = MQTT_STAT_PASSWD_VAL;
} else if ((conn_flags_ & 0x04)) {
status_ = MQTT_STAT_WILL_TOPIC_LEN;
} else {
finished_ = true;
}
return dlen;
}
int mqtt_connect::update_passwd_val(const char* data, int dlen) {
SAVE_DATA(passwd_);
if ((conn_flags_ & 0x04)) {
status_ = MQTT_STAT_WILL_TOPIC_LEN;
} else {
finished_ = true;
}
@ -392,6 +335,10 @@ int mqtt_connect::update_will_msg_len(const char* data, int dlen) {
if (dlen_ > 0) {
status_ = MQTT_STAT_WILL_MSG_VAL;
} else if ((conn_flags_ & 0x80)) {
status_ = MQTT_STAT_USERNAME_LEN;
} else if ((conn_flags_ & 0x40)) {
status_ = MQTT_STAT_PASSWD_LEN;
} else {
finished_ = true;
}
@ -402,6 +349,57 @@ int mqtt_connect::update_will_msg_len(const char* data, int dlen) {
int mqtt_connect::update_will_msg_val(const char* data, int dlen) {
SAVE_DATA(will_msg_);
if ((conn_flags_ & 0x80)) {
status_ = MQTT_STAT_USERNAME_LEN;
} else if ((conn_flags_ & 0x40)) {
status_ = MQTT_STAT_PASSWD_LEN;
} else {
finished_ = true;
}
return dlen;
}
int mqtt_connect::update_username_len(const char* data, int dlen) {
SAVE_LENGTH(dlen_);
if (dlen_ > 0) {
status_ = MQTT_STAT_USERNAME_VAL;
} else if ((conn_flags_ & 0x40)) {
status_ = MQTT_STAT_PASSWD_LEN;
} else {
finished_ = true;
}
return dlen;
}
int mqtt_connect::update_username_val(const char* data, int dlen) {
SAVE_DATA(username_);
if ((conn_flags_ & 0x40)) {
status_ = MQTT_STAT_PASSWD_LEN;
} else {
finished_ = true;
}
return dlen;
}
int mqtt_connect::update_passwd_len(const char* data, int dlen) {
SAVE_LENGTH(dlen_);
if (dlen_ > 0) {
status_ = MQTT_STAT_PASSWD_VAL;
} else {
finished_ = true;
}
return dlen;
}
int mqtt_connect::update_passwd_val(const char* data, int dlen) {
SAVE_DATA(passwd_);
finished_ = true;
return dlen;
}