}
/* takes the msgbuf reference */
-void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free)
+void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub)
{
int written;
written = 0;
if (written >= ub->len + sizeof(ub->hdr))
- goto out;
+ return;
cl->txq_ofs = written;
uloop_fd_add(&cl->sock, ULOOP_READ | ULOOP_WRITE | ULOOP_EDGE_TRIGGER);
}
ubus_msg_enqueue(cl, ub);
-
-out:
- if (free)
- ubus_msg_free(ub);
}
static struct ubus_msg_buf *ubus_msg_head(struct ubus_client *cl)
extern const char *ubusd_acl_dir;
struct ubus_msg_buf *ubus_msg_new(void *data, int len, bool shared);
-void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub, bool free);
+void ubus_msg_send(struct ubus_client *cl, struct ubus_msg_buf *ub);
void ubus_msg_free(struct ubus_msg_buf *ub);
struct blob_attr **ubus_parse_msg(struct blob_attr *msg);
ub->hdr.type = type;
ub->fd = fd;
- ubus_msg_send(cl, ub, true);
+ ubus_msg_send(cl, ub);
+ ubus_msg_free(ub);
}
static bool ubusd_send_hello(struct ubus_client *cl)
return false;
ubus_msg_init(ub, UBUS_MSG_HELLO, 0, cl->id.id);
- ubus_msg_send(cl, ub, true);
+ ubus_msg_send(cl, ub);
+ ubus_msg_free(ub);
return true;
}
static int ubusd_send_pong(struct ubus_client *cl, struct ubus_msg_buf *ub, struct blob_attr **attr)
{
ub->hdr.type = UBUS_MSG_DATA;
- ubus_msg_send(cl, ub, false);
+ ubus_msg_send(cl, ub);
return 0;
}
blob_buf_init(&b, 0);
ubusd_forward_invoke(cl, obj, method, ub, attr[UBUS_ATTR_DATA]);
- ubus_msg_free(ub);
return -1;
}
blob_put_int8(&b, UBUS_ATTR_NO_REPLY, 1);
ubusd_forward_invoke(cl, s->subscriber, method, ub, attr[UBUS_ATTR_DATA]);
}
- ubus_msg_free(ub);
return -1;
}
goto error;
ub->hdr.peer = blob_get_u32(attr[UBUS_ATTR_OBJID]);
- ubus_msg_send(cl, ub, true);
- return -1;
-
+ ubus_msg_send(cl, ub);
error:
- ubus_msg_free(ub);
return -1;
}
if (ub->hdr.type != UBUS_MSG_STATUS && ub->hdr.type != UBUS_MSG_INVOKE)
ubus_msg_close_fd(ub);
+ /* Note: no callback should free the `ub` buffer
+ that's always done right after the callback finishes */
if (cb)
ret = cb(cl, ub, ubus_parse_msg(ub->data));
else
ret = UBUS_STATUS_INVALID_COMMAND;
+ ubus_msg_free(ub);
+
if (ret == -1)
return;
- ubus_msg_free(ub);
-
*retmsg_data = htonl(ret);
- ubus_msg_send(cl, retmsg, false);
+ ubus_msg_send(cl, retmsg);
}
struct ubus_client *ubusd_proto_new_client(int fd, uloop_fd_handler cb)
return;
ubus_msg_init(ub, UBUS_MSG_NOTIFY, ++obj->invoke_seq, 0);
- ubus_msg_send(obj->client, ub, true);
+ ubus_msg_send(obj->client, ub);
+ ubus_msg_free(ub);
}
void ubus_notify_unsubscribe(struct ubus_subscription *s)
ub = ubus_msg_from_blob(false);
if (ub != NULL) {
ubus_msg_init(ub, UBUS_MSG_UNSUBSCRIBE, ++s->subscriber->invoke_seq, 0);
- ubus_msg_send(s->subscriber->client, ub, true);
+ ubus_msg_send(s->subscriber->client, ub);
+ ubus_msg_free(ub);
}
ubus_unsubscribe(s);