X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2Fdbus-transport-kdbus.c;h=56d6de9e818a847ea383b228e12637b2c715f7b6;hb=9e835251cdcb80eeef8565721f4fbd4047f76b2b;hp=22ea9d07761e3730f9d8ac6c776e735162b7e131;hpb=0039b382b8fd67bc08bab1802748724fc3961acb;p=platform%2Fupstream%2Fdbus.git diff --git a/dbus/dbus-transport-kdbus.c b/dbus/dbus-transport-kdbus.c index 22ea9d0..56d6de9 100644 --- a/dbus/dbus-transport-kdbus.c +++ b/dbus/dbus-transport-kdbus.c @@ -1,22 +1,38 @@ -/* - * dbus-transport-kdbus.c +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ +/* dbus-transport-kdbus.c kdbus subclasses of DBusTransport + * + * Copyright (C) 2002, 2003, 2004, 2006 Red Hat Inc + * Copyright (C) 2013 Samsung Electronics * - * Transport layer using kdbus + * Licensed under the Academic Free License version 2.1 * - * Created on: Jun 20, 2013 - * Author: r.pajak + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version and under the terms of the GNU + * Lesser General Public License as published by the + * Free Software Foundation; either version 2.1 of the License, or (at + * your option) any later version. * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ - #include "dbus-transport.h" #include "dbus-transport-kdbus.h" -#include +#include "dbus-transport-protected.h" #include "dbus-connection-internal.h" #include "kdbus.h" #include "dbus-watch.h" #include "dbus-errors.h" #include "dbus-bus.h" +#include "kdbus-common.h" #include #include #include @@ -27,34 +43,43 @@ #include #include #include +#include +#include -#define KDBUS_ALIGN8(l) (((l) + 7) & ~7) -#define KDBUS_PART_HEADER_SIZE offsetof(struct kdbus_item, data) -#define KDBUS_ITEM_SIZE(s) KDBUS_ALIGN8((s) + KDBUS_PART_HEADER_SIZE) +#define RECEIVE_POOL_SIZE (10 * 1024LU * 1024LU) +#define MEMFD_SIZE_THRESHOLD (2 * 1024 * 1024LU) // over this memfd is used +//todo add compilation-time check if MEMFD_SIZE_THERSHOLD is lower than max payload vector size defined in kdbus.h + +#define KDBUS_MSG_DECODE_DEBUG 0 + +#define ITER_APPEND_STR(string) \ +if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &string)) \ +{ \ + ret_size = -1; \ + goto out; \ +}\ + +#define MSG_ITEM_BUILD_VEC(data, datasize) \ + item->type = KDBUS_MSG_PAYLOAD_VEC; \ + item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); \ + item->vec.address = (unsigned long) data; \ + item->vec.size = datasize; -#define KDBUS_PART_NEXT(part) \ - (typeof(part))(((uint8_t *)part) + KDBUS_ALIGN8((part)->size)) #define KDBUS_PART_FOREACH(part, head, first) \ for (part = (head)->first; \ (uint8_t *)(part) < (uint8_t *)(head) + (head)->size; \ part = KDBUS_PART_NEXT(part)) -#define RECEIVE_POOL_SIZE (2 * 1024LU * 1024LU) //todo pool size to be decided -#define MEMFD_POOL_SIZE DBUS_MAXIMUM_MESSAGE_LENGTH -#define MEMFD_SIZE_THRESHOLD (10 * 1024LU) // over this memfd is used - -#define KDBUS_DECODE_DEBUG 1 - - /** - * Opaque object representing a socket file descriptor transport. + * Opaque object representing a transport. In kdbus transport it has nothing common + * with socket, but the name was preserved to comply with upper functions. */ -typedef struct DBusTransportSocket DBusTransportSocket; +typedef struct DBusTransportKdbus DBusTransportKdbus; /** * Implementation details of DBusTransportSocket. All members are private. */ -struct DBusTransportSocket +struct DBusTransportKdbus { DBusTransport base; /**< Parent instance */ int fd; /**< File descriptor. */ @@ -64,157 +89,166 @@ struct DBusTransportSocket int max_bytes_read_per_iteration; /**< To avoid blocking too long. */ int max_bytes_written_per_iteration; /**< To avoid blocking too long. */ - int message_bytes_written; /**< Number of bytes of current - * outgoing message that have - * been written. + void* kdbus_mmap_ptr; /**< Mapped memory where Kdbus (kernel) writes + * messages incoming to us. */ - DBusString encoded_outgoing; /**< Encoded version of current - * outgoing message. + int memfd; /**< File descriptor to special + * memory pool for bulk data + * transfer. Retrieved from + * Kdbus kernel module. */ - DBusString encoded_incoming; /**< Encoded version of current - * incoming data. - */ - void* kdbus_mmap_ptr; - int memfd; /* File descriptor to memory - * pool from Kdbus kernel module */ - char* memfd_buf; /* Mapped memory pool for - * Kdbus MEMFD functionality */ - dbus_bool_t memfd_started; + __u64 bloom_size; /**< bloom filter field size */ + char* sender; /**< uniqe name of the sender */ }; - - -static dbus_bool_t -socket_get_socket_fd (DBusTransport *transport, - int *fd_p) +__u64 dbus_transport_get_bloom_size(DBusTransport* transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - - *fd_p = socket_transport->fd; - - return TRUE; + return ((DBusTransportKdbus*)transport)->bloom_size; } -//static void check_read_watch (DBusTransport *transport); - /* * Adds locally generated message to received messages queue * */ -static dbus_bool_t add_message_to_received(DBusMessage *message, DBusTransport *transport) +static dbus_bool_t add_message_to_received(DBusMessage *message, DBusConnection* connection) { DBusList *message_link; message_link = _dbus_list_alloc_link (message); if (message_link == NULL) { - /* it's OK to unref this, nothing that could have attached a callback - * has ever seen it */ dbus_message_unref (message); return FALSE; } - _dbus_connection_queue_synthesized_message_link(transport->connection, message_link); -// check_read_watch(transport); + _dbus_connection_queue_synthesized_message_link(connection, message_link); return TRUE; } -/*static void kdbus_debug_print_bytes(struct DBusString *data, int size) +/* + * Generates local error message as a reply to message given as parameter + * and adds generated error message to received messages queue. + */ +static int reply_with_error(char* error_type, const char* template, const char* object, DBusMessage *message, DBusConnection* connection) +{ + DBusMessage *errMessage; + char* error_msg = ""; + + if(template) + { + error_msg = alloca(strlen(template) + strlen(object)); + sprintf(error_msg, template, object); + } + else if(object) + error_msg = (char*)object; + + errMessage = generate_local_error_message(dbus_message_get_serial(message), error_type, error_msg); + if(errMessage == NULL) + return -1; + if (add_message_to_received(errMessage, connection)) + return 0; + + return -1; +} + +/* + * Generates reply to the message given as a parameter with one item in the reply body + * and adds generated reply message to received messages queue. + */ +static int reply_1_data(DBusMessage *message, int data_type, void* pData, DBusConnection* connection) { - uint64_t i; + DBusMessageIter args; + DBusMessage *reply; - fprintf (stderr, "\ndata:\n"); - for(i=0; i < size; i++) + reply = dbus_message_new_method_return(message); + if(reply == NULL) + return -1; + dbus_message_set_sender(reply, DBUS_SERVICE_DBUS); + dbus_message_iter_init_append(reply, &args); + if (!dbus_message_iter_append_basic(&args, data_type, pData)) { - fprintf (stderr, "%02x", _dbus_string_get_byte(data,i)); + dbus_message_unref(reply); + return -1; } - fprintf (stderr, "\nsize: %d, i: %lu\n", size, i); - + if(add_message_to_received(reply, connection)) + return 0; + + return -1; +} + +/* +static int reply_ack(DBusMessage *message, DBusConnection* connection) +{ + DBusMessage *reply; + + reply = dbus_message_new_method_return(message); + if(reply == NULL) + return -1; + if(add_message_to_received(reply, connection)) + return 0; + return -1; }*/ -static int kdbus_init_memfd(DBusTransportSocket* socket_transport) +/** + * Retrieves file descriptor to memory pool from kdbus module. + * It is then used for bulk data sending. + * Triggered when message payload is over MEMFD_SIZE_THRESHOLD + * + */ +static int kdbus_init_memfd(DBusTransportKdbus* socket_transport) { int memfd; - int ret; - if(socket_transport->memfd == -1) - { - ret = ioctl(socket_transport->fd, KDBUS_CMD_MEMFD_NEW, &memfd); - if (ret < 0) { + if (ioctl(socket_transport->fd, KDBUS_CMD_MEMFD_NEW, &memfd) < 0) { _dbus_verbose("KDBUS_CMD_MEMFD_NEW failed: \n"); return -1; } socket_transport->memfd = memfd; - socket_transport->memfd_started = TRUE; _dbus_verbose("kdbus_init_memfd: %d!!\n", socket_transport->memfd); - - } - return 0; -} - -static int kdbus_init_memfdbuf(DBusTransportSocket* socket_transport) -{ - char* buf; - int ret; - - if(socket_transport->memfd_buf == NULL) - { - // needed to mmap. not sure if seal is actally set though - ret = ioctl(socket_transport->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 0); - if (ret < 0) { - _dbus_verbose("memfd sealing failed: %d (%m)\n", errno); - return -1; - } - - buf = mmap(NULL, MEMFD_POOL_SIZE, PROT_WRITE | PROT_READ, MAP_SHARED, socket_transport->memfd, 0); - if (buf == MAP_FAILED) - { - _dbus_verbose("mmap() fd=%i failed:%m", socket_transport->memfd); - return -1; - } - socket_transport->memfd_buf = buf; - } return 0; } -static uint64_t kdbus_get_msg_size_memfd(DBusTransportSocket *socket_transport) -{ - uint64_t msg_size = 0; - - if(socket_transport->memfd_buf == NULL) // memfd - initial message - encoded & not encoded - { - msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_memfd)); - - } else { // memfd - regular data - encoded & not encoded - _dbus_verbose("create message - memfd regular vector data"); - msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); - } - - return msg_size; -} - -static struct kdbus_msg* kdbus_init_msg(DBusTransportSocket *socket_transport, const char* name, __u64 dst_id, uint64_t body_size) +/** + * Initiates Kdbus message structure. + * Calculates it's size, allocates memory and fills some fields. + * @param name Well-known name or NULL + * @param dst_id Numeric id of recipient + * @param body_size size of message body if present + * @param use_memfd flag to build memfd message + * @param fds_count number of file descriptors used + * @param transport transport + * @return initialized kdbus message + */ +static struct kdbus_msg* kdbus_init_msg(const char* name, __u64 dst_id, uint64_t body_size, dbus_bool_t use_memfd, int fds_count, DBusTransportKdbus *transport) { struct kdbus_msg* msg; uint64_t msg_size; msg_size = sizeof(struct kdbus_msg); - if(TRUE == socket_transport->memfd_started) // bulk data - memfd - encoded and plain - msg_size += kdbus_get_msg_size_memfd(socket_transport); + if(use_memfd == TRUE) // bulk data - memfd + msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_memfd)); else - { - msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); - if(body_size) - msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); - } + { + msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); //header is a must + while(body_size > KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE) + { + msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); + body_size -= KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE; + } + if(body_size) + msg_size += KDBUS_ITEM_SIZE(sizeof(struct kdbus_vec)); + } + + if(fds_count) + msg_size += KDBUS_ITEM_SIZE(sizeof(int)*fds_count); if (name) msg_size += KDBUS_ITEM_SIZE(strlen(name) + 1); else if (dst_id == KDBUS_DST_ID_BROADCAST) - msg_size += KDBUS_PART_HEADER_SIZE + KDBUS_BLOOM_SIZE_BYTES; + msg_size += KDBUS_PART_HEADER_SIZE + transport->bloom_size; msg = malloc(msg_size); if (!msg) @@ -225,367 +259,273 @@ static struct kdbus_msg* kdbus_init_msg(DBusTransportSocket *socket_transport, c memset(msg, 0, msg_size); msg->size = msg_size; - msg->src_id = strtoll(dbus_bus_get_unique_name(socket_transport->base.connection), NULL , 10); msg->payload_type = KDBUS_PAYLOAD_DBUS1; msg->dst_id = name ? 0 : dst_id; + msg->src_id = strtoull(dbus_bus_get_unique_name(transport->base.connection), NULL , 10); return msg; } -/* - * once memfd is switched, it is used for all future data +/** + * Builds and sends kdbus message using DBus message. + * Decide whether used payload vector or memfd memory pool. + * Handles broadcasts and unicast messages, and passing of Unix fds. + * Does error handling. + * TODO refactor to be more compact * - * TODO memfd works for 1-to-1 communication, breaks when there are 2 clients + * @param transport transport + * @param message DBus message to be sent + * @return size of data sent */ -static int kdbus_write_msg(DBusTransportSocket *transport, DBusMessage *message, dbus_bool_t encoded) +static int kdbus_write_msg(DBusTransportKdbus *transport, DBusMessage *message, const char* destination) { - struct kdbus_msg *msg; - struct kdbus_item *item; - const char *name; - uint64_t dst_id = KDBUS_DST_ID_BROADCAST; - const DBusString *header; - const DBusString *body; - uint64_t ret_size = 0; - char ret_size_str[50]; // 50 digit number max - uint64_t body_size = 0; - uint64_t header_size = 0; - int ret; - dbus_bool_t use_memfd; - const int *unix_fds; - unsigned fds_count; - - _dbus_message_get_unix_fds(message, &unix_fds, &fds_count); //todo or to remove - - // determine name and destination id - if((name = dbus_message_get_destination(message))) + struct kdbus_msg *msg; + struct kdbus_item *item; + uint64_t dst_id = KDBUS_DST_ID_BROADCAST; + const DBusString *header; + const DBusString *body; + uint64_t ret_size = 0; + uint64_t body_size = 0; + uint64_t header_size = 0; + dbus_bool_t use_memfd = FALSE; + const int *unix_fds; + unsigned fds_count; + dbus_bool_t autostart; + + // determine destination and destination id + if(destination) { - dst_id = KDBUS_DST_ID_WELL_KNOWN_NAME; - - if((name[0] == ':') && (name[1] == '1') && (name[2] == '.')) /* if name starts with ":1." it is a unique name and should be send as number */ - { - dst_id = strtoll(&name[3], NULL, 10); - name = NULL; - } + dst_id = KDBUS_DST_ID_WELL_KNOWN_NAME; + if((destination[0] == ':') && (destination[1] == '1') && (destination[2] == '.')) /* if name starts with ":1." it is a unique name and should be send as number */ + { + dst_id = strtoull(&destination[3], NULL, 10); + destination = NULL; + } } - - // get size of data - if(encoded) - ret_size = _dbus_string_get_length (&transport->encoded_outgoing); - else + + _dbus_message_get_network_data (message, &header, &body); + header_size = _dbus_string_get_length(header); + body_size = _dbus_string_get_length(body); + ret_size = header_size + body_size; + + // check whether we can and should use memfd + if((dst_id != KDBUS_DST_ID_BROADCAST) && (ret_size > MEMFD_SIZE_THRESHOLD)) { - _dbus_message_get_network_data (message, &header, &body); - header_size = _dbus_string_get_length(header); - body_size = _dbus_string_get_length(body); - ret_size = header_size + body_size; + use_memfd = TRUE; + kdbus_init_memfd(transport); } - // check if message size is big enough to use memfd kdbus transport - use_memfd = ret_size > MEMFD_SIZE_THRESHOLD ? TRUE : FALSE; + _dbus_message_get_unix_fds(message, &unix_fds, &fds_count); - if(use_memfd) kdbus_init_memfd(transport); - - // init basic message fields - msg = kdbus_init_msg(transport, name, dst_id, body_size); //todo add fds - msg->cookie = dbus_message_get_serial(message); - - // build message contents - item = msg->items; + // init basic message fields + msg = kdbus_init_msg(destination, dst_id, body_size, use_memfd, fds_count, transport); + msg->cookie = dbus_message_get_serial(message); + autostart = dbus_message_get_auto_start (message); + if(!autostart) + msg->flags |= KDBUS_MSG_FLAGS_NO_AUTO_START; - // case 1 - bulk data transfer - memfd - encoded and plain - if(TRUE == transport->memfd_started) + // build message contents + item = msg->items; + + if(use_memfd) { - // initial memfd message - if(transport->memfd_buf == NULL) + char *buf; + + if(ioctl(transport->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 0) < 0) { - item->type = KDBUS_MSG_PAYLOAD_MEMFD; - item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_memfd); - item->memfd.size = ret_size; - item->memfd.fd = transport->memfd; - - // we still need to send normal data with memfd - if(encoded) - ret = write(transport->memfd, &transport->encoded_outgoing, ret_size); - else - { - ret = write(transport->memfd, _dbus_string_get_const_data(header), header_size); - if(body_size) - ret = write(transport->memfd, _dbus_string_get_const_data(body), body_size); - } - - if (ret < 0) { - _dbus_verbose("writing data failed: %d (%m)\n", errno); - ret_size = -1; - goto out; - } - - // seal data - kdbus module needs it - ret = ioctl(transport->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 1); - if (ret < 0) { - _dbus_verbose("memfd sealing failed: %d (%m)\n", errno); - ret_size = -1; - goto out; - } - // just data - } else { - _dbus_verbose("memfd - just data\n"); - - if(encoded) - memcpy(transport->memfd_buf, &transport->encoded_outgoing, ret_size); - else { - memcpy(transport->memfd_buf, _dbus_string_get_const_data(header), header_size); - if(body_size) - { - transport->memfd_buf += header_size; - memcpy(transport->memfd_buf, _dbus_string_get_const_data(body), body_size); - transport->memfd_buf -= header_size; - } - } - - item->type = KDBUS_MSG_PAYLOAD_VEC; - item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); - // send information about size of data - sprintf(ret_size_str, "%llu", (unsigned long long)ret_size); - item->vec.address = (uint64_t) ret_size_str; - item->vec.size = 50; // size of the string above + _dbus_verbose("memfd sealing failed: \n"); + goto out; } - // case 2 - small encoded - don't use memfd - } else if(encoded) { - _dbus_verbose("sending encoded data\n"); + buf = mmap(NULL, ret_size, PROT_WRITE, MAP_SHARED, transport->memfd, 0); + if (buf == MAP_FAILED) + { + _dbus_verbose("mmap() fd=%i failed:%m", transport->memfd); + goto out; + } - item->type = KDBUS_MSG_PAYLOAD_VEC; - item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); - item->vec.address = (unsigned long) &transport->encoded_outgoing; - item->vec.size = _dbus_string_get_length (&transport->encoded_outgoing); + memcpy(buf, _dbus_string_get_const_data(header), header_size); + if(body_size) { + buf+=header_size; + memcpy(buf, _dbus_string_get_const_data(body), body_size); + buf-=header_size; + } - // case 3 - small not encoded - don't use memfd - } else { + munmap(buf, ret_size); - _dbus_verbose("sending normal vector data\n"); + // seal data - kdbus module needs it + if(ioctl(transport->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 1) < 0) { + _dbus_verbose("memfd sealing failed: %d (%m)\n", errno); + ret_size = -1; + goto out; + } - item->type = KDBUS_MSG_PAYLOAD_VEC; - item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); - item->vec.address = (unsigned long) _dbus_string_get_const_data(header); - item->vec.size = header_size; + item->type = KDBUS_MSG_PAYLOAD_MEMFD; + item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_memfd); + item->memfd.size = ret_size; + item->memfd.fd = transport->memfd; + } + else + { + _dbus_verbose("sending normal vector data\n"); + MSG_ITEM_BUILD_VEC(_dbus_string_get_const_data(header), header_size); - if(body_size) + if(body_size) { - item = KDBUS_PART_NEXT(item); - item->type = KDBUS_MSG_PAYLOAD_VEC; - item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); - item->vec.address = (unsigned long) _dbus_string_get_const_data(body); - item->vec.size = body_size; + const char* body_data; + + body_data = _dbus_string_get_const_data(body); + while(body_size > KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE) + { + _dbus_verbose("body attaching\n"); + item = KDBUS_PART_NEXT(item); + MSG_ITEM_BUILD_VEC(body_data, KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE); + body_data += KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE; + body_size -= KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE; + } + if(body_size) + { + _dbus_verbose("body attaching\n"); + item = KDBUS_PART_NEXT(item); + MSG_ITEM_BUILD_VEC(body_data, body_size); + } } } - if(fds_count) //todo + if(fds_count) { - + item = KDBUS_PART_NEXT(item); + item->type = KDBUS_MSG_FDS; + item->size = KDBUS_PART_HEADER_SIZE + (sizeof(int) * fds_count); + memcpy(item->fds, unix_fds, sizeof(int) * fds_count); } - if (name) - { - item = KDBUS_PART_NEXT(item); - item->type = KDBUS_MSG_DST_NAME; - item->size = KDBUS_PART_HEADER_SIZE + strlen(name) + 1; - strcpy(item->str, name); - } - else if (dst_id == KDBUS_DST_ID_BROADCAST) - { - item = KDBUS_PART_NEXT(item); - item->type = KDBUS_MSG_BLOOM; - item->size = KDBUS_PART_HEADER_SIZE + KDBUS_BLOOM_SIZE_BYTES; - strncpy(item->data, dbus_message_get_interface(message), KDBUS_BLOOM_SIZE_BYTES); - } - - again: - if (ioctl(transport->fd, KDBUS_CMD_MSG_SEND, msg)) - { - if(errno == EINTR) - goto again; - if((errno == ESRCH) || (errno == ENXIO)) //when recipient is not available on the bus - { - DBusMessage *errMessage = NULL; - dbus_uint32_t replySerial; - - errMessage = generate_local_error_message(msg->cookie, DBUS_ERROR_SERVICE_UNKNOWN, NULL); - if(errMessage == NULL) - { - ret_size = -1; - goto out; - } - replySerial = dbus_message_get_reply_serial(message); - if(replySerial) - dbus_message_set_reply_serial(errMessage, replySerial); - if (!add_message_to_received(errMessage, (DBusTransport*)transport)) - ret_size = -1; - goto out; - } - _dbus_verbose("kdbus error sending message: err %d (%m)\n", errno); - ret_size = -1; - } - - // memfd - mmap after initial seal&send memfd - if(use_memfd) kdbus_init_memfdbuf(transport); + if (destination) + { + item = KDBUS_PART_NEXT(item); + item->type = KDBUS_MSG_DST_NAME; + item->size = KDBUS_PART_HEADER_SIZE + strlen(destination) + 1; + memcpy(item->str, destination, item->size - KDBUS_PART_HEADER_SIZE); + } + else if (dst_id == KDBUS_DST_ID_BROADCAST) + { + item = KDBUS_PART_NEXT(item); + item->type = KDBUS_MSG_BLOOM; + item->size = KDBUS_PART_HEADER_SIZE + transport->bloom_size; + strncpy(item->data, dbus_message_get_interface(message), transport->bloom_size); + } -out: - free(msg); + again: + if (ioctl(transport->fd, KDBUS_CMD_MSG_SEND, msg)) + { + if(errno == EINTR) + goto again; + else if(errno == ENXIO) //no such id on the bus + { + if(!reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Name \"%s\" does not exist", dbus_message_get_destination(message), message, transport->base.connection)) + goto out; + } + else if((errno == ESRCH) || (errno = EADDRNOTAVAIL)) //when well known name is not available on the bus + { + if(autostart) + { + if(!reply_with_error(DBUS_ERROR_SERVICE_UNKNOWN, "The name %s was not provided by any .service files", dbus_message_get_destination(message), message, transport->base.connection)) + goto out; + } + else + if(!reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Name \"%s\" does not exist", dbus_message_get_destination(message), message, transport->base.connection)) + goto out; + } + _dbus_verbose("kdbus error sending message: err %d (%m)\n", errno); + ret_size = -1; + } + out: + free(msg); + if(use_memfd) + close(transport->memfd); - return ret_size; + return ret_size; } -static int64_t kdbus_NameQuery(DBusTransport *transport, char* name, int fd) +/** + * Performs kdbus hello - registration on the kdbus bus + * + * @param name place to store unique name given by bus + * @param transportS transport structure + * @returns #TRUE on success + */ +static dbus_bool_t bus_register_kdbus(char* name, DBusTransportKdbus* transportS) { - struct kdbus_cmd_name_info *msg; - struct kdbus_item *item; - uint64_t size; - int64_t ret; - uint64_t item_size; - - item_size = KDBUS_PART_HEADER_SIZE + strlen(name) + 1; - item_size = (item_size < 56) ? 56 : item_size; - size = sizeof(struct kdbus_cmd_name_info) + item_size; - - msg = malloc(size); - if (!msg) + struct kdbus_cmd_hello __attribute__ ((__aligned__(8))) hello; + + hello.conn_flags = KDBUS_HELLO_ACCEPT_FD/* | + KDBUS_HELLO_ATTACH_COMM | + KDBUS_HELLO_ATTACH_EXE | + KDBUS_HELLO_ATTACH_CMDLINE | + KDBUS_HELLO_ATTACH_CAPS | + KDBUS_HELLO_ATTACH_CGROUP | + KDBUS_HELLO_ATTACH_SECLABEL | + KDBUS_HELLO_ATTACH_AUDIT*/; + hello.size = sizeof(struct kdbus_cmd_hello); + hello.pool_size = RECEIVE_POOL_SIZE; + + if (ioctl(transportS->fd, KDBUS_CMD_HELLO, &hello)) { - _dbus_verbose("Error allocating memory for: %s,%s\n", _dbus_strerror (errno), _dbus_error_from_errno (errno)); - return -1; + _dbus_verbose ("Failed to send hello: %m, %d",errno); + return FALSE; } - memset(msg, 0, size); - msg->size = size; - - item = msg->items; - item->type = KDBUS_NAME_INFO_ITEM_NAME; - item->size = item_size; - strcpy(item->str, name); + sprintf(name, "%llu", (unsigned long long)hello.id); + _dbus_verbose("-- Our peer ID is: %s\n", name); + transportS->bloom_size = hello.bloom_size; - again: - if ((ret = ioctl(fd, KDBUS_CMD_NAME_QUERY, msg))) + transportS->kdbus_mmap_ptr = mmap(NULL, RECEIVE_POOL_SIZE, PROT_READ, MAP_SHARED, transportS->fd, 0); + if (transportS->kdbus_mmap_ptr == MAP_FAILED) { - if(errno == EINTR) - goto again; - ret = -errno; + _dbus_verbose("Error when mmap: %m, %d",errno); + return FALSE; } - else - ret = msg->id; - free(msg); - return ret; + return TRUE; } -static dbus_bool_t emulateOrgFreedesktopDBus(DBusTransport *transport, DBusMessage *message, int fd) +/** + * Handles messages sent to bus daemon - "org.freedesktop.DBus" and translates them to appropriate + * kdbus ioctl commands. Than translate kdbus reply into dbus message and put it into recived messages queue. + * + * Now it captures only Hello message, which must be handled locally. + * All the rest is passed to dbus-daemon. + */ +static int emulateOrgFreedesktopDBus(DBusTransport *transport, DBusMessage *message) { - int64_t ret; + if(!strcmp(dbus_message_get_member(message), "Hello")) + { + char* name = NULL; - if(!strcmp(dbus_message_get_member(message), "GetNameOwner")) - { - char* name = NULL; + name = malloc(snprintf(name, 0, ":1.%llu0", ULLONG_MAX)); + if(name == NULL) + return -1; + strcpy(name, ":1."); + if(!bus_register_kdbus(&name[3], (DBusTransportKdbus*)transport)) + goto out; + if(!register_kdbus_policy(&name[3], transport, geteuid())) + goto out; - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - _dbus_verbose ("Name to discover: %s !!!! !!!!\n", name); - ret = kdbus_NameQuery(transport, name, fd); - if(ret > 0) //unique id of the name - { - DBusMessage *reply; - DBusMessageIter args; - char unique_name[(unsigned int)(sizeof(ret)*2.5 + 4)]; - const char* pString = unique_name; - - sprintf(unique_name, ":1.%lld", (long long int)ret); - _dbus_verbose("Unique name discovered:%s!!! !!!!\n", unique_name); - reply = dbus_message_new_method_return(message); - if(reply == NULL) - return FALSE; - dbus_message_iter_init_append(reply, &args); - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pString)) - return FALSE; - if(add_message_to_received(reply, transport)) - return TRUE; - } - else if(ret == -ENOENT) //name has no owner - { - DBusMessage *errMessage; - dbus_uint32_t replySerial; - - errMessage = generate_local_error_message(1, DBUS_ERROR_NAME_HAS_NO_OWNER, NULL); - if(errMessage == NULL) - return FALSE; - replySerial = dbus_message_get_reply_serial(message); - if(replySerial) - dbus_message_set_reply_serial(errMessage, replySerial); - if (add_message_to_received(errMessage, transport)) - return TRUE; - } - else - _dbus_verbose("kdbus error sending name query: err %d (%m)\n", errno); - } - else if(!strcmp(dbus_message_get_member(message), "NameHasOwner")) - { - char* name = NULL; - DBusMessage *reply; - DBusMessageIter args; - dbus_bool_t result; - - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - _dbus_verbose ("Name to discover: %s !!!! !!!!\n", name); - ret = kdbus_NameQuery(transport, name, fd); - - result = (ret > 0) ? TRUE : FALSE; - _dbus_verbose("Discovery: %d !!! !!!!\n", (int)result); - reply = dbus_message_new_method_return(message); - if(reply == NULL) - return FALSE; - dbus_message_iter_init_append(reply, &args); - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_BOOLEAN, &result)) - return FALSE; - if(add_message_to_received(reply, transport)) - return TRUE; - } - else //temporarily we send that info but methods below should be implemented - { - DBusMessage *reply; - dbus_uint32_t replySerial; - - reply = generate_local_error_message(1, DBUS_ERROR_UNKNOWN_METHOD, NULL); - if(reply == NULL) - return FALSE; - replySerial = dbus_message_get_reply_serial(message); - if(replySerial) - dbus_message_set_reply_serial(reply, replySerial); - if(add_message_to_received(reply, transport)) - return TRUE; - } - /*else if(!strcmp(dbus_message_get_member(message), "ListNames")) - { - //todo - } - else if(!strcmp(dbus_message_get_member(message), "ListActivatableNames")) - { - //todo - } - else if(!strcmp(dbus_message_get_member(message), "StartServiceByName")) - { - //todo - } - else if(!strcmp(dbus_message_get_member(message), "UpdateActivationEnvironment")) - { - //todo - } - else if(!strcmp(dbus_message_get_member(message), "GetConnectionUnixUser")) - { - //todo - } - else if(!strcmp(dbus_message_get_member(message), "GetId")) - { - //todo - }*/ + ((DBusTransportKdbus*)transport)->sender = name; + + if(!reply_1_data(message, DBUS_TYPE_STRING, &name, transport->connection)) + return 0; + + out: + free(name); + } + else + return 1; //send to daemon - return FALSE; + return -1; } -#if KDBUS_DECODE_DEBUG == 1 +#if KDBUS_MSG_DECODE_DEBUG == 1 static char *msg_id(uint64_t id, char *buf) { if (id == 0) @@ -650,6 +590,14 @@ TABLE(PAYLOAD) = { }; LOOKUP(PAYLOAD); +/** + * Puts locally generated message into received data buffer. + * Use only during receiving phase! + * + * @param message message to load + * @param data place to load message + * @return size of message + */ static int put_message_into_data(DBusMessage *message, char* data) { int ret_size; @@ -657,6 +605,7 @@ static int put_message_into_data(DBusMessage *message, char* data) const DBusString *body; int size; + dbus_message_set_serial(message, 1); dbus_message_lock (message); _dbus_message_get_network_data (message, &header, &body); ret_size = _dbus_string_get_length(header); @@ -669,34 +618,67 @@ static int put_message_into_data(DBusMessage *message, char* data) return ret_size; } -static void kdbus_reset_memfd(DBusTransportSocket* socket_transport) +/** + * Get the length of the kdbus message content. + * + * @param msg kdbus message + * @return the length of the kdbus message + */ +static int kdbus_message_size(const struct kdbus_msg* msg) { - if(socket_transport->memfd_buf != NULL) { - munmap(socket_transport->memfd_buf, MEMFD_POOL_SIZE); - socket_transport->memfd_buf = NULL; - close(socket_transport->memfd); - socket_transport->memfd = -1; - socket_transport->memfd_started = FALSE; - } + const struct kdbus_item *item; + int ret_size = 0; + + KDBUS_PART_FOREACH(item, msg, items) + { + if (item->size <= KDBUS_PART_HEADER_SIZE) + { + _dbus_verbose(" +%s (%llu bytes) invalid data record\n", enum_MSG(item->type), item->size); + return -1; + } + switch (item->type) + { + case KDBUS_MSG_PAYLOAD_OFF: + ret_size += item->vec.size; + break; + case KDBUS_MSG_PAYLOAD_MEMFD: + ret_size += item->memfd.size; + break; + default: + break; + } + } + + return ret_size; } -static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTransportSocket* socket_transport) +/** + * Decodes kdbus message in order to extract dbus message and put it into data and fds. + * Also captures and decodes kdbus error messages and kdbus kernel broadcasts and converts + * all of them into dbus messages. + * + * @param msg kdbus message + * @param data place to copy dbus message to + * @param kdbus_transport transport + * @param fds place to store file descriptors received + * @param n_fds place to store quantity of file descriptor + * @return number of dbus message's bytes received or -1 on error + */ +static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTransportKdbus* kdbus_transport, int* fds, int* n_fds) { - const struct kdbus_item *item = msg->items; + const struct kdbus_item *item; int ret_size = 0; DBusMessage *message = NULL; DBusMessageIter args; - char dbus_name[(unsigned int)(sizeof(item->name_change.new_id)*2.5 + 4)]; - const char* pDBusName = dbus_name; - const char* dbus = "org.freedesktop.DBus"; const char* emptyString = ""; - const char* pString = NULL; - void* mmap_ptr; -#if KDBUS_DECODE_DEBUG == 1 + const char* pString = NULL; + char dbus_name[(unsigned int)(snprintf((char*)pString, 0, ":1.%llu0", ULLONG_MAX))]; + const char* pDBusName = dbus_name; +#if KDBUS_MSG_DECODE_DEBUG == 1 char buf[32]; #endif -#if KDBUS_DECODE_DEBUG == 1 +#if KDBUS_MSG_DECODE_DEBUG == 1 _dbus_verbose("MESSAGE: %s (%llu bytes) flags=0x%llx, %s → %s, cookie=%llu, timeout=%llu\n", enum_PAYLOAD(msg->payload_type), (unsigned long long) msg->size, (unsigned long long) msg->flags, @@ -704,88 +686,69 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo (unsigned long long) msg->cookie, (unsigned long long) msg->timeout_ns); #endif - mmap_ptr = socket_transport->kdbus_mmap_ptr; + *n_fds = 0; KDBUS_PART_FOREACH(item, msg, items) { if (item->size <= KDBUS_PART_HEADER_SIZE) { _dbus_verbose(" +%s (%llu bytes) invalid data record\n", enum_MSG(item->type), item->size); - continue; //todo to be discovered and rewritten + break; //??? continue (because dbus will find error) or break } switch (item->type) { case KDBUS_MSG_PAYLOAD_OFF: - { - char *s; - uint64_t size = item->vec.size; - - retry: - if(socket_transport->memfd_buf == NULL) // not memfd data - { - _dbus_verbose("memfd_buf == null\n"); - memcpy(data, (char *)mmap_ptr + item->vec.offset, item->vec.size); - data += item->vec.size; - ret_size += item->vec.size; - size = item->vec.size; - } else { // memfd data - _dbus_verbose("memfd_buf != null\n"); - s = (char *)mmap_ptr + item->vec.offset; - - size = atoi(s); - _dbus_verbose("data size : %llu\n", (unsigned long long)size); - - if(size == 0) /* likely? non-memfd message sent from new peer */ - { - kdbus_reset_memfd(socket_transport); - goto retry; - } - - memcpy(data, socket_transport->memfd_buf, size); - data += size; - ret_size += size; - } + memcpy(data, (char *)kdbus_transport->kdbus_mmap_ptr + item->vec.offset, item->vec.size); + data += item->vec.size; + ret_size += item->vec.size; - _dbus_verbose(" +%s (%llu bytes) off=%llu size=%llu\n", + _dbus_verbose(" +%s (%llu bytes) off=%llu size=%llu\n", enum_MSG(item->type), item->size, (unsigned long long)item->vec.offset, - (unsigned long long)size); + (unsigned long long)item->vec.size); break; - } case KDBUS_MSG_PAYLOAD_MEMFD: { char *buf; uint64_t size; - size = item->memfd.size; - + size = item->memfd.size; _dbus_verbose("memfd.size : %llu\n", (unsigned long long)size); - - buf = mmap(NULL, MEMFD_POOL_SIZE, PROT_READ | PROT_WRITE , MAP_SHARED, item->memfd.fd, 0); - if (buf == MAP_FAILED) + buf = mmap(NULL, size, PROT_READ , MAP_SHARED, item->memfd.fd, 0); + if (buf == MAP_FAILED) { _dbus_verbose("mmap() fd=%i failed:%m", item->memfd.fd); return -1; } - - socket_transport->memfd_buf = buf; // save for unmapping before send reply - socket_transport->memfd = item->memfd.fd; // save for sending reply - socket_transport->memfd_started = TRUE; - memcpy(data, buf, size); // TODO set internal buffer to this mmaped buf to save copy + memcpy(data, buf, size); data += size; ret_size += size; - _dbus_verbose(" +%s (%llu bytes) off=%llu size=%llu\n", + munmap(buf, size); + + _dbus_verbose(" +%s (%llu bytes) off=%llu size=%llu\n", enum_MSG(item->type), item->size, (unsigned long long)item->vec.offset, (unsigned long long)item->vec.size); - break; + break; + } + + case KDBUS_MSG_FDS: + { + int i; + + *n_fds = (item->size - KDBUS_PART_HEADER_SIZE) / sizeof(int); + memcpy(fds, item->fds, *n_fds * sizeof(int)); + for (i = 0; i < *n_fds; i++) + _dbus_fd_set_close_on_exec(fds[i]); + break; } -#if KDBUS_DECODE_DEBUG == 1 + +#if KDBUS_MSG_DECODE_DEBUG == 1 case KDBUS_MSG_SRC_CREDS: _dbus_verbose(" +%s (%llu bytes) uid=%lld, gid=%lld, pid=%lld, tid=%lld, starttime=%lld\n", enum_MSG(item->type), item->size, @@ -806,7 +769,7 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo case KDBUS_MSG_SRC_CMDLINE: case KDBUS_MSG_SRC_NAMES: { - size_t size = item->size - KDBUS_PART_HEADER_SIZE; + __u64 size = item->size - KDBUS_PART_HEADER_SIZE; const char *str = item->str; int count = 0; @@ -882,15 +845,27 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo ret_size = put_message_into_data(message, data); break; + case KDBUS_MSG_REPLY_DEAD: + _dbus_verbose(" +%s (%llu bytes) cookie=%llu\n", + enum_MSG(item->type), item->size, msg->cookie_reply); + + message = generate_local_error_message(msg->cookie_reply, DBUS_ERROR_NAME_HAS_NO_OWNER, NULL); + if(message == NULL) + { + ret_size = -1; + goto out; + } + + ret_size = put_message_into_data(message, data); + break; + case KDBUS_MSG_NAME_ADD: _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, flags=0x%llx\n", enum_MSG(item->type), (unsigned long long) item->size, item->name_change.name, item->name_change.old_id, item->name_change.new_id, item->name_change.flags); - message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal - dbus, // interface name of the signal - "NameOwnerChanged"); // name of the signal + message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameOwnerChanged"); if(message == NULL) { ret_size = -1; @@ -901,24 +876,10 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo pString = item->name_change.name; _dbus_verbose ("Name added: %s\n", pString); dbus_message_iter_init_append(message, &args); - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING,&pString)) - { - ret_size = -1; - goto out; - } - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &emptyString)) - { - ret_size = -1; - goto out; - } - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName)) - { - ret_size = -1; - goto out; - } - - dbus_message_set_sender(message, dbus); - dbus_message_set_serial(message, 1); + ITER_APPEND_STR(pString) + ITER_APPEND_STR(emptyString) + ITER_APPEND_STR(pDBusName) + dbus_message_set_sender(message, DBUS_SERVICE_DBUS); ret_size = put_message_into_data(message, data); break; @@ -929,9 +890,7 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo item->name_change.name, item->name_change.old_id, item->name_change.new_id, item->name_change.flags); - message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal - dbus, // interface name of the signal - "NameOwnerChanged"); // name of the signal + message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameOwnerChanged"); // name of the signal if(message == NULL) { ret_size = -1; @@ -942,24 +901,10 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo pString = item->name_change.name; _dbus_verbose ("Name removed: %s\n", pString); dbus_message_iter_init_append(message, &args); - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING,&pString)) - { - ret_size = -1; - goto out; - } - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName)) - { - ret_size = -1; - goto out; - } - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &emptyString)) - { - ret_size = -1; - goto out; - } - - dbus_message_set_sender(message, dbus); - dbus_message_set_serial(message, 1); + ITER_APPEND_STR(pString) + ITER_APPEND_STR(pDBusName) + ITER_APPEND_STR(emptyString) + dbus_message_set_sender(message, DBUS_SERVICE_DBUS); ret_size = put_message_into_data(message, data); break; @@ -970,9 +915,7 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo item->name_change.name, item->name_change.old_id, item->name_change.new_id, item->name_change.flags); - message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal - dbus, // interface name of the signal - "NameOwnerChanged"); // name of the signal + message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameOwnerChanged"); if(message == NULL) { ret_size = -1; @@ -983,26 +926,12 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo pString = item->name_change.name; _dbus_verbose ("Name changed: %s\n", pString); dbus_message_iter_init_append(message, &args); - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING,&pString)) - { - ret_size = -1; - goto out; - } - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName)) - { - ret_size = -1; - goto out; - } + ITER_APPEND_STR(pString) + ITER_APPEND_STR(pDBusName) sprintf(&dbus_name[3],"%llu",item->name_change.new_id); - _dbus_verbose ("New id: %s\n", pDBusName); //todo to be removed - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName)) - { - ret_size = -1; - goto out; - } - - dbus_message_set_sender(message, dbus); - dbus_message_set_serial(message, 1); + _dbus_verbose ("New id: %s\n", pDBusName); + ITER_APPEND_STR(pDBusName) + dbus_message_set_sender(message, DBUS_SERVICE_DBUS); ret_size = put_message_into_data(message, data); break; @@ -1013,9 +942,7 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo (unsigned long long) item->id_change.id, (unsigned long long) item->id_change.flags); - message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal - dbus, // interface name of the signal - "NameOwnerChanged"); // name of the signal + message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameOwnerChanged"); if(message == NULL) { ret_size = -1; @@ -1024,24 +951,10 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo sprintf(dbus_name,":1.%llu",item->id_change.id); dbus_message_iter_init_append(message, &args); - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName)) - { - ret_size = -1; - goto out; - } - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &emptyString)) - { - ret_size = -1; - goto out; - } - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName)) - { - ret_size = -1; - goto out; - } - - dbus_message_set_sender(message, dbus); - dbus_message_set_serial(message, 1); + ITER_APPEND_STR(pDBusName) + ITER_APPEND_STR(emptyString) + ITER_APPEND_STR(pDBusName) + dbus_message_set_sender(message, DBUS_SERVICE_DBUS); ret_size = put_message_into_data(message, data); break; @@ -1052,9 +965,7 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo (unsigned long long) item->id_change.id, (unsigned long long) item->id_change.flags); - message = dbus_message_new_signal("/org/freedesktop/DBus", // object name of the signal - dbus, // interface name of the signal - "NameOwnerChanged"); // name of the signal + message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameOwnerChanged"); if(message == NULL) { ret_size = -1; @@ -1063,28 +974,14 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo sprintf(dbus_name,":1.%llu",item->id_change.id); dbus_message_iter_init_append(message, &args); - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName)) - { - ret_size = -1; - goto out; - } - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pDBusName)) - { - ret_size = -1; - goto out; - } - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &emptyString)) - { - ret_size = -1; - goto out; - } - - dbus_message_set_sender(message, dbus); - dbus_message_set_serial(message, 1); + ITER_APPEND_STR(pDBusName) + ITER_APPEND_STR(pDBusName) + ITER_APPEND_STR(emptyString) + dbus_message_set_sender(message, DBUS_SERVICE_DBUS); ret_size = put_message_into_data(message, data); break; -#if KDBUS_DECODE_DEBUG == 1 +#if KDBUS_MSG_DECODE_DEBUG == 1 default: _dbus_verbose(" +%s (%llu bytes)\n", enum_MSG(item->type), item->size); break; @@ -1092,7 +989,7 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo } } -#if KDBUS_DECODE_DEBUG == 1 +#if KDBUS_MSG_DECODE_DEBUG == 1 if ((char *)item - ((char *)msg + msg->size) >= 8) _dbus_verbose("invalid padding at end of message\n"); @@ -1104,20 +1001,24 @@ out: return ret_size; } -static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString *buffer) +/** + * Reads message from kdbus and puts it into dbus buffer and fds + * + * @param transport transport + * @param buffer place to copy received message to + * @param fds place to store file descriptors sent in the message + * @param n_fds place to store number of file descriptors + * @return size of received message on success, -1 on error + */ +static int kdbus_read_message(DBusTransportKdbus *socket_transport, DBusString *buffer, int* fds, int* n_fds) { - int ret_size; - uint64_t offset; + int ret_size, buf_size; + uint64_t __attribute__ ((__aligned__(8))) offset; struct kdbus_msg *msg; char *data; + int start; - _dbus_assert (socket_transport->max_bytes_read_per_iteration >= 0); - if (!_dbus_string_lengthen (buffer, socket_transport->max_bytes_read_per_iteration)) - { - errno = ENOMEM; - return -1; - } - data = _dbus_string_get_data_len (buffer, 0, socket_transport->max_bytes_read_per_iteration); + start = _dbus_string_get_length (buffer); again: if (ioctl(socket_transport->fd, KDBUS_CMD_MSG_RECV, &offset) < 0) @@ -1125,14 +1026,41 @@ static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString if(errno == EINTR) goto again; _dbus_verbose("kdbus error receiving message: %d (%m)\n", errno); - _dbus_string_set_length (buffer, 0); + _dbus_string_set_length (buffer, start); return -1; } msg = (struct kdbus_msg *)((char*)socket_transport->kdbus_mmap_ptr + offset); - ret_size = kdbus_decode_msg(msg, data, socket_transport); - _dbus_string_set_length (buffer, ret_size); + buf_size = kdbus_message_size(msg); + if (buf_size == -1) + { + _dbus_verbose("kdbus error - too short message: %d (%m)\n", errno); + return -1; + } + + /* What is the maximum size of the locally generated message? + I just assume 2048 bytes */ + buf_size = MAX(buf_size, 2048); + + if (!_dbus_string_lengthen (buffer, buf_size)) + { + errno = ENOMEM; + return -1; + } + data = _dbus_string_get_data_len (buffer, start, buf_size); + + ret_size = kdbus_decode_msg(msg, data, socket_transport, fds, n_fds); + + if(ret_size == -1) /* error */ + { + _dbus_string_set_length (buffer, start); + return -1; + } + else if (buf_size != ret_size) /* case of locally generated message */ + { + _dbus_string_set_length (buffer, start + ret_size); + } again2: if (ioctl(socket_transport->fd, KDBUS_CMD_MSG_RELEASE, &offset) < 0) @@ -1145,61 +1073,64 @@ static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString return ret_size; } - +/* + * copy-paste from socket transport with needed renames only. + */ static void free_watches (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; _dbus_verbose ("start\n"); - if (socket_transport->read_watch) + if (kdbus_transport->read_watch) { if (transport->connection) _dbus_connection_remove_watch_unlocked (transport->connection, - socket_transport->read_watch); - _dbus_watch_invalidate (socket_transport->read_watch); - _dbus_watch_unref (socket_transport->read_watch); - socket_transport->read_watch = NULL; + kdbus_transport->read_watch); + _dbus_watch_invalidate (kdbus_transport->read_watch); + _dbus_watch_unref (kdbus_transport->read_watch); + kdbus_transport->read_watch = NULL; } - if (socket_transport->write_watch) + if (kdbus_transport->write_watch) { if (transport->connection) _dbus_connection_remove_watch_unlocked (transport->connection, - socket_transport->write_watch); - _dbus_watch_invalidate (socket_transport->write_watch); - _dbus_watch_unref (socket_transport->write_watch); - socket_transport->write_watch = NULL; + kdbus_transport->write_watch); + _dbus_watch_invalidate (kdbus_transport->write_watch); + _dbus_watch_unref (kdbus_transport->write_watch); + kdbus_transport->write_watch = NULL; } _dbus_verbose ("end\n"); } +/* + * copy-paste from socket transport with needed renames only. + */ static void -socket_finalize (DBusTransport *transport) +transport_finalize (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - _dbus_verbose ("\n"); free_watches (transport); - _dbus_string_free (&socket_transport->encoded_outgoing); - _dbus_string_free (&socket_transport->encoded_incoming); - _dbus_transport_finalize_base (transport); - _dbus_assert (socket_transport->read_watch == NULL); - _dbus_assert (socket_transport->write_watch == NULL); + _dbus_assert (((DBusTransportKdbus*) transport)->read_watch == NULL); + _dbus_assert (((DBusTransportKdbus*) transport)->write_watch == NULL); dbus_free (transport); } +/* + * copy-paste from socket transport with needed renames only. + */ static void check_write_watch (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; dbus_bool_t needed; if (transport->connection == NULL) @@ -1207,108 +1138,63 @@ check_write_watch (DBusTransport *transport) if (transport->disconnected) { - _dbus_assert (socket_transport->write_watch == NULL); + _dbus_assert (kdbus_transport->write_watch == NULL); return; } _dbus_transport_ref (transport); - if (_dbus_transport_get_is_authenticated (transport)) - needed = _dbus_connection_has_messages_to_send_unlocked (transport->connection); - else - { - if (transport->send_credentials_pending) - needed = TRUE; - else - { - DBusAuthState auth_state; - - auth_state = _dbus_auth_do_work (transport->auth); - - /* If we need memory we install the write watch just in case, - * if there's no need for it, it will get de-installed - * next time we try reading. - */ - if (auth_state == DBUS_AUTH_STATE_HAVE_BYTES_TO_SEND || - auth_state == DBUS_AUTH_STATE_WAITING_FOR_MEMORY) - needed = TRUE; - else - needed = FALSE; - } - } + needed = _dbus_connection_has_messages_to_send_unlocked (transport->connection); _dbus_verbose ("check_write_watch(): needed = %d on connection %p watch %p fd = %d outgoing messages exist %d\n", - needed, transport->connection, socket_transport->write_watch, - socket_transport->fd, + needed, transport->connection, kdbus_transport->write_watch, + kdbus_transport->fd, _dbus_connection_has_messages_to_send_unlocked (transport->connection)); _dbus_connection_toggle_watch_unlocked (transport->connection, - socket_transport->write_watch, + kdbus_transport->write_watch, needed); _dbus_transport_unref (transport); } +/* + * copy-paste from socket transport with needed renames only. + */ static void check_read_watch (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; dbus_bool_t need_read_watch; - _dbus_verbose ("fd = %d\n",socket_transport->fd); + _dbus_verbose ("fd = %d\n",kdbus_transport->fd); if (transport->connection == NULL) return; if (transport->disconnected) { - _dbus_assert (socket_transport->read_watch == NULL); + _dbus_assert (kdbus_transport->read_watch == NULL); return; } _dbus_transport_ref (transport); - if (_dbus_transport_get_is_authenticated (transport)) - need_read_watch = + need_read_watch = (_dbus_counter_get_size_value (transport->live_messages) < transport->max_live_messages_size) && (_dbus_counter_get_unix_fd_value (transport->live_messages) < transport->max_live_messages_unix_fds); - else - { - if (transport->receive_credentials_pending) - need_read_watch = TRUE; - else - { - /* The reason to disable need_read_watch when not WAITING_FOR_INPUT - * is to avoid spinning on the file descriptor when we're waiting - * to write or for some other part of the auth process - */ - DBusAuthState auth_state; - - auth_state = _dbus_auth_do_work (transport->auth); - - /* If we need memory we install the read watch just in case, - * if there's no need for it, it will get de-installed - * next time we try reading. If we're authenticated we - * install it since we normally have it installed while - * authenticated. - */ - if (auth_state == DBUS_AUTH_STATE_WAITING_FOR_INPUT || - auth_state == DBUS_AUTH_STATE_WAITING_FOR_MEMORY || - auth_state == DBUS_AUTH_STATE_AUTHENTICATED) - need_read_watch = TRUE; - else - need_read_watch = FALSE; - } - } _dbus_verbose (" setting read watch enabled = %d\n", need_read_watch); _dbus_connection_toggle_watch_unlocked (transport->connection, - socket_transport->read_watch, + kdbus_transport->read_watch, need_read_watch); _dbus_transport_unref (transport); } +/* + * copy-paste from socket transport. + */ static void do_io_error (DBusTransport *transport) { @@ -1317,482 +1203,170 @@ do_io_error (DBusTransport *transport) _dbus_transport_unref (transport); } -/* return value is whether we successfully read any new data. */ -static dbus_bool_t -read_data_into_auth (DBusTransport *transport, - dbus_bool_t *oom) -{ - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - DBusString *buffer; - int bytes_read; - - *oom = FALSE; - - _dbus_auth_get_buffer (transport->auth, &buffer); - - bytes_read = kdbus_read_message(socket_transport, buffer); - - _dbus_auth_return_buffer (transport->auth, buffer, - bytes_read > 0 ? bytes_read : 0); - - if (bytes_read > 0) - { - _dbus_verbose (" read %d bytes in auth phase\n", bytes_read); - return TRUE; - } - else if (bytes_read < 0) - { - /* EINTR already handled for us */ - - if (_dbus_get_is_errno_enomem ()) - { - *oom = TRUE; - } - else if (_dbus_get_is_errno_eagain_or_ewouldblock ()) - ; /* do nothing, just return FALSE below */ - else - { - _dbus_verbose ("Error reading from remote app: %s\n", - _dbus_strerror_from_errno ()); - do_io_error (transport); - } - - return FALSE; - } - else - { - _dbus_assert (bytes_read == 0); - - _dbus_verbose ("Disconnected from remote app\n"); - do_io_error (transport); - - return FALSE; - } -} - -/* Return value is whether we successfully wrote any bytes */ +/* returns false on oom */ static dbus_bool_t -write_data_from_auth (DBusTransport *transport) +do_writing (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - int bytes_written; - const DBusString *buffer; - - if (!_dbus_auth_get_bytes_to_send (transport->auth, - &buffer)) - return FALSE; - - bytes_written = _dbus_write_socket (socket_transport->fd, - buffer, - 0, _dbus_string_get_length (buffer)); + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; + dbus_bool_t oom; + int total = 0; - if (bytes_written > 0) + if (transport->disconnected) { - _dbus_auth_bytes_sent (transport->auth, bytes_written); + _dbus_verbose ("Not connected, not writing anything\n"); return TRUE; } - else if (bytes_written < 0) - { - /* EINTR already handled for us */ - - if (_dbus_get_is_errno_eagain_or_ewouldblock ()) - ; - else - { - _dbus_verbose ("Error writing to remote app: %s\n", - _dbus_strerror_from_errno ()); - do_io_error (transport); - } - } - - return FALSE; -} - -/* FALSE on OOM */ -static dbus_bool_t -exchange_credentials (DBusTransport *transport, - dbus_bool_t do_reading, - dbus_bool_t do_writing) -{ - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - DBusError error = DBUS_ERROR_INIT; - - _dbus_verbose ("exchange_credentials: do_reading = %d, do_writing = %d\n", - do_reading, do_writing); - - if (do_writing && transport->send_credentials_pending) - { - if (_dbus_send_credentials_socket (socket_transport->fd, - &error)) - { - transport->send_credentials_pending = FALSE; - } - else - { - _dbus_verbose ("Failed to write credentials: %s\n", error.message); - dbus_error_free (&error); - do_io_error (transport); - } - } - if (do_reading && transport->receive_credentials_pending) - { - /* FIXME this can fail due to IO error _or_ OOM, broken - * (somewhat tricky to fix since the OOM error can be set after - * we already read the credentials byte, so basically we need to - * separate reading the byte and storing it in the - * transport->credentials). Does not really matter for now - * because storing in credentials never actually fails on unix. - */ - if (_dbus_read_credentials_socket (socket_transport->fd, - transport->credentials, - &error)) - { - transport->receive_credentials_pending = FALSE; - } - else - { - _dbus_verbose ("Failed to read credentials %s\n", error.message); - dbus_error_free (&error); - do_io_error (transport); - } - } - if (!(transport->send_credentials_pending || - transport->receive_credentials_pending)) - { - if (!_dbus_auth_set_credentials (transport->auth, - transport->credentials)) - return FALSE; - } - - return TRUE; -} - -static dbus_bool_t -do_authentication (DBusTransport *transport, - dbus_bool_t do_reading, - dbus_bool_t do_writing, - dbus_bool_t *auth_completed) -{ - dbus_bool_t oom; - dbus_bool_t orig_auth_state; + _dbus_verbose ("do_writing(), have_messages = %d, fd = %d\n", + _dbus_connection_has_messages_to_send_unlocked (transport->connection), + kdbus_transport->fd); oom = FALSE; - orig_auth_state = _dbus_transport_get_is_authenticated (transport); - - /* This is essential to avoid the check_write_watch() at the end, - * we don't want to add a write watch in do_iteration before - * we try writing and get EAGAIN - */ - if (orig_auth_state) + while (!transport->disconnected && _dbus_connection_has_messages_to_send_unlocked (transport->connection)) { - if (auth_completed) - *auth_completed = FALSE; - return TRUE; - } - - _dbus_transport_ref (transport); - - while (!_dbus_transport_get_is_authenticated (transport) && - _dbus_transport_get_is_connected (transport)) - { - if (!exchange_credentials (transport, do_reading, do_writing)) + int bytes_written; + DBusMessage *message; + const DBusString *header; + const DBusString *body; + int total_bytes_to_write; + const char* pDestination; + + if (total > kdbus_transport->max_bytes_written_per_iteration) { - /* OOM */ - oom = TRUE; + _dbus_verbose ("%d bytes exceeds %d bytes written per iteration, returning\n", + total, kdbus_transport->max_bytes_written_per_iteration); goto out; } - if (transport->send_credentials_pending || - transport->receive_credentials_pending) + message = _dbus_connection_get_message_to_send (transport->connection); + _dbus_assert (message != NULL); + if(dbus_message_get_sender(message) == NULL) //needed for daemon to pass pending activation messages { - _dbus_verbose ("send_credentials_pending = %d receive_credentials_pending = %d\n", - transport->send_credentials_pending, - transport->receive_credentials_pending); - goto out; + dbus_message_unlock(message); + dbus_message_set_sender(message, kdbus_transport->sender); + dbus_message_lock (message); } + _dbus_message_get_network_data (message, &header, &body); + total_bytes_to_write = _dbus_string_get_length(header) + _dbus_string_get_length(body); + pDestination = dbus_message_get_destination(message); -#define TRANSPORT_SIDE(t) ((t)->is_server ? "server" : "client") - switch (_dbus_auth_do_work (transport->auth)) + if(pDestination) { - case DBUS_AUTH_STATE_WAITING_FOR_INPUT: - _dbus_verbose (" %s auth state: waiting for input\n", - TRANSPORT_SIDE (transport)); - if (!do_reading || !read_data_into_auth (transport, &oom)) - goto out; - break; - - case DBUS_AUTH_STATE_WAITING_FOR_MEMORY: - _dbus_verbose (" %s auth state: waiting for memory\n", - TRANSPORT_SIDE (transport)); - oom = TRUE; - goto out; - break; - - case DBUS_AUTH_STATE_HAVE_BYTES_TO_SEND: - _dbus_verbose (" %s auth state: bytes to send\n", - TRANSPORT_SIDE (transport)); - if (!do_writing || !write_data_from_auth (transport)) - goto out; - break; - - case DBUS_AUTH_STATE_NEED_DISCONNECT: - _dbus_verbose (" %s auth state: need to disconnect\n", - TRANSPORT_SIDE (transport)); - do_io_error (transport); - break; - - case DBUS_AUTH_STATE_AUTHENTICATED: - _dbus_verbose (" %s auth state: authenticated\n", - TRANSPORT_SIDE (transport)); - break; - } - } - - out: - if (auth_completed) - *auth_completed = (orig_auth_state != _dbus_transport_get_is_authenticated (transport)); - - check_read_watch (transport); - check_write_watch (transport); - _dbus_transport_unref (transport); - - if (oom) - return FALSE; - else - return TRUE; -} - -/* returns false on oom */ -static dbus_bool_t -do_writing (DBusTransport *transport) -{ -// int total; - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - dbus_bool_t oom; - - /* No messages without authentication! */ - if (!_dbus_transport_get_is_authenticated (transport)) - { - _dbus_verbose ("Not authenticated, not writing anything\n"); - return TRUE; - } - - if (transport->disconnected) - { - _dbus_verbose ("Not connected, not writing anything\n"); - return TRUE; - } - -#if 1 - _dbus_verbose ("do_writing(), have_messages = %d, fd = %d\n", - _dbus_connection_has_messages_to_send_unlocked (transport->connection), - socket_transport->fd); -#endif - - oom = FALSE; -// total = 0; - - while (!transport->disconnected && _dbus_connection_has_messages_to_send_unlocked (transport->connection)) - { - int bytes_written; - DBusMessage *message; - const DBusString *header; - const DBusString *body; - int total_bytes_to_write; - const char* pDestination; - - /* if (total > socket_transport->max_bytes_written_per_iteration) - { - _dbus_verbose ("%d bytes exceeds %d bytes written per iteration, returning\n", - total, socket_transport->max_bytes_written_per_iteration); - goto out; - }*/ - - message = _dbus_connection_get_message_to_send (transport->connection); - _dbus_assert (message != NULL); - dbus_message_lock (message); - _dbus_message_get_network_data (message, &header, &body); - total_bytes_to_write = _dbus_string_get_length(header) + _dbus_string_get_length(body); - pDestination = dbus_message_get_destination(message); - - if(pDestination) - { - if(!strcmp(pDestination, "org.freedesktop.DBus")) - { - if(emulateOrgFreedesktopDBus(transport, message, socket_transport->fd)) - bytes_written = total_bytes_to_write; - else - bytes_written = -1; - goto written; - } - } - if (_dbus_auth_needs_encoding (transport->auth)) - { - if (_dbus_string_get_length (&socket_transport->encoded_outgoing) == 0) + if(!strcmp(pDestination, DBUS_SERVICE_DBUS)) { - if (!_dbus_auth_encode_data (transport->auth, - header, &socket_transport->encoded_outgoing)) + if(!strcmp(dbus_message_get_interface(message), DBUS_INTERFACE_DBUS)) { - oom = TRUE; - goto out; - } - - if (!_dbus_auth_encode_data (transport->auth, - body, &socket_transport->encoded_outgoing)) - { - _dbus_string_set_length (&socket_transport->encoded_outgoing, 0); - oom = TRUE; - goto out; + int ret; + + ret = emulateOrgFreedesktopDBus(transport, message); + if(ret < 0) + { + bytes_written = -1; + goto written; + } + else if(ret == 0) + { + bytes_written = total_bytes_to_write; + goto written; + } + //else send to "daemon" as to normal recipient } } - - total_bytes_to_write = _dbus_string_get_length (&socket_transport->encoded_outgoing); - if(total_bytes_to_write > socket_transport->max_bytes_written_per_iteration) - return -E2BIG; //todo to be changed because large messages are now sent through memfd - - bytes_written = kdbus_write_msg(socket_transport, message, TRUE); } - else - { - if(total_bytes_to_write > socket_transport->max_bytes_written_per_iteration) - return -E2BIG; //todo to be changed because large messages are now sent through memfd - bytes_written = kdbus_write_msg(socket_transport, message, FALSE); - } + bytes_written = kdbus_write_msg(kdbus_transport, message, pDestination); -written: - if (bytes_written < 0) - { - /* EINTR already handled for us */ + written: + if (bytes_written < 0) + { + /* EINTR already handled for us */ /* For some discussion of why we also ignore EPIPE here, see * http://lists.freedesktop.org/archives/dbus/2008-March/009526.html */ - if (_dbus_get_is_errno_eagain_or_ewouldblock () || _dbus_get_is_errno_epipe ()) - goto out; - else - { - _dbus_verbose ("Error writing to remote app: %s\n", _dbus_strerror_from_errno ()); - do_io_error (transport); - goto out; - } - } - else - { - _dbus_verbose (" wrote %d bytes of %d\n", bytes_written, - total_bytes_to_write); - -// total += bytes_written; - socket_transport->message_bytes_written += bytes_written; + if (_dbus_get_is_errno_eagain_or_ewouldblock () || _dbus_get_is_errno_epipe ()) + goto out; + else + { + _dbus_verbose ("Error writing to remote app: %s\n", _dbus_strerror_from_errno ()); + do_io_error (transport); + goto out; + } + } + else + { + _dbus_verbose (" wrote %d bytes of %d\n", bytes_written, + total_bytes_to_write); - _dbus_assert (socket_transport->message_bytes_written <= - total_bytes_to_write); + total += bytes_written; - if (socket_transport->message_bytes_written == total_bytes_to_write) - { - socket_transport->message_bytes_written = 0; - _dbus_string_set_length (&socket_transport->encoded_outgoing, 0); - _dbus_string_compact (&socket_transport->encoded_outgoing, 2048); + _dbus_assert (bytes_written == total_bytes_to_write); - _dbus_connection_message_sent_unlocked (transport->connection, - message); - } - } + _dbus_connection_message_sent_unlocked (transport->connection, + message); + } } - out: - if (oom) - return FALSE; - else - return TRUE; + out: + if (oom) + return FALSE; + return TRUE; } /* returns false on out-of-memory */ static dbus_bool_t do_reading (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; DBusString *buffer; int bytes_read; -// int total; - dbus_bool_t oom; + dbus_bool_t oom = FALSE; + int *fds, n_fds; + int total = 0; - _dbus_verbose ("fd = %d\n",socket_transport->fd); - - /* No messages without authentication! */ - if (!_dbus_transport_get_is_authenticated (transport)) - return TRUE; - - oom = FALSE; - -// total = 0; + _dbus_verbose ("fd = %d\n",kdbus_transport->fd); again: /* See if we've exceeded max messages and need to disable reading */ check_read_watch (transport); -/* if (total > socket_transport->max_bytes_read_per_iteration) + if (total > kdbus_transport->max_bytes_read_per_iteration) { _dbus_verbose ("%d bytes exceeds %d bytes read per iteration, returning\n", - total, socket_transport->max_bytes_read_per_iteration); + total, kdbus_transport->max_bytes_read_per_iteration); goto out; - }*/ + } - _dbus_assert (socket_transport->read_watch != NULL || + _dbus_assert (kdbus_transport->read_watch != NULL || transport->disconnected); if (transport->disconnected) goto out; - if (!dbus_watch_get_enabled (socket_transport->read_watch)) + if (!dbus_watch_get_enabled (kdbus_transport->read_watch)) return TRUE; - - if (_dbus_auth_needs_decoding (transport->auth)) - { - bytes_read = kdbus_read_message(socket_transport, &socket_transport->encoded_incoming); - - _dbus_assert (_dbus_string_get_length (&socket_transport->encoded_incoming) == - bytes_read); - - if (bytes_read > 0) - { - int orig_len; - - _dbus_message_loader_get_buffer (transport->loader, &buffer); - orig_len = _dbus_string_get_length (buffer); - if (!_dbus_auth_decode_data (transport->auth, - &socket_transport->encoded_incoming, - buffer)) - { - _dbus_verbose ("Out of memory decoding incoming data\n"); - _dbus_message_loader_return_buffer (transport->loader, - buffer, - _dbus_string_get_length (buffer) - orig_len); - oom = TRUE; - goto out; - } - - _dbus_message_loader_return_buffer (transport->loader, - buffer, - _dbus_string_get_length (buffer) - orig_len); - _dbus_string_set_length (&socket_transport->encoded_incoming, 0); - _dbus_string_compact (&socket_transport->encoded_incoming, 2048); - } - } - else + + if (!_dbus_message_loader_get_unix_fds(transport->loader, &fds, &n_fds)) { - _dbus_message_loader_get_buffer (transport->loader, - &buffer); - bytes_read = kdbus_read_message(socket_transport, buffer); - _dbus_message_loader_return_buffer (transport->loader, - buffer, - bytes_read < 0 ? 0 : bytes_read); + _dbus_verbose ("Out of memory reading file descriptors\n"); + oom = TRUE; + goto out; } + _dbus_message_loader_get_buffer (transport->loader, &buffer); + + bytes_read = kdbus_read_message(kdbus_transport, buffer, fds, &n_fds); + + if (bytes_read >= 0 && n_fds > 0) + _dbus_verbose("Read %i unix fds\n", n_fds); + + _dbus_message_loader_return_buffer (transport->loader, + buffer, + bytes_read < 0 ? 0 : bytes_read); + _dbus_message_loader_return_unix_fds(transport->loader, fds, bytes_read < 0 ? 0 : n_fds); if (bytes_read < 0) { @@ -1824,7 +1398,7 @@ do_reading (DBusTransport *transport) { _dbus_verbose (" read %d bytes\n", bytes_read); -// total += bytes_read; + total += bytes_read; if (!_dbus_transport_queue_messages (transport)) { @@ -1843,38 +1417,42 @@ do_reading (DBusTransport *transport) out: if (oom) return FALSE; - else - return TRUE; + return TRUE; } +/* + * copy-paste from socket transport. + */ static dbus_bool_t unix_error_with_read_to_come (DBusTransport *itransport, DBusWatch *watch, unsigned int flags) { - DBusTransportSocket *transport = (DBusTransportSocket *) itransport; + DBusTransportKdbus *transport = (DBusTransportKdbus *) itransport; - if (!(flags & DBUS_WATCH_HANGUP || flags & DBUS_WATCH_ERROR)) - return FALSE; + if (!((flags & DBUS_WATCH_HANGUP) || (flags & DBUS_WATCH_ERROR))) + return FALSE; /* If we have a read watch enabled ... we -might have data incoming ... => handle the HANGUP there */ - if (watch != transport->read_watch && - _dbus_watch_get_enabled (transport->read_watch)) - return FALSE; + if (watch != transport->read_watch && _dbus_watch_get_enabled (transport->read_watch)) + return FALSE; - return TRUE; + return TRUE; } +/* + * copy-paste from socket transport with needed renames only. + */ static dbus_bool_t -socket_handle_watch (DBusTransport *transport, +kdbus_handle_watch (DBusTransport *transport, DBusWatch *watch, unsigned int flags) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; - _dbus_assert (watch == socket_transport->read_watch || - watch == socket_transport->write_watch); + _dbus_assert (watch == kdbus_transport->read_watch || + watch == kdbus_transport->write_watch); _dbus_assert (watch != NULL); /* If we hit an error here on a write watch, don't disconnect the transport yet because data can @@ -1888,45 +1466,24 @@ socket_handle_watch (DBusTransport *transport, return TRUE; } - if (watch == socket_transport->read_watch && + if (watch == kdbus_transport->read_watch && (flags & DBUS_WATCH_READABLE)) { - dbus_bool_t auth_finished; -#if 1 _dbus_verbose ("handling read watch %p flags = %x\n", watch, flags); -#endif - if (!do_authentication (transport, TRUE, FALSE, &auth_finished)) - return FALSE; - - /* We don't want to do a read immediately following - * a successful authentication. This is so we - * have a chance to propagate the authentication - * state further up. Specifically, we need to - * process any pending data from the auth object. - */ - if (!auth_finished) - { + if (!do_reading (transport)) { _dbus_verbose ("no memory to read\n"); return FALSE; } - } - else - { - _dbus_verbose ("Not reading anything since we just completed the authentication\n"); - } + } - else if (watch == socket_transport->write_watch && + else if (watch == kdbus_transport->write_watch && (flags & DBUS_WATCH_WRITABLE)) { -#if 1 _dbus_verbose ("handling write watch, have_outgoing_messages = %d\n", _dbus_connection_has_messages_to_send_unlocked (transport->connection)); -#endif - if (!do_authentication (transport, FALSE, TRUE, NULL)) - return FALSE; if (!do_writing (transport)) { @@ -1937,59 +1494,53 @@ socket_handle_watch (DBusTransport *transport, /* See if we still need the write watch */ check_write_watch (transport); } -#ifdef DBUS_ENABLE_VERBOSE_MODE - else - { - if (watch == socket_transport->read_watch) - _dbus_verbose ("asked to handle read watch with non-read condition 0x%x\n", - flags); - else if (watch == socket_transport->write_watch) - _dbus_verbose ("asked to handle write watch with non-write condition 0x%x\n", - flags); - else - _dbus_verbose ("asked to handle watch %p on fd %d that we don't recognize\n", - watch, dbus_watch_get_socket (watch)); - } -#endif /* DBUS_ENABLE_VERBOSE_MODE */ return TRUE; } +/* + * copy-paste from socket transport with needed renames only. + */ static void -socket_disconnect (DBusTransport *transport) +kdbus_disconnect (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; _dbus_verbose ("\n"); free_watches (transport); - _dbus_close_socket (socket_transport->fd, NULL); - socket_transport->fd = -1; + _dbus_close_socket (kdbus_transport->fd, NULL); + kdbus_transport->fd = -1; } +/* + * copy-paste from socket transport with needed renames only. + */ static dbus_bool_t -socket_connection_set (DBusTransport *transport) +kdbus_connection_set (DBusTransport *transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; - _dbus_watch_set_handler (socket_transport->write_watch, + dbus_connection_set_is_authenticated(transport->connection); //now we don't have authentication in kdbus + + _dbus_watch_set_handler (kdbus_transport->write_watch, _dbus_connection_handle_watch, transport->connection, NULL); - _dbus_watch_set_handler (socket_transport->read_watch, + _dbus_watch_set_handler (kdbus_transport->read_watch, _dbus_connection_handle_watch, transport->connection, NULL); if (!_dbus_connection_add_watch_unlocked (transport->connection, - socket_transport->write_watch)) + kdbus_transport->write_watch)) return FALSE; if (!_dbus_connection_add_watch_unlocked (transport->connection, - socket_transport->read_watch)) + kdbus_transport->read_watch)) { _dbus_connection_remove_watch_unlocked (transport->connection, - socket_transport->write_watch); + kdbus_transport->write_watch); return FALSE; } @@ -1999,7 +1550,7 @@ socket_connection_set (DBusTransport *transport) return TRUE; } -/** +/** original dbus copy-pasted comment * @todo We need to have a way to wake up the select sleep if * a new iteration request comes in with a flag (read/write) that * we're not currently serving. Otherwise a call that just reads @@ -2011,7 +1562,7 @@ kdbus_do_iteration (DBusTransport *transport, unsigned int flags, int timeout_milliseconds) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; DBusPollFD poll_fd; int poll_res; int poll_timeout; @@ -2020,9 +1571,9 @@ kdbus_do_iteration (DBusTransport *transport, flags & DBUS_ITERATION_DO_READING ? "read" : "", flags & DBUS_ITERATION_DO_WRITING ? "write" : "", timeout_milliseconds, - socket_transport->read_watch, - socket_transport->write_watch, - socket_transport->fd); + kdbus_transport->read_watch, + kdbus_transport->write_watch, + kdbus_transport->fd); /* the passed in DO_READING/DO_WRITING flags indicate whether to * read/write messages, but regardless of those we may need to block @@ -2030,11 +1581,11 @@ kdbus_do_iteration (DBusTransport *transport, * we don't want to read any messages yet if not given DO_READING. */ - poll_fd.fd = socket_transport->fd; - poll_fd.events = 0; + poll_fd.fd = kdbus_transport->fd; + poll_fd.events = 0; - if (_dbus_transport_get_is_authenticated (transport)) - { + if (_dbus_transport_try_to_authenticate (transport)) + { /* This is kind of a hack; if we have stuff to write, then try * to avoid the poll. This is probably about a 5% speedup on an * echo client/server. @@ -2049,44 +1600,42 @@ kdbus_do_iteration (DBusTransport *transport, !(flags & (DBUS_ITERATION_DO_READING | DBUS_ITERATION_BLOCK)) && !transport->disconnected && _dbus_connection_has_messages_to_send_unlocked (transport->connection)) - { - do_writing (transport); + { + do_writing (transport); - if (transport->disconnected || + if (transport->disconnected || !_dbus_connection_has_messages_to_send_unlocked (transport->connection)) goto out; - } + } /* If we get here, we decided to do the poll() after all */ - _dbus_assert (socket_transport->read_watch); + _dbus_assert (kdbus_transport->read_watch); if (flags & DBUS_ITERATION_DO_READING) - poll_fd.events |= _DBUS_POLLIN; + poll_fd.events |= _DBUS_POLLIN; - _dbus_assert (socket_transport->write_watch); + _dbus_assert (kdbus_transport->write_watch); if (flags & DBUS_ITERATION_DO_WRITING) - poll_fd.events |= _DBUS_POLLOUT; - } - else - { + poll_fd.events |= _DBUS_POLLOUT; + } + else + { DBusAuthState auth_state; auth_state = _dbus_auth_do_work (transport->auth); - if (transport->receive_credentials_pending || - auth_state == DBUS_AUTH_STATE_WAITING_FOR_INPUT) - poll_fd.events |= _DBUS_POLLIN; + if (transport->receive_credentials_pending || auth_state == DBUS_AUTH_STATE_WAITING_FOR_INPUT) + poll_fd.events |= _DBUS_POLLIN; - if (transport->send_credentials_pending || - auth_state == DBUS_AUTH_STATE_HAVE_BYTES_TO_SEND) - poll_fd.events |= _DBUS_POLLOUT; - } + if (transport->send_credentials_pending || auth_state == DBUS_AUTH_STATE_HAVE_BYTES_TO_SEND) + poll_fd.events |= _DBUS_POLLOUT; + } - if (poll_fd.events) - { + if (poll_fd.events) + { if (flags & DBUS_ITERATION_BLOCK) - poll_timeout = timeout_milliseconds; + poll_timeout = timeout_milliseconds; else - poll_timeout = 0; + poll_timeout = 0; /* For blocking selects we drop the connection lock here * to avoid blocking out connection access during a potentially @@ -2094,65 +1643,53 @@ kdbus_do_iteration (DBusTransport *transport, * by the io_path_cond condvar, so we won't reenter this. */ if (flags & DBUS_ITERATION_BLOCK) - { - _dbus_verbose ("unlock pre poll\n"); - _dbus_connection_unlock (transport->connection); - } + { + _dbus_verbose ("unlock pre poll\n"); + _dbus_connection_unlock (transport->connection); + } again: poll_res = _dbus_poll (&poll_fd, 1, poll_timeout); if (poll_res < 0 && _dbus_get_is_errno_eintr ()) { - _dbus_verbose ("Error from _dbus_poll(): %s\n", - _dbus_strerror_from_errno ()); - goto again; + _dbus_verbose ("Error from _dbus_poll(): %s\n", _dbus_strerror_from_errno ()); + goto again; } if (flags & DBUS_ITERATION_BLOCK) - { - _dbus_verbose ("lock post poll\n"); - _dbus_connection_lock (transport->connection); - } + { + _dbus_verbose ("lock post poll\n"); + _dbus_connection_lock (transport->connection); + } if (poll_res >= 0) - { - if (poll_res == 0) + { + if (poll_res == 0) poll_fd.revents = 0; /* some concern that posix does not guarantee this; * valgrind flags it as an error. though it probably * is guaranteed on linux at least. */ - if (poll_fd.revents & _DBUS_POLLERR) + if (poll_fd.revents & _DBUS_POLLERR) do_io_error (transport); - else - { - dbus_bool_t need_read = (poll_fd.revents & _DBUS_POLLIN) > 0; - dbus_bool_t need_write = (poll_fd.revents & _DBUS_POLLOUT) > 0; - dbus_bool_t authentication_completed; + else + { + dbus_bool_t need_read = (poll_fd.revents & _DBUS_POLLIN) > 0; + dbus_bool_t need_write = (poll_fd.revents & _DBUS_POLLOUT) > 0; - _dbus_verbose ("in iteration, need_read=%d need_write=%d\n", + _dbus_verbose ("in iteration, need_read=%d need_write=%d\n", need_read, need_write); - do_authentication (transport, need_read, need_write, - &authentication_completed); - - /* See comment in socket_handle_watch. */ - if (authentication_completed) - goto out; - if (need_read && (flags & DBUS_ITERATION_DO_READING)) - do_reading (transport); - if (need_write && (flags & DBUS_ITERATION_DO_WRITING)) - do_writing (transport); - } - } + if (need_read && (flags & DBUS_ITERATION_DO_READING)) + do_reading (transport); + if (need_write && (flags & DBUS_ITERATION_DO_WRITING)) + do_writing (transport); + } + } else - { - _dbus_verbose ("Error from _dbus_poll(): %s\n", - _dbus_strerror_from_errno ()); - } - } - + _dbus_verbose ("Error from _dbus_poll(): %s\n", _dbus_strerror_from_errno ()); + } out: /* We need to install the write watch only if we did not @@ -2165,111 +1702,103 @@ kdbus_do_iteration (DBusTransport *transport, * relies on the fact that running an iteration will notice that * messages are pending. */ - check_write_watch (transport); + check_write_watch (transport); - _dbus_verbose (" ... leaving do_iteration()\n"); + _dbus_verbose (" ... leaving do_iteration()\n"); } +/* + * copy-paste from socket transport with needed renames only. + */ static void -socket_live_messages_changed (DBusTransport *transport) +kdbus_live_messages_changed (DBusTransport *transport) { /* See if we should look for incoming messages again */ check_read_watch (transport); } +static dbus_bool_t +kdbus_get_kdbus_fd (DBusTransport *transport, + int *fd_p) +{ + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; + + *fd_p = kdbus_transport->fd; + + return TRUE; +} + static const DBusTransportVTable kdbus_vtable = { - socket_finalize, - socket_handle_watch, - socket_disconnect, - socket_connection_set, + transport_finalize, + kdbus_handle_watch, + kdbus_disconnect, + kdbus_connection_set, kdbus_do_iteration, - socket_live_messages_changed, - socket_get_socket_fd + kdbus_live_messages_changed, + kdbus_get_kdbus_fd }; /** * Creates a new transport for the given kdbus file descriptor. The file - * descriptor must be nonblocking (use _dbus_set_fd_nonblocking() to - * make it so). + * descriptor must be nonblocking. * * @param fd the file descriptor. - * @param server_guid non-#NULL if this transport is on the server side of a connection * @param address the transport's address * @returns the new transport, or #NULL if no memory. */ static DBusTransport* -_dbus_transport_new_for_socket_kdbus (int fd, - const DBusString *server_guid, - const DBusString *address) +_dbus_transport_new_kdbus_transport (int fd, const DBusString *address) { - DBusTransportSocket *socket_transport; + DBusTransportKdbus *kdbus_transport; - socket_transport = dbus_new0 (DBusTransportSocket, 1); - if (socket_transport == NULL) + kdbus_transport = dbus_new0 (DBusTransportKdbus, 1); + if (kdbus_transport == NULL) return NULL; - if (!_dbus_string_init (&socket_transport->encoded_outgoing)) - goto failed_0; - - if (!_dbus_string_init (&socket_transport->encoded_incoming)) - goto failed_1; - - socket_transport->write_watch = _dbus_watch_new (fd, + kdbus_transport->write_watch = _dbus_watch_new (fd, DBUS_WATCH_WRITABLE, FALSE, NULL, NULL, NULL); - if (socket_transport->write_watch == NULL) + if (kdbus_transport->write_watch == NULL) goto failed_2; - socket_transport->read_watch = _dbus_watch_new (fd, + kdbus_transport->read_watch = _dbus_watch_new (fd, DBUS_WATCH_READABLE, FALSE, NULL, NULL, NULL); - if (socket_transport->read_watch == NULL) + if (kdbus_transport->read_watch == NULL) goto failed_3; - if (!_dbus_transport_init_base (&socket_transport->base, + if (!_dbus_transport_init_base (&kdbus_transport->base, &kdbus_vtable, - server_guid, address)) + NULL, address)) goto failed_4; -#ifdef HAVE_UNIX_FD_PASSING - _dbus_auth_set_unix_fd_possible(socket_transport->base.auth, _dbus_socket_can_pass_unix_fd(fd)); -#endif - - socket_transport->fd = fd; - socket_transport->message_bytes_written = 0; + kdbus_transport->fd = fd; /* These values should probably be tunable or something. */ - socket_transport->max_bytes_read_per_iteration = RECEIVE_POOL_SIZE; - socket_transport->max_bytes_written_per_iteration = MEMFD_POOL_SIZE; + kdbus_transport->max_bytes_read_per_iteration = 16384; + kdbus_transport->max_bytes_written_per_iteration = 16384; - socket_transport->kdbus_mmap_ptr = NULL; - socket_transport->memfd = -1; - socket_transport->memfd_buf = NULL; - socket_transport->memfd_started = FALSE; - - return (DBusTransport*) socket_transport; + kdbus_transport->kdbus_mmap_ptr = NULL; + kdbus_transport->memfd = -1; + + return (DBusTransport*) kdbus_transport; failed_4: - _dbus_watch_invalidate (socket_transport->read_watch); - _dbus_watch_unref (socket_transport->read_watch); + _dbus_watch_invalidate (kdbus_transport->read_watch); + _dbus_watch_unref (kdbus_transport->read_watch); failed_3: - _dbus_watch_invalidate (socket_transport->write_watch); - _dbus_watch_unref (socket_transport->write_watch); + _dbus_watch_invalidate (kdbus_transport->write_watch); + _dbus_watch_unref (kdbus_transport->write_watch); failed_2: - _dbus_string_free (&socket_transport->encoded_incoming); - failed_1: - _dbus_string_free (&socket_transport->encoded_outgoing); - failed_0: - dbus_free (socket_transport); + dbus_free (kdbus_transport); return NULL; } - /** - * Creates a connection to the kdbus bus - * + * Opens a connection to the kdbus bus + * * This will set FD_CLOEXEC for the socket returned. * * @param path the path to UNIX domain socket @@ -2290,22 +1819,11 @@ static int _dbus_connect_kdbus (const char *path, DBusError *error) return fd; } -static dbus_bool_t kdbus_mmap(DBusTransport* transport) -{ - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - - socket_transport->kdbus_mmap_ptr = mmap(NULL, RECEIVE_POOL_SIZE, PROT_READ, MAP_SHARED, socket_transport->fd, 0); - if (socket_transport->kdbus_mmap_ptr == MAP_FAILED) - return FALSE; - - return TRUE; -} - /** * Creates a new transport for kdbus. * This creates a client-side of a transport. * - * @param path the path to the domain socket. + * @param path the path to the bus. * @param error address where an error can be returned. * @returns a new transport, or #NULL on failure. */ @@ -2340,7 +1858,7 @@ static DBusTransport* _dbus_transport_new_for_kdbus (const char *path, DBusError _dbus_verbose ("Successfully connected to kdbus bus %s\n", path); - transport = _dbus_transport_new_for_socket_kdbus (fd, NULL, &address); + transport = _dbus_transport_new_kdbus_transport (fd, &address); if (transport == NULL) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); @@ -2360,7 +1878,7 @@ static DBusTransport* _dbus_transport_new_for_kdbus (const char *path, DBusError /** - * Opens kdbus transport. + * Opens kdbus transport if method from address entry is kdbus * * @param entry the address entry to try opening * @param transport_p return location for the opened transport @@ -2405,376 +1923,3 @@ DBusTransportOpenResult _dbus_transport_open_kdbus(DBusAddressEntry *entry, return DBUS_TRANSPORT_OPEN_NOT_HANDLED; } } - -static struct kdbus_policy *make_policy_name(const char *name) -{ - struct kdbus_policy *p; - __u64 size; - - size = offsetof(struct kdbus_policy, name) + strlen(name) + 1; - p = malloc(size); - if (!p) - return NULL; - memset(p, 0, size); - p->size = size; - p->type = KDBUS_POLICY_NAME; - strcpy(p->name, name); - - return p; -} - -static struct kdbus_policy *make_policy_access(__u64 type, __u64 bits, __u64 id) -{ - struct kdbus_policy *p; - __u64 size = sizeof(*p); - - p = malloc(size); - if (!p) - return NULL; - - memset(p, 0, size); - p->size = size; - p->type = KDBUS_POLICY_ACCESS; - p->access.type = type; - p->access.bits = bits; - p->access.id = id; - - return p; -} - -static void append_policy(struct kdbus_cmd_policy *cmd_policy, struct kdbus_policy *policy, __u64 max_size) -{ - struct kdbus_policy *dst = (struct kdbus_policy *) ((char *) cmd_policy + cmd_policy->size); - - if (cmd_policy->size + policy->size > max_size) - return; - - memcpy(dst, policy, policy->size); - cmd_policy->size += KDBUS_ALIGN8(policy->size); - free(policy); -} - -dbus_bool_t bus_register_policy_kdbus(const char* name, DBusConnection *connection, DBusError *error) -{ - struct kdbus_cmd_policy *cmd_policy; - struct kdbus_policy *policy; - int size = 0xffff; - int fd; - - if(!dbus_connection_get_socket(connection, &fd)) - { - dbus_set_error (error, "Failed to get fd for registering policy", NULL); - return FALSE; - } - - cmd_policy = (struct kdbus_cmd_policy *) alloca(size); - memset(cmd_policy, 0, size); - - policy = (struct kdbus_policy *) cmd_policy->policies; - cmd_policy->size = offsetof(struct kdbus_cmd_policy, policies); - - policy = make_policy_name(name); - append_policy(cmd_policy, policy, size); - - policy = make_policy_access(KDBUS_POLICY_ACCESS_USER, KDBUS_POLICY_OWN, getuid()); - append_policy(cmd_policy, policy, size); - - policy = make_policy_access(KDBUS_POLICY_ACCESS_WORLD, KDBUS_POLICY_RECV, 0); - append_policy(cmd_policy, policy, size); - - policy = make_policy_access(KDBUS_POLICY_ACCESS_WORLD, KDBUS_POLICY_SEND, 0); - append_policy(cmd_policy, policy, size); - - if (ioctl(fd, KDBUS_CMD_EP_POLICY_SET, cmd_policy) < 0) - { - dbus_set_error(error,_dbus_error_from_errno (errno), "Error setting EP policy: %s", _dbus_strerror (errno)); - return FALSE; - } - - _dbus_verbose("Policy %s set correctly\n", name); - return TRUE; -} - -dbus_bool_t bus_register_kdbus(char* name, DBusConnection *connection, DBusError *error) -{ - struct kdbus_cmd_hello hello; - int fd; - - memset(&hello, 0, sizeof(hello)); - hello.conn_flags = KDBUS_HELLO_ACCEPT_FD | - KDBUS_HELLO_ATTACH_COMM | - KDBUS_HELLO_ATTACH_EXE | - KDBUS_HELLO_ATTACH_CMDLINE | - KDBUS_HELLO_ATTACH_CAPS | - KDBUS_HELLO_ATTACH_CGROUP | - KDBUS_HELLO_ATTACH_SECLABEL | - KDBUS_HELLO_ATTACH_AUDIT; - hello.size = sizeof(struct kdbus_cmd_hello); - hello.pool_size = RECEIVE_POOL_SIZE; - - if(!dbus_connection_get_socket(connection, &fd)) - { - dbus_set_error (error, "failed to get fd for bus registration", NULL); - return FALSE; - } - if (ioctl(fd, KDBUS_CMD_HELLO, &hello)) - { - dbus_set_error(error,_dbus_error_from_errno (errno), "Failed to send hello: %s", _dbus_strerror (errno)); - return FALSE; - } - - _dbus_verbose("-- Our peer ID is: %llu\n", (unsigned long long)hello.id); - sprintf(name, "%llu", (unsigned long long)hello.id); - - if(!kdbus_mmap(dbus_connection_get_transport(connection))) - { - dbus_set_error(error,_dbus_error_from_errno (errno), "Error when mmap: %s", _dbus_strerror (errno)); - return FALSE; - } - - return TRUE; -} - -int bus_request_name_kdbus(DBusConnection *connection, const char *name, const uint64_t flags, DBusError *error) -{ - struct kdbus_cmd_name *cmd_name; - int fd; - uint64_t size = sizeof(*cmd_name) + strlen(name) + 1; - uint64_t flags_kdbus = 0; - - cmd_name = alloca(size); - - memset(cmd_name, 0, size); - strcpy(cmd_name->name, name); - cmd_name->size = size; - - if(flags & DBUS_NAME_FLAG_ALLOW_REPLACEMENT) - flags_kdbus |= KDBUS_NAME_ALLOW_REPLACEMENT; - if(!(flags & DBUS_NAME_FLAG_DO_NOT_QUEUE)) - flags_kdbus |= KDBUS_NAME_QUEUE; - if(flags & DBUS_NAME_FLAG_REPLACE_EXISTING) - flags_kdbus |= KDBUS_NAME_REPLACE_EXISTING; - - cmd_name->conn_flags = flags_kdbus; - - if(!dbus_connection_get_socket(connection, &fd)) - { - dbus_set_error (error, "failed to get fd for name request", NULL); - return -1; - } - - _dbus_verbose("Request name - flags sent: 0x%llx !!!!!!!!!\n", cmd_name->conn_flags); - - _DBUS_ASSERT_ERROR_IS_CLEAR (error); - if (ioctl(fd, KDBUS_CMD_NAME_ACQUIRE, cmd_name)) - { - dbus_set_error(error,_dbus_error_from_errno (errno), "error acquiring name: %s", _dbus_strerror (errno)); - if(errno == EEXIST) - return DBUS_REQUEST_NAME_REPLY_EXISTS; - return -1; - } - - _dbus_verbose("Request name - received flag: 0x%llx !!!!!!!!!\n", cmd_name->conn_flags); - - if(cmd_name->conn_flags & KDBUS_NAME_IN_QUEUE) - return DBUS_REQUEST_NAME_REPLY_IN_QUEUE; - else - return DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER; - //todo now 1 code is never returned - DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER -} - -/** - * Checks if the connection's transport is kdbus on the basis of its address - * - * @param pointer to the connection - * @returns TRUE if kdbus transport, otherwise FALSE - */ -dbus_bool_t dbus_transport_is_kdbus(DBusConnection *connection) -{ - const char* address = _dbus_connection_get_address(connection); - - if(address == strstr(address, "kdbus:path=")) - return TRUE; - else - return FALSE; -} - -static int parse_match_key(const char *rule, const char* key, char** pValue) -{ - const char* pBegin; - const char* pValueEnd; - int value_length = 0; - - pBegin = strstr(rule, key); - if(pBegin) - { - pBegin += strlen(key); - pValueEnd = strchr(pBegin, '\''); - if(pValueEnd) - { - value_length = pValueEnd - pBegin; - *pValue = strndup(pBegin, value_length); - if(*pValue) - { - if(strcmp(*pValue, "org.freedesktop.DBus") == 0) - value_length = -1; - _dbus_verbose ("founf for key: %s value:'%s'\n", key, *pValue); - } - } - } - return value_length; -} - -/* only part of the dbus's matching capabilities implemented in kdbus now because of different mechanism - * interface match key mapped to bloom - * sender match key mapped to src_name - * also handled org.freedesktop.dbus members: NameOwnerChanged, NameLost, NameAcquired - */ -void dbus_bus_add_match_kdbus (DBusConnection *connection, const char *rule, DBusError *error) -{ - struct kdbus_cmd_match* pCmd_match; - struct kdbus_item *pItem; - int fd; - __u64 src_id = KDBUS_MATCH_SRC_ID_ANY; - uint64_t size; - unsigned int kernel_item = 0; - int name_size; - char* pName = NULL; - char* pInterface = NULL; - - dbus_connection_get_socket(connection, &fd); - - /*parsing rule and calculating size of command*/ - size = sizeof(struct kdbus_cmd_match); - - if(strstr(rule, "member='NameOwnerChanged'")) - { - kernel_item = KDBUS_MATCH_NAME_CHANGE; - size += KDBUS_ITEM_SIZE(1); - } - else if(strstr(rule, "member='NameLost'")) - { - kernel_item = KDBUS_MATCH_NAME_REMOVE; - size += KDBUS_ITEM_SIZE(1); - } - else if(strstr(rule, "member='NameAcquired'")) - { - kernel_item = KDBUS_MATCH_NAME_ADD; - size += KDBUS_ITEM_SIZE(1); - } - - name_size = parse_match_key(rule, "interface='", &pInterface); /*actual size is not important for interface*/ - if((name_size == -1) && (kernel_item == 0)) - { - kernel_item = ~0; - size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; - } - else if(name_size > 0) - size += KDBUS_PART_HEADER_SIZE + KDBUS_BLOOM_SIZE_BYTES; - - name_size = parse_match_key(rule, "sender='", &pName); - if((name_size == -1) && (kernel_item == 0)) - { - kernel_item = ~0; - size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; - } - if(name_size > 0) - { - if(!strncmp(pName, ":1.", 3)) /*if name is unique name it must be converted to unique id*/ - { - src_id = strtoll(&pName[3], NULL, 10); - free(pName); - pName = NULL; - } - else - size += KDBUS_ITEM_SIZE(name_size + 1); - } - - pCmd_match = malloc(size); - if(pCmd_match == NULL) - goto out; - memset(pCmd_match, 0, size); - - pCmd_match->size = size; - pCmd_match->cookie = strtoll(dbus_bus_get_unique_name(connection), NULL , 10); - - pItem = pCmd_match->items; - if(kernel_item == ~0) //all signals from kernel - { - pCmd_match->src_id = 0; - pItem->type = KDBUS_MATCH_NAME_CHANGE; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; - pItem = KDBUS_PART_NEXT(pItem); - pItem->type = KDBUS_MATCH_NAME_ADD; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; - pItem = KDBUS_PART_NEXT(pItem); - pItem->type = KDBUS_MATCH_NAME_REMOVE; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; - pItem = KDBUS_PART_NEXT(pItem); - pItem->type = KDBUS_MATCH_ID_ADD; - pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64); - pItem = KDBUS_PART_NEXT(pItem); - pItem->type = KDBUS_MATCH_ID_REMOVE; - pItem->size = KDBUS_PART_HEADER_SIZE + sizeof(__u64); - } - else if(kernel_item) - { - pCmd_match->src_id = 0; - pItem->type = kernel_item; - pItem->size = KDBUS_PART_HEADER_SIZE + 1; - } - else - { - pCmd_match->src_id = src_id; - if(pName) - { - pItem->type = KDBUS_MATCH_SRC_NAME; - pItem->size = KDBUS_PART_HEADER_SIZE + name_size + 1; - strcpy(pItem->str, pName); - pItem = KDBUS_PART_NEXT(pItem); - } - - if(pInterface) - { - pItem->type = KDBUS_MATCH_BLOOM; - pItem->size = KDBUS_PART_HEADER_SIZE + KDBUS_BLOOM_SIZE_BYTES; - strncpy(pItem->data, pInterface, KDBUS_BLOOM_SIZE_BYTES); - } - } - - if(ioctl(fd, KDBUS_CMD_MATCH_ADD, pCmd_match)) - { - if(error) - dbus_set_error(error,_dbus_error_from_errno (errno), "error adding match: %s", _dbus_strerror (errno)); - _dbus_verbose("Failed adding match bus rule %s,\nerror: %d, %m\n", rule, errno); - } - else - _dbus_verbose("Added match bus rule %s\n", rule); - - free(pCmd_match); -out: - if(pName) - free(pName); - if(pInterface) - free(pInterface); -} - -void dbus_bus_remove_match_kdbus (DBusConnection *connection, const char *rule, DBusError *error) -{ - struct kdbus_cmd_match cmd; - int fd; - - dbus_connection_get_socket(connection, &fd); - cmd.cookie = strtoll(dbus_bus_get_unique_name(connection), NULL , 10); - cmd.id = cmd.cookie; - cmd.size = sizeof(struct kdbus_cmd_match); - - if(ioctl(fd, KDBUS_CMD_MATCH_ADD, &cmd)) - { - if(error) - dbus_set_error(error,_dbus_error_from_errno (errno), "error removing match: %s", _dbus_strerror (errno)); - _dbus_verbose("Failed removing match rule; error: %d, %m\n", errno); - } - else - _dbus_verbose("Match rule removed correctly.\n"); -}