RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

asymcute: Compare request message type when matching acknowledgement

Browse Source 
Currently, asymcute only matches an MQTT-SN request to its
acknowledgement using the MsgId header. However, I strongly believe
this to be insufficient as asymcute would thus also match a SUBACK
to a prior PUBLISH message (for example) as long as the message ID
matches. To address this issue, this commit modifies _req_preprocess
to also compare the request message type in addition to the message id.
This commit is contained in:
Sören Tempel 2022-08-10 00:49:37 +02:00
parent dff1f689b0
commit fb660dbec6
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/net/application_layer/asymcute/asymcute.c
View File

@ -104,17 +104,25 @@ static uint16_t _msg_id_next(asymcute_con_t *con)
return con->last_id; return con->last_id;
} }
static uint8_t _req_type(asymcute_req_t *req)
{
size_t len;
size_t pos = _len_get(req->data, &len);
return req->data[pos];
}
/* @pre con is locked */ /* @pre con is locked */
static asymcute_req_t *_req_preprocess(asymcute_con_t *con, static asymcute_req_t *_req_preprocess(asymcute_con_t *con,
size_t msg_len, size_t min_len, size_t msg_len, size_t min_len,
const uint8_t *buf, unsigned id_pos) const uint8_t *buf, unsigned id_pos,
uint8_t rtype)
{ {
/* verify message length */ /* verify message length */
if (msg_len < min_len) { if (msg_len < min_len) {
return NULL; return NULL;
} }
uint16_t msg_id = (buf == NULL) ? 0 : byteorder_bebuftohs(&buf[id_pos]); uint16_t msg_id = (buf == NULL) ? 0 : byteorder_bebuftohs(&buf[id_pos]);
asymcute_req_t *res = NULL; asymcute_req_t *res = NULL;
asymcute_req_t *iter = con->pending; asymcute_req_t *iter = con->pending;
@ -126,8 +134,9 @@ static asymcute_req_t *_req_preprocess(asymcute_con_t *con,
con->pending = iter->next; con->pending = iter->next;
} }
while (iter && !res) { while (iter && !res) {
if (iter->next && (iter->next->msg_id == msg_id)) { asymcute_req_t *r = iter->next;
res = iter->next; if (r && (r->msg_id == msg_id) && (_req_type(r) == rtype)) {
res = r;
iter->next = iter->next->next; iter->next = iter->next->next;
} }
iter = iter->next; iter = iter->next;
@ -340,7 +349,7 @@ static void _on_keepalive_evt(void *arg)
static void _on_connack(asymcute_con_t *con, const uint8_t *data, size_t len) static void _on_connack(asymcute_con_t *con, const uint8_t *data, size_t len)
{ {
mutex_lock(&con->lock); mutex_lock(&con->lock);
asymcute_req_t *req = _req_preprocess(con, len, MINLEN_CONNACK, NULL, 0); asymcute_req_t *req = _req_preprocess(con, len, MINLEN_CONNACK, NULL, 0, MQTTSN_CONNECT);
if (req == NULL) { if (req == NULL) {
mutex_unlock(&con->lock); mutex_unlock(&con->lock);
return; return;
@ -367,7 +376,7 @@ static void _on_disconnect(asymcute_con_t *con, size_t len)
/* we might have triggered the DISCONNECT process ourselves, so make sure /* we might have triggered the DISCONNECT process ourselves, so make sure
* the pending request is being handled */ * the pending request is being handled */
asymcute_req_t *req = _req_preprocess(con, len, MINLEN_DISCONNECT, NULL, 0); asymcute_req_t *req = _req_preprocess(con, len, MINLEN_DISCONNECT, NULL, 0, MQTTSN_DISCONNECT);
/* put the connection back to NOTCON in any case and let the user know */ /* put the connection back to NOTCON in any case and let the user know */
_disconnect(con, NOTCON); _disconnect(con, NOTCON);
@ -403,7 +412,8 @@ static void _on_regack(asymcute_con_t *con, const uint8_t *data, size_t len)
{ {
mutex_lock(&con->lock); mutex_lock(&con->lock);
asymcute_req_t *req = _req_preprocess(con, len, MINLEN_REGACK, asymcute_req_t *req = _req_preprocess(con, len, MINLEN_REGACK,
data, IDPOS_REGACK); data, IDPOS_REGACK,
MQTTSN_REGISTER);
if (req == NULL) { if (req == NULL) {
mutex_unlock(&con->lock); mutex_unlock(&con->lock);
return; return;
@ -471,7 +481,8 @@ static void _on_puback(asymcute_con_t *con, const uint8_t *data, size_t len)
{ {
mutex_lock(&con->lock); mutex_lock(&con->lock);
asymcute_req_t *req = _req_preprocess(con, len, MINLEN_PUBACK, asymcute_req_t *req = _req_preprocess(con, len, MINLEN_PUBACK,
data, IDPOS_PUBACK); data, IDPOS_PUBACK,
MQTTSN_PUBLISH);
if (req == NULL) { if (req == NULL) {
mutex_unlock(&con->lock); mutex_unlock(&con->lock);
return; return;
@ -488,7 +499,8 @@ static void _on_suback(asymcute_con_t *con, const uint8_t *data, size_t len)
{ {
mutex_lock(&con->lock); mutex_lock(&con->lock);
asymcute_req_t *req = _req_preprocess(con, len, MINLEN_SUBACK, asymcute_req_t *req = _req_preprocess(con, len, MINLEN_SUBACK,
data, IDPOS_SUBACK); data, IDPOS_SUBACK,
MQTTSN_SUBSCRIBE);
if (req == NULL) { if (req == NULL) {
mutex_unlock(&con->lock); mutex_unlock(&con->lock);
return; return;
@ -527,7 +539,8 @@ static void _on_unsuback(asymcute_con_t *con, const uint8_t *data, size_t len)
{ {
mutex_lock(&con->lock); mutex_lock(&con->lock);
asymcute_req_t *req = _req_preprocess(con, len, MINLEN_UNSUBACK, asymcute_req_t *req = _req_preprocess(con, len, MINLEN_UNSUBACK,
data, IDPOS_UNSUBACK); data, IDPOS_UNSUBACK,
MQTTSN_UNSUBSCRIBE);
if (req == NULL) { if (req == NULL) {
mutex_unlock(&con->lock); mutex_unlock(&con->lock);
return; return;