return ret;
}
+void ubus_msg_list_free(struct ubus_msg_buf_list *ubl)
+{
+ list_del_init(&ubl->list);
+ ubus_msg_free(ubl->msg);
+ free(ubl);
+}
+
static void ubus_msg_enqueue(struct ubus_client *cl, struct ubus_msg_buf *ub)
{
- if (cl->tx_queue[cl->txq_tail])
+ struct ubus_msg_buf_list *ubl;
+
+ if (cl->txq_len + ub->len > UBUS_CLIENT_MAX_TXQ_LEN)
return;
- cl->tx_queue[cl->txq_tail] = ubus_msg_ref(ub);
- cl->txq_tail = (cl->txq_tail + 1) % ARRAY_SIZE(cl->tx_queue);
+ ubl = calloc(1, sizeof(struct ubus_msg_buf_list));
+ if (!ubl)
+ return;
+
+ INIT_LIST_HEAD(&ubl->list);
+ ubl->msg = ubus_msg_ref(ub);
+
+ list_add_tail(&ubl->list, &cl->tx_queue);
+ cl->txq_len += ub->len;
}
/* takes the msgbuf reference */
if (ub->hdr.type != UBUS_MSG_MONITOR)
ubusd_monitor_message(cl, ub, true);
- if (!cl->tx_queue[cl->txq_cur]) {
+ if (list_empty(&cl->tx_queue)) {
written = ubus_msg_writev(cl->sock.fd, ub, 0);
if (written < 0)
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);