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

ubusd: add per-client tx queue limit

Browse source 
No new message can be enqueued if this brings the total queue length of
that client over UBUS_CLIENT_MAX_TXQ_LEN.

Set UBUS_CLIENT_MAX_TXQ_LEN to UBUS_MAX_MSGLEN, i.e. 1MB. This limit
should be plenty for any practical use case.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Arnout Vandecappelle (Essensium/Mind) 2021-03-25 22:45:02 +01:00 committed by Felix Fietkau
parent 4becbd67de
commit c736e47f3e
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ubusd.c
View file

@ -144,6 +144,9 @@ static void ubus_msg_enqueue(struct ubus_client *cl, struct ubus_msg_buf *ub)
{
struct ubus_msg_buf_list *ubl;
if (cl->txq_len + ub->len > UBUS_CLIENT_MAX_TXQ_LEN)
return;
ubl = calloc(1, sizeof(struct ubus_msg_buf_list));
if (!ubl)
return;
@ -152,6 +155,7 @@ static void ubus_msg_enqueue(struct ubus_client *cl, struct ubus_msg_buf *ub)
ubl->msg = ubus_msg_ref(ub);
list_add_tail(&cl->tx_queue, &ubl->list);
cl->txq_len += ub->len;
}
/* takes the msgbuf reference */
@ -172,6 +176,7 @@ void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub)
return;
cl->txq_ofs = written;
cl->txq_len = -written;
/* get an event once we can write to the socket again */
uloop_fd_add(&cl->sock, ULOOP_READ | ULOOP_WRITE | ULOOP_EDGE_TRIGGER);

2
ubusd.h
View file

@ -24,6 +24,7 @@
#include "ubusd_acl.h"
#define UBUS_OBJ_HASH_BITS 4
#define UBUS_CLIENT_MAX_TXQ_LEN UBUS_MAX_MSGLEN
extern struct blob_buf b;
@ -54,6 +55,7 @@ struct ubus_client {
struct list_head tx_queue;
unsigned int txq_ofs;
unsigned int txq_len;
struct ubus_msg_buf *pending_msg;
struct ubus_msg_buf *retmsg;

1
ubusd_main.c
View file

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