DGNum/ubus
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ubusd: fix tx_queue linked list usage

Browse source 
Use the correct parameters for list_add_tail when enqueueing a message
in the tx_queue. Previously, list_add_tail(list, entry) was used instead
of list_add_tail(entry, list). Due to this, the list would only contain
the latest entry, and previously inserted entries were left dangling.

Reset the tx_queue offset after a message from the tx_queue has been sent
completely.

Signed-off-by: Alexander Van Parys <alexander.vanparys_ext@softathome.com>
This commit is contained in:
Alexander Van Parys 2021-06-30 20:12:46 +02:00 committed by Felix Fietkau
parent a8cf678230
commit 4fc532c8a5
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ubusd.c
View file

@ -154,7 +154,7 @@ static void ubus_msg_enqueue(struct ubus_client *cl, struct ubus_msg_buf *ub)
INIT_LIST_HEAD(&ubl->list); INIT_LIST_HEAD(&ubl->list);
ubl->msg = ubus_msg_ref(ub); ubl->msg = ubus_msg_ref(ub);
list_add_tail(&cl->tx_queue, &ubl->list); list_add_tail(&ubl->list, &cl->tx_queue);
cl->txq_len += ub->len; cl->txq_len += ub->len;
} }

1
ubusd_main.c
View file

@ -78,6 +78,7 @@ static void client_cb(struct uloop_fd *sock, unsigned int events)
if (cl->txq_ofs < ub->len + sizeof(ub->hdr)) if (cl->txq_ofs < ub->len + sizeof(ub->hdr))
break; break;
cl->txq_ofs = 0;
ubus_msg_list_free(ubl); ubus_msg_list_free(ubl);
} }