static struct ubus_msg_buf *ubus_msg_ref(struct ubus_msg_buf *ub)
{
- if (ub->refcount == ~0)
- return ubus_msg_new(ub->data, ub->len, false);
+ struct ubus_msg_buf *new_ub;
+ if (ub->refcount == ~0) {
+ new_ub = ubus_msg_new(ub->data, ub->len, false);
+ if (!new_ub)
+ return NULL;
+ memcpy(&new_ub->hdr, &ub->hdr, sizeof(struct ubus_msghdr));
+ new_ub->fd = ub->fd;
+ return new_ub;
+ }
ub->refcount++;
return ub;
}
if (offset < sizeof(ub->hdr)) {
- iov[0].iov_base = ((char *) &ub->hdr) + offset;
- iov[0].iov_len = sizeof(ub->hdr) - offset;
+ struct ubus_msghdr hdr;
+
+ hdr.version = ub->hdr.version;
+ hdr.type = ub->hdr.type;
+ hdr.seq = cpu_to_be16(ub->hdr.seq);
+ hdr.peer = cpu_to_be32(ub->hdr.peer);
+
+ iov[0].iov_base = ((char *) &hdr) + offset;
+ iov[0].iov_len = sizeof(hdr) - offset;
iov[1].iov_base = (char *) ub->data;
iov[1].iov_len = ub->len;
}
/* 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;
+ if (ub->hdr.type != UBUS_MSG_MONITOR)
+ ubusd_monitor_message(cl, ub, true);
+
if (!cl->tx_queue[cl->txq_cur]) {
written = ubus_msg_writev(cl->sock.fd, ub, 0);
- if (written >= ub->len + sizeof(ub->hdr))
- goto out;
if (written < 0)
written = 0;
+ if (written >= ub->len + sizeof(ub->hdr))
+ return;
+
cl->txq_ofs = written;
/* get an event once we can write to the socket again */
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)
while (ubus_msg_head(cl))
ubus_msg_dequeue(cl);
+ ubusd_monitor_disconnect(cl);
ubusd_proto_free_client(cl);
if (cl->pending_msg_fd >= 0)
close(cl->pending_msg_fd);
fd_buf.fd = -1;
- iov.iov_base = &cl->hdrbuf + offset;
+ iov.iov_base = ((char *) &cl->hdrbuf) + offset;
iov.iov_len = sizeof(cl->hdrbuf) - offset;
if (cl->pending_msg_fd < 0) {
if (!cl->pending_msg)
goto disconnect;
+ cl->hdrbuf.hdr.seq = be16_to_cpu(cl->hdrbuf.hdr.seq);
+ cl->hdrbuf.hdr.peer = be32_to_cpu(cl->hdrbuf.hdr.peer);
+
memcpy(&cl->pending_msg->hdr, &cl->hdrbuf.hdr, sizeof(cl->hdrbuf.hdr));
memcpy(cl->pending_msg->data, &cl->hdrbuf.data, sizeof(cl->hdrbuf.data));
}
cl->pending_msg_fd = -1;
cl->pending_msg_offset = 0;
cl->pending_msg = NULL;
+ ubusd_monitor_message(cl, ub, false);
ubusd_proto_receive_message(cl, ub);
goto retry;
}
{
fprintf(stderr, "Usage: %s [<options>]\n"
"Options: \n"
+ " -A <path>: Set the path to ACL files\n"
" -s <socket>: Set the unix domain socket to listen on\n"
"\n", progname);
return 1;
}
+static void sighup_handler(int sig)
+{
+ ubusd_acl_load();
+}
+
int main(int argc, char **argv)
{
const char *ubus_socket = UBUS_UNIX_SOCKET;
int ch;
signal(SIGPIPE, SIG_IGN);
+ signal(SIGHUP, sighup_handler);
openlog("ubusd", LOG_PID, LOG_DAEMON);
uloop_init();
- while ((ch = getopt(argc, argv, "s:")) != -1) {
+ while ((ch = getopt(argc, argv, "A:s:")) != -1) {
switch (ch) {
case 's':
ubus_socket = optarg;
break;
+ case 'A':
+ ubusd_acl_dir = optarg;
+ break;
default:
return usage(argv[0]);
}
}
unlink(ubus_socket);
- umask(0177);
+ umask(0111);
server_fd.fd = usock(USOCK_UNIX | USOCK_SERVER | USOCK_NONBLOCK, ubus_socket, NULL);
if (server_fd.fd < 0) {
perror("usock");
goto out;
}
uloop_fd_add(&server_fd, ULOOP_READ | ULOOP_EDGE_TRIGGER);
+ ubusd_acl_load();
uloop_run();
unlink(ubus_socket);