X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2Fdbus-transport-kdbus.c;h=72e3d5643c29a268a2a3fc53e5c5e87afff31e23;hb=bb8dd7fec5389db4df9b5e8863974149e8a650dc;hp=3afbd08d1e948cd4cb5013229dc587ca7a17462d;hpb=3f01cbe781ec4ad688b3ba11c0bf0d32a1878975;p=platform%2Fupstream%2Fdbus.git diff --git a/dbus/dbus-transport-kdbus.c b/dbus/dbus-transport-kdbus.c index 3afbd08..72e3d56 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 + * + * Licensed under the Academic Free License version 2.1 * - * Transport layer using kdbus + * 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. * - * Created on: Jun 20, 2013 - * Author: r.pajak + * 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 @@ -29,20 +45,35 @@ #include #include #include -#include -#define KDBUS_ALIGN8(l) (((l) + 7) & ~7) -#define KDBUS_ITEM_SIZE(s) KDBUS_ALIGN8((s) + KDBUS_PART_HEADER_SIZE) +/** + * @defgroup DBusTransportKdbus DBusTransport implementations for kdbus + * @ingroup DBusInternals + * @brief Implementation details of DBusTransport on kdbus + * + * @{ + */ -#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)) +/** Size of the memory area for received non-memfd messages. */ #define RECEIVE_POOL_SIZE (10 * 1024LU * 1024LU) -#define MEMFD_SIZE_THRESHOLD (2 * 1024 * 1024LU) // over this memfd is used +/** Over this memfd is used to send (if it is not broadcast). */ +#define MEMFD_SIZE_THRESHOLD (2 * 1024 * 1024LU) + +/** Define max bytes read or written in one iteration. +* This is to avoid blocking on reading or writing for too long. It is checked after each message is sent or received, +* so if message is bigger than MAX_BYTES_PER_ITERATION it will be handled in one iteration, but sending/writing +* will break after that message. +**/ +#define MAX_BYTES_PER_ITERATION 16384 + +#if (MEMFD_SIZE_THRESHOLD > KDBUS_MSG_MAX_PAYLOAD_VEC_SIZE) + #error Memfd size threshold higher than max kdbus message payload vector size +#endif + +/** Enables verbosing more information about kdbus message. + * Works only if DBUS_VERBOSE=1 is used. + */ #define KDBUS_MSG_DECODE_DEBUG 0 #define ITER_APPEND_STR(string) \ @@ -53,40 +84,35 @@ if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &string)) \ }\ #define MSG_ITEM_BUILD_VEC(data, datasize) \ - item->type = KDBUS_MSG_PAYLOAD_VEC; \ - item->size = KDBUS_PART_HEADER_SIZE + sizeof(struct kdbus_vec); \ + item->type = KDBUS_ITEM_PAYLOAD_VEC; \ + item->size = KDBUS_ITEM_HEADER_SIZE + sizeof(struct kdbus_vec); \ item->vec.address = (unsigned long) data; \ item->vec.size = datasize; +#define KDBUS_PART_FOREACH(part, head, first) \ + for (part = (head)->first; \ + (uint8_t *)(part) < (uint8_t *)(head) + (head)->size; \ + part = KDBUS_PART_NEXT(part)) + /** - * Opaque object representing a socket file descriptor transport. + * Opaque object representing a transport. */ -typedef struct DBusTransportSocket DBusTransportSocket; +typedef struct DBusTransportKdbus DBusTransportKdbus; /** - * Implementation details of DBusTransportSocket. All members are private. + * Implementation details of DBusTransportKdbus. All members are private. */ -struct DBusTransportSocket +struct DBusTransportKdbus { DBusTransport base; /**< Parent instance */ int fd; /**< File descriptor. */ DBusWatch *read_watch; /**< Watch for readability. */ DBusWatch *write_watch; /**< Watch for writability. */ - int max_bytes_read_per_iteration; /**< In kdbus only to control overall message size*/ - int max_bytes_written_per_iteration; /**< In kdbus only to control overall message size*/ + 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. - */ - DBusString encoded_outgoing; /**< Encoded version of current - * outgoing message. - */ - DBusString encoded_incoming; /**< Encoded version of current - * incoming data. - */ - void* kdbus_mmap_ptr; /**< Mapped memory where Kdbus (kernel) writes + void* kdbus_mmap_ptr; /**< Mapped memory where kdbus (kernel) writes * messages incoming to us. */ int memfd; /**< File descriptor to special @@ -94,23 +120,37 @@ struct DBusTransportSocket * transfer. Retrieved from * Kdbus kernel module. */ - __u64 bloom_size; /**< bloom filter field size */ + __u64 bloom_size; /**< bloom filter field size */ + char* sender; /**< unique name of the sender */ }; -static dbus_bool_t -socket_get_socket_fd (DBusTransport *transport, - int *fd_p) +/** + * Gets size in bytes of bloom filter field. + * This size is got from the bus during connection procedure. + * @param transport transport + * @returns size of bloom + */ +__u64 dbus_transport_get_bloom_size(DBusTransport* transport) { - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - - *fd_p = socket_transport->fd; + return ((DBusTransportKdbus*)transport)->bloom_size; +} - return TRUE; +/** + * Gets pointer to the memory pool, wher received messages are + * placed and some ioctls return their info + * @param transport transport + * @returns pointer to the pool + */ +void* dbus_transport_get_pool_pointer(DBusTransport* transport) +{ + return ((DBusTransportKdbus*)transport)->kdbus_mmap_ptr; } -/* - * Adds locally generated message to received messages queue - * +/** + * Puts locally generated message into received messages queue + * @param message message that will be added + * @param connection connection to which message will be added + * @returns TRUE on success, FALSE on memory allocation error */ static dbus_bool_t add_message_to_received(DBusMessage *message, DBusConnection* connection) { @@ -128,7 +168,20 @@ static dbus_bool_t add_message_to_received(DBusMessage *message, DBusConnection* return TRUE; } -static dbus_bool_t reply_with_error(char* error_type, const char* template, const char* object, DBusMessage *message, DBusConnection* connection) +/** + * Generates local error message as a reply to message given as parameter + * and adds generated error message to received messages queue. + * @param error_type type of error, preferably DBUS_ERROR_(...) + * @param template Template of error description. It can has formatting + * characters to print object string into it. Can be NULL. + * @param object String to print into error description. Can be NULL. + * If object is not NULL while template is NULL, the object string + * will be the only error description. + * @param message Message for which the error reply is generated. + * @param connection The connection. + * @returns 0 on success, otherwise -1 + */ +static int reply_with_error(char* error_type, const char* template, const char* object, DBusMessage *message, DBusConnection* connection) { DBusMessage *errMessage; char* error_msg = ""; @@ -143,79 +196,107 @@ static dbus_bool_t reply_with_error(char* error_type, const char* template, cons errMessage = generate_local_error_message(dbus_message_get_serial(message), error_type, error_msg); if(errMessage == NULL) - return FALSE; + return -1; if (add_message_to_received(errMessage, connection)) - return TRUE; + return 0; - return FALSE; + return -1; } -static dbus_bool_t reply_1_data(DBusMessage *message, int data_type, void* pData, DBusConnection* connection) +/** + * 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. + * @param message The message we are replying to. + * @param data_type Type of data sent in the reply.Use DBUS_TYPE_(...) + * @param pData Address of data sent in the reply. + * @param connection The connection + * @returns 0 on success, otherwise -1 + */ +static int reply_1_data(DBusMessage *message, int data_type, void* pData, DBusConnection* connection) { DBusMessageIter args; DBusMessage *reply; reply = dbus_message_new_method_return(message); if(reply == NULL) - return FALSE; + 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)) { dbus_message_unref(reply); - return FALSE; + return -1; } if(add_message_to_received(reply, connection)) - return TRUE; + return 0; - return FALSE; + 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; +}*/ + /** - * Retrieves file descriptor to memory pool from kdbus module. - * It is then used for bulk data sending. + * Retrieves file descriptor to memory pool from kdbus module and stores + * it in kdbus_transport->memfd. It is then used to send large message. * Triggered when message payload is over MEMFD_SIZE_THRESHOLD - * + * @param kdbus_transport DBusTransportKdbus transport structure + * @returns 0 on success, otherwise -1 */ -static int kdbus_init_memfd(DBusTransportSocket* socket_transport) +static int kdbus_init_memfd(DBusTransportKdbus* kdbus_transport) { int memfd; - if (ioctl(socket_transport->fd, KDBUS_CMD_MEMFD_NEW, &memfd) < 0) { + if (ioctl(kdbus_transport->fd, KDBUS_CMD_MEMFD_NEW, &memfd) < 0) { _dbus_verbose("KDBUS_CMD_MEMFD_NEW failed: \n"); return -1; } - socket_transport->memfd = memfd; - _dbus_verbose("kdbus_init_memfd: %d!!\n", socket_transport->memfd); + kdbus_transport->memfd = memfd; + _dbus_verbose("kdbus_init_memfd: %d!!\n", kdbus_transport->memfd); return 0; } /** - * 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 + * Allocates and initializes kdbus message structure. + * @param name Well-known name or NULL. If NULL, dst_id must be supplied. + * @param dst_id Numeric id of recipient. Ignored if name is not NULL. + * @param body_size Size of message body (May be 0). + * @param use_memfd Flag to build memfd message. + * @param fds_count Number of file descriptors sent in the message. * @param transport transport - * @return initialized kdbus message + * @returns initialized kdbus message or NULL if malloc failed */ -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, DBusTransportSocket *transport) +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(use_memfd == TRUE) // bulk data - memfd - encoded and plain + 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)); - } + else + { + 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); @@ -223,7 +304,7 @@ static struct kdbus_msg* kdbus_init_msg(const char* name, __u64 dst_id, uint64_t if (name) msg_size += KDBUS_ITEM_SIZE(strlen(name) + 1); else if (dst_id == KDBUS_DST_ID_BROADCAST) - msg_size += KDBUS_PART_HEADER_SIZE + transport->bloom_size; + msg_size += KDBUS_ITEM_HEADER_SIZE + transport->bloom_size; msg = malloc(msg_size); if (!msg) @@ -234,7 +315,7 @@ static struct kdbus_msg* kdbus_init_msg(const char* name, __u64 dst_id, uint64_t memset(msg, 0, msg_size); msg->size = msg_size; - msg->payload_type = KDBUS_PAYLOAD_DBUS1; + msg->payload_type = KDBUS_PAYLOAD_DBUS; msg->dst_id = name ? 0 : dst_id; msg->src_id = strtoull(dbus_bus_get_unique_name(transport->base.connection), NULL , 10); @@ -242,536 +323,279 @@ static struct kdbus_msg* kdbus_init_msg(const char* name, __u64 dst_id, uint64_t } /** - * Builds and sends kdbus message using Dbus message. - * Decide whether used payload vector or memfd memory pool. + * Sends DBus message using kdbus. * Handles broadcasts and unicast messages, and passing of Unix fds. - * Does error handling. - * TODO refactor to be more compact + * Also can locally generate error replies on some error returned by kernel. * - * @param transport transport + * TODO refactor to be more compact - maybe we can send header always as a payload vector + * and only message body as memfd if needed. + * + * @param transport Transport. * @param message DBus message to be sent - * @param encoded flag if the message is encoded - * @return size of data sent + * @param destination Destination of the message. + * @returns bytes sent or -1 if sending failed */ -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; - uint64_t body_size = 0; - uint64_t header_size = 0; - dbus_bool_t use_memfd; - const int *unix_fds; - unsigned fds_count; - dbus_bool_t autostart; - - // 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 = strtoull(&name[3], NULL, 10); - name = NULL; - } + dst_id = KDBUS_DST_ID_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; - if(use_memfd) kdbus_init_memfd(transport); - - _dbus_message_get_unix_fds(message, &unix_fds, &fds_count); - - // init basic message fields - msg = kdbus_init_msg(name, 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; - - // build message contents - item = msg->items; - - // case 1 - bulk data transfer - memfd - encoded and plain - if(use_memfd) - { - char *buf; + _dbus_message_get_unix_fds(message, &unix_fds, &fds_count); - if(ioctl(transport->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 0) < 0) - { - _dbus_verbose("memfd sealing failed: \n"); - goto out; - } + // 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; - 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; - } + // build message contents + item = msg->items; - if(encoded) - memcpy(buf, &transport->encoded_outgoing, ret_size); - else - { - 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; - } - } + if(use_memfd) + { + char *buf; + + if(ioctl(transport->memfd, KDBUS_CMD_MEMFD_SEAL_SET, 0) < 0) + { + _dbus_verbose("memfd sealing failed: \n"); + goto out; + } - munmap(buf, ret_size); + 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; + } - // 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; - } + 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; + } - 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; - // case 2 - small encoded - don't use memfd - } else if(encoded) { - _dbus_verbose("sending encoded data\n"); - MSG_ITEM_BUILD_VEC(&transport->encoded_outgoing, _dbus_string_get_length (&transport->encoded_outgoing)); + munmap(buf, ret_size); - // case 3 - small not encoded - don't use memfd - } else { - _dbus_verbose("sending normal vector data\n"); - MSG_ITEM_BUILD_VEC(_dbus_string_get_const_data(header), header_size); + // 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; + } - if(body_size) + item->type = KDBUS_ITEM_PAYLOAD_MEMFD; + item->size = KDBUS_ITEM_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) { - _dbus_verbose("body attaching\n"); - item = KDBUS_PART_NEXT(item); - MSG_ITEM_BUILD_VEC(_dbus_string_get_const_data(body), 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) + 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); + item = KDBUS_PART_NEXT(item); + item->type = KDBUS_ITEM_FDS; + item->size = KDBUS_ITEM_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 + transport->bloom_size; - strncpy(item->data, dbus_message_get_interface(message), transport->bloom_size); - } - - again: - if (ioctl(transport->fd, KDBUS_CMD_MSG_SEND, msg)) - { - if(errno == EINTR) - goto again; - if((errno == ESRCH) || (errno == ENXIO) || (errno = EADDRNOTAVAIL)) //when recipient is not available on the bus - { - if(autostart) - { - //todo start service here, otherwise - 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; + if (destination) + { + item = KDBUS_PART_NEXT(item); + item->type = KDBUS_ITEM_DST_NAME; + item->size = KDBUS_ITEM_HEADER_SIZE + strlen(destination) + 1; + memcpy(item->str, destination, item->size - KDBUS_ITEM_HEADER_SIZE); + } + else if (dst_id == KDBUS_DST_ID_BROADCAST) + { + item = KDBUS_PART_NEXT(item); + item->type = KDBUS_ITEM_BLOOM; + item->size = KDBUS_ITEM_HEADER_SIZE + transport->bloom_size; + strncpy(item->data, dbus_message_get_interface(message), transport->bloom_size); + } - } - _dbus_verbose("kdbus error sending message: err %d (%m)\n", errno); - ret_size = -1; - } -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; } -struct nameInfo -{ - __u64 uniqueId; - __u64 userId; - __u64 processId; - __u32 sec_label_len; - char *sec_label; -}; - /** - * Performs kdbus query of id of the given name + * Performs kdbus hello - registration on the kdbus bus + * needed to send and receive messages on the bus, + * and configures transport. + * As a result unique id on he bus is obtained. * - * @param name name to query for - * @param fd bus file - * @param ownerID place to store id of the name - * @return 0 on success, -errno if failed + * @param name place to print id given by bus + * @param transportS transport structure + * @returns #TRUE on success */ -static int kdbus_NameQuery(char* name, int fd, struct nameInfo* pInfo) +static dbus_bool_t bus_register_kdbus(char* name, DBusTransportKdbus* transportS) { - struct kdbus_cmd_name_info *msg; - struct kdbus_item *item; - uint64_t size; - int ret; - uint64_t item_size; - - pInfo->sec_label_len = 0; - pInfo->sec_label = NULL; - - item_size = KDBUS_PART_HEADER_SIZE + strlen(name) + 1; - item_size = (item_size < 56) ? 56 : item_size; //at least 56 bytes are needed by kernel to place info about name, otherwise error - size = sizeof(struct kdbus_cmd_name_info) + item_size; + struct kdbus_cmd_hello __attribute__ ((__aligned__(8))) hello; + memset(&hello, 0, sizeof(hello)); - msg = malloc(size); - if (!msg) + 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; - if((name[0] == ':') && (name[1] == '1') && (name[2] == '.')) /* if name starts with ":1." it is a unique name and should be send as number */ - msg->id = strtoull(&name[3], NULL, 10); - else - msg->id = 0; - - 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: - ret = ioctl(fd, KDBUS_CMD_NAME_QUERY, msg); - if (ret < 0) - { - if(errno == EINTR) - goto again; - else if(ret == -ENOBUFS) - { - msg = realloc(msg, msg->size); //prepare memory - if(msg != NULL) - goto again; - } - pInfo->uniqueId = 0; - ret = -errno; - } - else + transportS->kdbus_mmap_ptr = mmap(NULL, RECEIVE_POOL_SIZE, PROT_READ, MAP_SHARED, transportS->fd, 0); + if (transportS->kdbus_mmap_ptr == MAP_FAILED) { - pInfo->uniqueId = msg->id; - pInfo->userId = msg->creds.uid; - pInfo->processId = msg->creds.pid; -_dbus_verbose ("I'm alive 1\n"); - item = msg->items; - while((uint8_t *)(item) < (uint8_t *)(msg) + msg->size) - { - if(item->type == KDBUS_NAME_INFO_ITEM_SECLABEL) - { - pInfo->sec_label_len = item->size - KDBUS_PART_HEADER_SIZE - 1; - if(pInfo->sec_label_len != 0) - pInfo->sec_label = malloc(pInfo->sec_label_len); - if(pInfo->sec_label == NULL) - ret = -1; - else - memcpy(pInfo->sec_label, item->data, pInfo->sec_label_len); - - break; - } - item = KDBUS_PART_NEXT(item); - } + _dbus_verbose("Error when mmap: %m, %d",errno); + return FALSE; } - free(msg); - return ret; + return TRUE; } /** - * 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. - * - * !!! Not all methods are handled !!! Doubt if it is even possible. - * If method is not handled, returns error reply org.freedesktop.DBus.Error.UnknownMethod - * - * Handled methods: - * - GetNameOwner - * - NameHasOwner - * - ListNames + * Looks over messages sent to org.freedesktop.DBus. Hello message, which performs + * registration on the bus, is captured as it must be locally converted into + * appropriate ioctl. All the rest org.freedesktop.DBus methods are left untouched + * and they are sent to dbus-daemon in the same way as every other messages. * - * Not handled methods: - * - ListActivatableNames - * - StartServiceByName - * - UpdateActivationEnvironment - * - GetConnectionUnixUser - * - GetId + * @param transport Transport + * @param message Message being sent. + * @returns 1 if it is not Hello message and it should be passed to daemon + * 0 if Hello message was handled correctly, + * -1 if Hello message was not handle correctly. */ -static dbus_bool_t emulateOrgFreedesktopDBus(DBusTransport *transport, DBusMessage *message) +static int capture_hello_message(DBusTransport *transport, const char* destination, DBusMessage *message) { - int inter_ret; - struct nameInfo info; - dbus_bool_t ret_value; - - if(!strcmp(dbus_message_get_member(message), "GetNameOwner")) //returns id of the well known name - { - char* name = NULL; - - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - inter_ret = kdbus_NameQuery(name, ((DBusTransportSocket*)transport)->fd, &info); - if(inter_ret == 0) //unique id of the name - { - char unique_name[(unsigned int)(snprintf(name, 0, "%llu", ULLONG_MAX) + sizeof(":1."))]; - const char* pString = unique_name; - - sprintf(unique_name, ":1.%llu", (unsigned long long int)info.uniqueId); - _dbus_verbose("Unique name discovered:%s\n", unique_name); - ret_value = reply_1_data(message, DBUS_TYPE_STRING, &pString, transport->connection); - } - else if(inter_ret == -ENOENT) //name has no owner - return reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Could not get owner of name '%s': no such name", name, message, transport->connection); - else - { - _dbus_verbose("kdbus error sending name query: err %d (%m)\n", errno); - ret_value = reply_with_error(DBUS_ERROR_FAILED, "Could not determine unique name for '%s'", name, message, transport->connection); - } - } - else if(!strcmp(dbus_message_get_member(message), "NameHasOwner")) //returns if name is currently registered on the bus - { - char* name = NULL; - dbus_bool_t result; - - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - inter_ret = kdbus_NameQuery(name, ((DBusTransportSocket*)transport)->fd, &info); - if((inter_ret == 0) || (inter_ret == -ENOENT)) - { - result = (inter_ret == 0) ? TRUE : FALSE; - ret_value = reply_1_data(message, DBUS_TYPE_BOOLEAN, &result, transport->connection); - } - else - { - _dbus_verbose("kdbus error checking if name exists: err %d (%m)\n", errno); - ret_value = reply_with_error(DBUS_ERROR_FAILED, "Could not determine whether name '%s' exists", name, message, transport->connection); - } - } - else if(!strcmp(dbus_message_get_member(message), "GetConnectionUnixUser")) - { - char* name = NULL; - - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - inter_ret = kdbus_NameQuery(name, ((DBusTransportSocket*)transport)->fd, &info); - if(inter_ret == 0) //name found - { - _dbus_verbose("User id:%llu\n", (unsigned long long) info.userId); - ret_value = reply_1_data(message, DBUS_TYPE_UINT32, &info.userId, transport->connection); - } - else if(inter_ret == -ENOENT) //name has no owner - return reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Could not get UID of name '%s': no such name", name, message, transport->connection); - else - { - _dbus_verbose("kdbus error determining UID: err %d (%m)\n", errno); - ret_value = reply_with_error(DBUS_ERROR_FAILED, "Could not determine UID for '%s'", name, message, transport->connection); - } - } - else if(!strcmp(dbus_message_get_member(message), "GetConnectionUnixProcessID")) - { - char* name = NULL; - - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - inter_ret = kdbus_NameQuery(name, ((DBusTransportSocket*)transport)->fd, &info); - if(inter_ret == 0) //name found - ret_value = reply_1_data(message, DBUS_TYPE_UINT32, &info.processId, transport->connection); - else if(inter_ret == -ENOENT) //name has no owner - return reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Could not get PID of name '%s': no such name", name, message, transport->connection); - else - { - _dbus_verbose("kdbus error determining PID: err %d (%m)\n", errno); - ret_value = reply_with_error(DBUS_ERROR_UNIX_PROCESS_ID_UNKNOWN,"Could not determine PID for '%s'", name, message, transport->connection); - } - } - else if(!strcmp(dbus_message_get_member(message), "ListNames")) //return all well known names on he bus - { - struct kdbus_cmd_names* pCmd; - uint64_t cmd_size; - - cmd_size = sizeof(struct kdbus_cmd_names) + KDBUS_ITEM_SIZE(1); - pCmd = malloc(cmd_size); - if(pCmd == NULL) - goto out; - pCmd->size = cmd_size; - - again: - cmd_size = 0; - if(ioctl(((DBusTransportSocket*)transport)->fd, KDBUS_CMD_NAME_LIST, pCmd)) - { - if(errno == EINTR) - goto again; - if(errno == ENOBUFS) //buffer to small to put all names into it - cmd_size = pCmd->size; //here kernel tells how much memory it needs - else - { - _dbus_verbose("kdbus error asking for name list: err %d (%m)\n",errno); - goto out; - } - } - if(cmd_size) //kernel needs more memory - { - pCmd = realloc(pCmd, cmd_size); //prepare memory - if(pCmd == NULL) - return FALSE; - goto again; //and try again - } - else - { - DBusMessage *reply; - DBusMessageIter args; - struct kdbus_cmd_name* pCmd_name; - char* pName; - - reply = dbus_message_new_method_return(message); - if(reply == NULL) - goto out; - dbus_message_set_sender(reply, DBUS_SERVICE_DBUS); - dbus_message_iter_init_append(reply, &args); - - for (pCmd_name = pCmd->names; (uint8_t *)(pCmd_name) < (uint8_t *)(pCmd) + pCmd->size; pCmd_name = KDBUS_PART_NEXT(pCmd_name)) - { - pName = pCmd_name->name; - if (!dbus_message_iter_append_basic(&args, DBUS_TYPE_STRING, &pName)) - { - dbus_message_unref(reply); - goto out; - } - } - - if(add_message_to_received(reply, transport->connection)) - { - free(pCmd); - return TRUE; - } - } -out: - if(pCmd) - free(pCmd); - return FALSE; - } - else if(!strcmp(dbus_message_get_member(message), "GetId")) - { - char* path; - char uuid[DBUS_UUID_LENGTH_BYTES]; - struct stat stats; - MD5_CTX md5; - DBusString binary, encoded; - - ret_value = FALSE; - path = &transport->address[11]; //start of kdbus bus path - if(stat(path, &stats) < -1) - { - _dbus_verbose("kdbus error reading stats of bus: err %d (%m)\n", errno); - return reply_with_error(DBUS_ERROR_FAILED, "Could not determine bus '%s' uuid", path, message, transport->connection); - } - - MD5_Init(&md5); - MD5_Update(&md5, path, strlen(path)); - MD5_Update(&md5, &stats.st_ctim.tv_sec, sizeof(stats.st_ctim.tv_sec)); - MD5_Final(uuid, &md5); - - if(!_dbus_string_init (&encoded)) - goto outgid; - _dbus_string_init_const_len (&binary, uuid, DBUS_UUID_LENGTH_BYTES); - if(!_dbus_string_hex_encode (&binary, 0, &encoded, _dbus_string_get_length (&encoded))) - goto outb; - path = (char*)_dbus_string_get_const_data (&encoded); - ret_value = reply_1_data(message, DBUS_TYPE_STRING, &path, transport->connection); - - outb: - _dbus_string_free(&binary); - _dbus_string_free(&encoded); - outgid: - return ret_value; - } - else if(!strcmp(dbus_message_get_member(message), "GetAdtAuditSessionData")) - { - char* name = NULL; - - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - return reply_with_error(DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN, "Could not determine audit session data for '%s'", name, message, transport->connection); - } - else if(!strcmp(dbus_message_get_member(message), "GetConnectionSELinuxSecurityContext")) - { - char* name = NULL; - - dbus_message_get_args(message, NULL, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID); - inter_ret = kdbus_NameQuery(name, ((DBusTransportSocket*)transport)->fd, &info); - if(inter_ret == -ENOENT) //name has no owner - return reply_with_error(DBUS_ERROR_NAME_HAS_NO_OWNER, "Could not get security context of name '%s': no such name", name, message, transport->connection); - else if(inter_ret < 0) - return reply_with_error(DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN, "Could not determine security context for '%s'", name, message, transport->connection); - else - { - DBusMessage *reply; - - ret_value = FALSE; - reply = dbus_message_new_method_return(message); - if(reply != NULL) - { - dbus_message_set_sender(reply, DBUS_SERVICE_DBUS); - if (!dbus_message_append_args (reply, DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, &info.sec_label, info.sec_label_len, DBUS_TYPE_INVALID)) - dbus_message_unref(reply); - else if(add_message_to_received(reply, transport->connection)) - ret_value = TRUE; - } - } - } - else - return reply_with_error(DBUS_ERROR_UNKNOWN_METHOD, NULL, (char*)dbus_message_get_member(message), message, transport->connection); -/* else if(!strcmp(dbus_message_get_member(message), "ListActivatableNames")) //todo - { - - } - else if(!strcmp(dbus_message_get_member(message), "StartServiceByName")) - { + if(!strcmp(destination, DBUS_SERVICE_DBUS)) + { + if(!strcmp(dbus_message_get_interface(message), DBUS_INTERFACE_DBUS)) + { + if(!strcmp(dbus_message_get_member(message), "Hello")) + { + char* name = NULL; - } - else if(!strcmp(dbus_message_get_member(message), "UpdateActivationEnvironment")) - { + 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; +#ifdef POLICY_TO_KDBUS + if(!register_kdbus_policy(&name[3], transport, geteuid())) + goto out; +#endif + ((DBusTransportKdbus*)transport)->sender = name; - } - else if(!strcmp(dbus_message_get_member(message), "ReloadConfig")) - { + if(!reply_1_data(message, DBUS_TYPE_STRING, &name, transport->connection)) + return 0; //on success we can not free name - } - */ + out: + free(name); + return -1; + } + } + } - if(info.sec_label) - free(info.sec_label); - return ret_value; + return 1; //send message to daemon } #if KDBUS_MSG_DECODE_DEBUG == 1 @@ -804,48 +628,47 @@ struct kdbus_enum_table { } const char *enum_MSG(long long id); TABLE(MSG) = { - ENUM(_KDBUS_MSG_NULL), - ENUM(KDBUS_MSG_PAYLOAD_VEC), - ENUM(KDBUS_MSG_PAYLOAD_OFF), - ENUM(KDBUS_MSG_PAYLOAD_MEMFD), - ENUM(KDBUS_MSG_FDS), - ENUM(KDBUS_MSG_BLOOM), - ENUM(KDBUS_MSG_DST_NAME), - ENUM(KDBUS_MSG_SRC_CREDS), - ENUM(KDBUS_MSG_SRC_PID_COMM), - ENUM(KDBUS_MSG_SRC_TID_COMM), - ENUM(KDBUS_MSG_SRC_EXE), - ENUM(KDBUS_MSG_SRC_CMDLINE), - ENUM(KDBUS_MSG_SRC_CGROUP), - ENUM(KDBUS_MSG_SRC_CAPS), - ENUM(KDBUS_MSG_SRC_SECLABEL), - ENUM(KDBUS_MSG_SRC_AUDIT), - ENUM(KDBUS_MSG_SRC_NAMES), - ENUM(KDBUS_MSG_TIMESTAMP), - ENUM(KDBUS_MSG_NAME_ADD), - ENUM(KDBUS_MSG_NAME_REMOVE), - ENUM(KDBUS_MSG_NAME_CHANGE), - ENUM(KDBUS_MSG_ID_ADD), - ENUM(KDBUS_MSG_ID_REMOVE), - ENUM(KDBUS_MSG_REPLY_TIMEOUT), - ENUM(KDBUS_MSG_REPLY_DEAD), + ENUM(_KDBUS_ITEM_NULL), + ENUM(KDBUS_ITEM_PAYLOAD_VEC), + ENUM(KDBUS_ITEM_PAYLOAD_OFF), + ENUM(KDBUS_ITEM_PAYLOAD_MEMFD), + ENUM(KDBUS_ITEM_FDS), + ENUM(KDBUS_ITEM_BLOOM), + ENUM(KDBUS_ITEM_DST_NAME), + ENUM(KDBUS_ITEM_CREDS), + ENUM(KDBUS_ITEM_PID_COMM), + ENUM(KDBUS_ITEM_TID_COMM), + ENUM(KDBUS_ITEM_EXE), + ENUM(KDBUS_ITEM_CMDLINE), + ENUM(KDBUS_ITEM_CGROUP), + ENUM(KDBUS_ITEM_CAPS), + ENUM(KDBUS_ITEM_SECLABEL), + ENUM(KDBUS_ITEM_AUDIT), + ENUM(KDBUS_ITEM_NAME), + ENUM(KDBUS_ITEM_TIMESTAMP), + ENUM(KDBUS_ITEM_NAME_ADD), + ENUM(KDBUS_ITEM_NAME_REMOVE), + ENUM(KDBUS_ITEM_NAME_CHANGE), + ENUM(KDBUS_ITEM_ID_ADD), + ENUM(KDBUS_ITEM_ID_REMOVE), + ENUM(KDBUS_ITEM_REPLY_TIMEOUT), + ENUM(KDBUS_ITEM_REPLY_DEAD), }; LOOKUP(MSG); const char *enum_PAYLOAD(long long id); TABLE(PAYLOAD) = { ENUM(KDBUS_PAYLOAD_KERNEL), - ENUM(KDBUS_PAYLOAD_DBUS1), - ENUM(KDBUS_PAYLOAD_GVARIANT), + ENUM(KDBUS_PAYLOAD_DBUS), }; LOOKUP(PAYLOAD); /** - * Puts locally generated message into received data buffer. - * Use only during receiving phase! + * Finalizes locally generated DBus message + * and puts it into data buffer. * - * @param message message to load - * @param data place to load message - * @return size of message + * @param message Message to load. + * @param data Place to load message. + * @returns Size of message loaded. */ static int put_message_into_data(DBusMessage *message, char* data) { @@ -854,6 +677,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); @@ -862,31 +686,65 @@ static int put_message_into_data(DBusMessage *message, char* data) size = _dbus_string_get_length(body); memcpy(data, _dbus_string_get_const_data(body), size); ret_size += size; - dbus_message_unref(message); return ret_size; } + /** - * 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. + * Calculates length of the kdbus message content (payload). * * @param msg kdbus message - * @param data place to copy dbus message to - * @param socket_transport transport + * @return the length of the kdbus message's payload. + */ +static int kdbus_message_size(const struct kdbus_msg* msg) +{ + const struct kdbus_item *item; + int ret_size = 0; + + KDBUS_PART_FOREACH(item, msg, items) + { + if (item->size < KDBUS_ITEM_HEADER_SIZE) + { + _dbus_verbose(" +%s (%llu bytes) invalid data record\n", enum_MSG(item->type), item->size); + return -1; + } + switch (item->type) + { + case KDBUS_ITEM_PAYLOAD_OFF: + ret_size += item->vec.size; + break; + case KDBUS_ITEM_PAYLOAD_MEMFD: + ret_size += item->memfd.size; + break; + default: + break; + } + } + + return ret_size; +} + +/** + * Decodes kdbus message in order to extract DBus message and puts it into received data buffer + * and file descriptor's buffer. Also captures kdbus error messages and kdbus kernel broadcasts + * and converts all of them into appropriate 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 + * @param n_fds place to store quantity of file descriptors received + * @return number of DBus message's bytes received or -1 on error */ -static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTransportSocket* socket_transport, int* fds, int* n_fds) +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; int ret_size = 0; DBusMessage *message = NULL; DBusMessageIter args; const char* emptyString = ""; - const char* pString = NULL; - char dbus_name[(unsigned int)(snprintf((char*)pString, 0, "%llu", ULLONG_MAX) + sizeof(":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]; @@ -904,7 +762,7 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo KDBUS_PART_FOREACH(item, msg, items) { - if (item->size <= KDBUS_PART_HEADER_SIZE) + if (item->size < KDBUS_ITEM_HEADER_SIZE) { _dbus_verbose(" +%s (%llu bytes) invalid data record\n", enum_MSG(item->type), item->size); break; //??? continue (because dbus will find error) or break @@ -912,10 +770,10 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo switch (item->type) { - case KDBUS_MSG_PAYLOAD_OFF: - memcpy(data, (char *)socket_transport->kdbus_mmap_ptr + item->vec.offset, item->vec.size); + case KDBUS_ITEM_PAYLOAD_OFF: + memcpy(data, (char *)kdbus_transport->kdbus_mmap_ptr + item->vec.offset, item->vec.size); data += item->vec.size; - ret_size += item->vec.size; + ret_size += item->vec.size; _dbus_verbose(" +%s (%llu bytes) off=%llu size=%llu\n", enum_MSG(item->type), item->size, @@ -923,22 +781,22 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo (unsigned long long)item->vec.size); break; - case KDBUS_MSG_PAYLOAD_MEMFD: + case KDBUS_ITEM_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, size, PROT_READ , MAP_SHARED, item->memfd.fd, 0); - if (buf == MAP_FAILED) + if (buf == MAP_FAILED) { _dbus_verbose("mmap() fd=%i failed:%m", item->memfd.fd); return -1; } - memcpy(data, buf, size); + memcpy(data, buf, size); data += size; ret_size += size; @@ -951,11 +809,11 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo break; } - case KDBUS_MSG_FDS: + case KDBUS_ITEM_FDS: { int i; - *n_fds = (item->size - KDBUS_PART_HEADER_SIZE) / sizeof(int); + *n_fds = (item->size - KDBUS_ITEM_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]); @@ -963,7 +821,7 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo } #if KDBUS_MSG_DECODE_DEBUG == 1 - case KDBUS_MSG_SRC_CREDS: + case KDBUS_ITEM_CREDS: _dbus_verbose(" +%s (%llu bytes) uid=%lld, gid=%lld, pid=%lld, tid=%lld, starttime=%lld\n", enum_MSG(item->type), item->size, item->creds.uid, item->creds.gid, @@ -971,19 +829,19 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo item->creds.starttime); break; - case KDBUS_MSG_SRC_PID_COMM: - case KDBUS_MSG_SRC_TID_COMM: - case KDBUS_MSG_SRC_EXE: - case KDBUS_MSG_SRC_CGROUP: - case KDBUS_MSG_SRC_SECLABEL: - case KDBUS_MSG_DST_NAME: + case KDBUS_ITEM_PID_COMM: + case KDBUS_ITEM_TID_COMM: + case KDBUS_ITEM_EXE: + case KDBUS_ITEM_CGROUP: + case KDBUS_ITEM_SECLABEL: + case KDBUS_ITEM_DST_NAME: _dbus_verbose(" +%s (%llu bytes) '%s' (%zu)\n", enum_MSG(item->type), item->size, item->str, strlen(item->str)); break; - case KDBUS_MSG_SRC_CMDLINE: - case KDBUS_MSG_SRC_NAMES: { - __u64 size = item->size - KDBUS_PART_HEADER_SIZE; + case KDBUS_ITEM_CMDLINE: + case KDBUS_ITEM_NAME: { + __u64 size = item->size - KDBUS_ITEM_HEADER_SIZE; const char *str = item->str; int count = 0; @@ -999,24 +857,24 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo break; } - case KDBUS_MSG_SRC_AUDIT: + case KDBUS_ITEM_AUDIT: _dbus_verbose(" +%s (%llu bytes) loginuid=%llu sessionid=%llu\n", enum_MSG(item->type), item->size, (unsigned long long)item->data64[0], (unsigned long long)item->data64[1]); break; - case KDBUS_MSG_SRC_CAPS: { + case KDBUS_ITEM_CAPS: { int n; const uint32_t *cap; int i; _dbus_verbose(" +%s (%llu bytes) len=%llu bytes)\n", enum_MSG(item->type), item->size, - (unsigned long long)item->size - KDBUS_PART_HEADER_SIZE); + (unsigned long long)item->size - KDBUS_ITEM_HEADER_SIZE); cap = item->data32; - n = (item->size - KDBUS_PART_HEADER_SIZE) / 4 / sizeof(uint32_t); + n = (item->size - KDBUS_ITEM_HEADER_SIZE) / 4 / sizeof(uint32_t); _dbus_verbose(" CapInh="); for (i = 0; i < n; i++) @@ -1037,7 +895,7 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo break; } - case KDBUS_MSG_TIMESTAMP: + case KDBUS_ITEM_TIMESTAMP: _dbus_verbose(" +%s (%llu bytes) realtime=%lluns monotonic=%lluns\n", enum_MSG(item->type), item->size, (unsigned long long)item->timestamp.realtime_ns, @@ -1045,7 +903,7 @@ static int kdbus_decode_msg(const struct kdbus_msg* msg, char *data, DBusTranspo break; #endif - case KDBUS_MSG_REPLY_TIMEOUT: + case KDBUS_ITEM_REPLY_TIMEOUT: _dbus_verbose(" +%s (%llu bytes) cookie=%llu\n", enum_MSG(item->type), item->size, msg->cookie_reply); @@ -1059,7 +917,7 @@ 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: + case KDBUS_ITEM_REPLY_DEAD: _dbus_verbose(" +%s (%llu bytes) cookie=%llu\n", enum_MSG(item->type), item->size, msg->cookie_reply); @@ -1073,11 +931,12 @@ 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_NAME_ADD: - _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, flags=0x%llx\n", + case KDBUS_ITEM_NAME_ADD: + _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, old flags=0x%llx, new 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); + item->name_change.new_id, item->name_change.old_flags, + item->name_change.new_flags); message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameOwnerChanged"); if(message == NULL) @@ -1098,11 +957,12 @@ 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_NAME_REMOVE: - _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, flags=0x%llx\n", + case KDBUS_ITEM_NAME_REMOVE: + _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, old flags=0x%llx, new 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); + item->name_change.new_id, item->name_change.old_flags, + item->name_change.new_flags); message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameOwnerChanged"); // name of the signal if(message == NULL) @@ -1123,11 +983,12 @@ 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_NAME_CHANGE: - _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, flags=0x%llx\n", + case KDBUS_ITEM_NAME_CHANGE: + _dbus_verbose(" +%s (%llu bytes) '%s', old id=%lld, new id=%lld, old flags=0x%llx, new 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); + item->name_change.new_id, item->name_change.old_flags, + item->name_change.new_flags); message = dbus_message_new_signal(DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS, "NameOwnerChanged"); if(message == NULL) @@ -1150,7 +1011,7 @@ 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_ID_ADD: + case KDBUS_ITEM_ID_ADD: _dbus_verbose(" +%s (%llu bytes) id=%llu flags=%llu\n", enum_MSG(item->type), (unsigned long long) item->size, (unsigned long long) item->id_change.id, @@ -1173,7 +1034,7 @@ 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_ID_REMOVE: + case KDBUS_ITEM_ID_REMOVE: _dbus_verbose(" +%s (%llu bytes) id=%llu flags=%llu\n", enum_MSG(item->type), (unsigned long long) item->size, (unsigned long long) item->id_change.id, @@ -1216,32 +1077,26 @@ out: } /** - * Reads message from kdbus and puts it into dbus buffer and fds + * Reads message from kdbus and puts it into DBus buffers * - * @param transport transport + * @param kdbus_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 + * @param fds place to store file descriptors received with the message + * @param n_fds place to store quantity of file descriptors received * @return size of received message on success, -1 on error */ -static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString *buffer, int* fds, int* n_fds) +static int kdbus_read_message(DBusTransportKdbus *kdbus_transport, DBusString *buffer, int* fds, int* n_fds) { - int ret_size; + int ret_size, buf_size; uint64_t __attribute__ ((__aligned__(8))) offset; struct kdbus_msg *msg; char *data; int start; start = _dbus_string_get_length (buffer); - if (!_dbus_string_lengthen (buffer, socket_transport->max_bytes_read_per_iteration)) - { - errno = ENOMEM; - return -1; - } - data = _dbus_string_get_data_len (buffer, start, socket_transport->max_bytes_read_per_iteration); again: - if (ioctl(socket_transport->fd, KDBUS_CMD_MSG_RECV, &offset) < 0) + if (ioctl(kdbus_transport->fd, KDBUS_CMD_MSG_RECV, &offset) < 0) { if(errno == EINTR) goto again; @@ -1250,21 +1105,40 @@ static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString return -1; } - msg = (struct kdbus_msg *)((char*)socket_transport->kdbus_mmap_ptr + offset); + msg = (struct kdbus_msg *)((char*)kdbus_transport->kdbus_mmap_ptr + offset); + + buf_size = kdbus_message_size(msg); + if (buf_size == -1) + { + _dbus_verbose("kdbus error - too short message: %d (%m)\n", errno); + return -1; + } - ret_size = kdbus_decode_msg(msg, data, socket_transport, fds, n_fds); + /* 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, kdbus_transport, fds, n_fds); if(ret_size == -1) /* error */ { _dbus_string_set_length (buffer, start); return -1; } - else + 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) + if (ioctl(kdbus_transport->fd, KDBUS_CMD_FREE, &offset) < 0) { if(errno == EINTR) goto again2; @@ -1275,60 +1149,66 @@ static int kdbus_read_message(DBusTransportSocket *socket_transport, DBusString return ret_size; } +/** + * Copy-paste from socket transport. Only renames done. + */ 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. Only done needed renames and removed + * lines related to encoded messages. + */ 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. Removed code related to authentication, + * socket_transport replaced by kdbus_transport. + */ 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) @@ -1336,115 +1216,64 @@ 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); -#ifdef DBUS_AUTHENTICATION - if (_dbus_transport_get_is_authenticated (transport)) -#endif - needed = _dbus_connection_has_messages_to_send_unlocked (transport->connection); -#ifdef DBUS_AUTHENTICATION - else - { - if (transport->send_credentials_pending) - needed = TRUE; - else - { - DBusAuthState auth_state; - - auth_state = _dbus_auth_do_work (transport->auth); + needed = _dbus_connection_has_messages_to_send_unlocked (transport->connection); - /* 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; - } - } -#endif _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. Removed code related to authentication, + * socket_transport replaced by kdbus_transport. + */ 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); -#ifdef DBUS_AUTHENTICATION - if (_dbus_transport_get_is_authenticated (transport)) -#endif - 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); -#ifdef DBUS_AUTHENTICATION - 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; - } - } -#endif _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) { @@ -1453,422 +1282,150 @@ do_io_error (DBusTransport *transport) _dbus_transport_unref (transport); } -#ifdef DBUS_AUTHENTICATION -/* 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 */ -static dbus_bool_t -write_data_from_auth (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)); - - if (bytes_written > 0) - { - _dbus_auth_bytes_sent (transport->auth, bytes_written); - 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; -} - +/** + * Based on do_writing from socket transport. + * Removed authentication code and code related to encoded messages + * and adapted to kdbus transport. + * In socket transport returns false on out-of-memory. Here this won't happen, + * so it always returns TRUE. + */ static dbus_bool_t -do_authentication (DBusTransport *transport, - dbus_bool_t do_reading, - dbus_bool_t do_writing, - dbus_bool_t *auth_completed) +do_writing (DBusTransport *transport) { - dbus_bool_t oom; - dbus_bool_t orig_auth_state; - - oom = FALSE; + DBusTransportKdbus *kdbus_transport = (DBusTransportKdbus*) transport; + int total = 0; - 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) + if (transport->disconnected) { - if (auth_completed) - *auth_completed = FALSE; + _dbus_verbose ("Not connected, not writing anything\n"); return TRUE; } - _dbus_transport_ref (transport); + _dbus_verbose ("do_writing(), have_messages = %d, fd = %d\n", + _dbus_connection_has_messages_to_send_unlocked (transport->connection), + kdbus_transport->fd); - while (!_dbus_transport_get_is_authenticated (transport) && - _dbus_transport_get_is_connected (transport)) + while (!transport->disconnected && _dbus_connection_has_messages_to_send_unlocked (transport->connection)) { - 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 = 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; -} -#endif - -/* returns false on oom */ -static dbus_bool_t -do_writing (DBusTransport *transport) -{ - DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport; - dbus_bool_t oom; + int ret; -#ifdef DBUS_AUTHENTICATION - /* No messages without authentication! */ - if (!_dbus_transport_get_is_authenticated (transport)) - { - _dbus_verbose ("Not authenticated, not writing anything\n"); - return TRUE; - } -#endif - - 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; - - 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; - - 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)) - 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) + ret = capture_hello_message(transport, pDestination, message); + if(ret < 0) //error { - if (!_dbus_auth_encode_data (transport->auth, - header, &socket_transport->encoded_outgoing)) - { - 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; - } + bytes_written = -1; + goto written; } - - 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; - - bytes_written = kdbus_write_msg(socket_transport, message, TRUE); + else if(ret == 0) //hello message captured and handled correctly + { + bytes_written = total_bytes_to_write; + goto written; + } + //else send as regular message } - else - { - if(total_bytes_to_write > socket_transport->max_bytes_written_per_iteration) - return -E2BIG; - 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); - - 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; - return TRUE; + out: + return TRUE; } -/* returns false on out-of-memory */ +/** + * Based on do_reading from socket transport. + * Removed authentication code and code related to encoded messages + * and adapted to kdbus transport. + * 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; dbus_bool_t oom = FALSE; int *fds, n_fds; + int total = 0; - _dbus_verbose ("fd = %d\n",socket_transport->fd); - -#ifdef DBUS_AUTHENTICATION - /* No messages without authentication! */ - if (!_dbus_transport_get_is_authenticated (transport)) - return TRUE; -#endif + _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); - _dbus_assert (socket_transport->read_watch != NULL || + if (total > kdbus_transport->max_bytes_read_per_iteration) + { + _dbus_verbose ("%d bytes exceeds %d bytes read per iteration, returning\n", + total, kdbus_transport->max_bytes_read_per_iteration); + goto out; + } + + _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_message_loader_get_unix_fds(transport->loader, &fds, &n_fds)) @@ -1879,32 +1436,7 @@ do_reading (DBusTransport *transport) } _dbus_message_loader_get_buffer (transport->loader, &buffer); - if (_dbus_auth_needs_decoding (transport->auth)) - { - bytes_read = kdbus_read_message(socket_transport, &socket_transport->encoded_incoming, fds, &n_fds); - - _dbus_assert (_dbus_string_get_length (&socket_transport->encoded_incoming) == bytes_read); - - if (bytes_read > 0) - { - 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)); - oom = TRUE; - goto out; - } - - _dbus_string_set_length (&socket_transport->encoded_incoming, 0); - _dbus_string_compact (&socket_transport->encoded_incoming, 2048); - } - } - else - bytes_read = kdbus_read_message(socket_transport, buffer, fds, &n_fds); + 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); @@ -1944,6 +1476,8 @@ do_reading (DBusTransport *transport) { _dbus_verbose (" read %d bytes\n", bytes_read); + total += bytes_read; + if (!_dbus_transport_queue_messages (transport)) { oom = TRUE; @@ -1964,12 +1498,15 @@ do_reading (DBusTransport *transport) return TRUE; } +/** + * Copy-paste from socket transport, with socket replaced by kdbus. + */ 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; @@ -1982,15 +1519,19 @@ unix_error_with_read_to_come (DBusTransport *itransport, return TRUE; } +/** + * Copy-paste from socket transport. Removed authentication related code + * and renamed socket_transport to kdbus_transport. + */ 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 @@ -2004,53 +1545,25 @@ socket_handle_watch (DBusTransport *transport, return TRUE; } - if (watch == socket_transport->read_watch && + if (watch == kdbus_transport->read_watch && (flags & DBUS_WATCH_READABLE)) { -#ifdef DBUS_AUTHENTICATION - dbus_bool_t auth_finished; -#endif -#if 1 _dbus_verbose ("handling read watch %p flags = %x\n", watch, flags); -#endif -#ifdef DBUS_AUTHENTICATION - 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) - { -#endif + if (!do_reading (transport)) { _dbus_verbose ("no memory to read\n"); return FALSE; } -#ifdef DBUS_AUTHENTICATION - } - else - { - _dbus_verbose ("Not reading anything since we just completed the authentication\n"); - } -#endif + } - 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 -#ifdef DBUS_AUTHENTICATION - if (!do_authentication (transport, FALSE, TRUE, NULL)) - return FALSE; -#endif + if (!do_writing (transport)) { _dbus_verbose ("no memory to write\n"); @@ -2060,59 +1573,63 @@ 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, but socket_transport renamed to kdbus_transport + * and _dbus_close_socket replaced with close(). + */ 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; + again: + if (close (kdbus_transport->fd) < 0) + { + if (errno == EINTR) + goto again; + } + + kdbus_transport->fd = -1; } +/** + * Copy-paste from socket transport. Renamed socket_transport to + * kdbus_transport and added dbus_connection_set_is_authenticated, because + * we do not perform authentication in kdbus, so we have mark is as already done + * to make everything work. + */ 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_connection_set_is_authenticated(transport->connection); //now we don't have authentication in kdbus, so mark it done - _dbus_watch_set_handler (socket_transport->write_watch, + _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; } @@ -2123,6 +1640,10 @@ socket_connection_set (DBusTransport *transport) } /** + * Copy-paste from socket_transport. + * Socket_transport renamed to kdbus_transport + * + * Original dbus copy-pasted @todo comment below. * @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 @@ -2134,7 +1655,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; @@ -2143,64 +1664,43 @@ 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); - - /* the passed in DO_READING/DO_WRITING flags indicate whether to - * read/write messages, but regardless of those we may need to block - * for reading/writing to do auth. But if we do reading for auth, - * we don't want to read any messages yet if not given DO_READING. - */ + kdbus_transport->read_watch, + kdbus_transport->write_watch, + kdbus_transport->fd); - poll_fd.fd = socket_transport->fd; + poll_fd.fd = kdbus_transport->fd; poll_fd.events = 0; - if (_dbus_transport_peek_is_authenticated (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. - * - * If both reading and writing were requested, we want to avoid this - * since it could have funky effects: - * - both ends spinning waiting for the other one to read - * data so they can finish writing - * - prioritizing all writing ahead of reading - */ - if ((flags & DBUS_ITERATION_DO_WRITING) && - !(flags & (DBUS_ITERATION_DO_READING | DBUS_ITERATION_BLOCK)) && - !transport->disconnected && - _dbus_connection_has_messages_to_send_unlocked (transport->connection)) - { - do_writing (transport); - - 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); - if (flags & DBUS_ITERATION_DO_READING) - poll_fd.events |= _DBUS_POLLIN; - - _dbus_assert (socket_transport->write_watch); - if (flags & DBUS_ITERATION_DO_WRITING) - 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->send_credentials_pending || auth_state == DBUS_AUTH_STATE_HAVE_BYTES_TO_SEND) - poll_fd.events |= _DBUS_POLLOUT; - } + /* 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. + * + * If both reading and writing were requested, we want to avoid this + * since it could have funky effects: + * - both ends spinning waiting for the other one to read + * data so they can finish writing + * - prioritizing all writing ahead of reading + */ + if ((flags & DBUS_ITERATION_DO_WRITING) && + !(flags & (DBUS_ITERATION_DO_READING | DBUS_ITERATION_BLOCK)) && + !transport->disconnected && + _dbus_connection_has_messages_to_send_unlocked (transport->connection)) + { + do_writing (transport); + + 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 (kdbus_transport->read_watch); + if (flags & DBUS_ITERATION_DO_READING) + poll_fd.events |= _DBUS_POLLIN; + + _dbus_assert (kdbus_transport->write_watch); + if (flags & DBUS_ITERATION_DO_WRITING) + poll_fd.events |= _DBUS_POLLOUT; if (poll_fd.events) { @@ -2224,10 +1724,7 @@ kdbus_do_iteration (DBusTransport *transport, 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; - } + goto again; if (flags & DBUS_ITERATION_BLOCK) { @@ -2249,20 +1746,10 @@ kdbus_do_iteration (DBusTransport *transport, { dbus_bool_t need_read = (poll_fd.revents & _DBUS_POLLIN) > 0; dbus_bool_t need_write = (poll_fd.revents & _DBUS_POLLOUT) > 0; -#ifdef DBUS_AUTHENTICATION - dbus_bool_t authentication_completed; -#endif _dbus_verbose ("in iteration, need_read=%d need_write=%d\n", need_read, need_write); -#ifdef DBUS_AUTHENTICATION - do_authentication (transport, need_read, need_write, - &authentication_completed); - /* See comment in socket_handle_watch. */ - if (authentication_completed) - goto out; -#endif if (need_read && (flags & DBUS_ITERATION_DO_READING)) do_reading (transport); if (need_write && (flags & DBUS_ITERATION_DO_WRITING)) @@ -2289,106 +1776,107 @@ kdbus_do_iteration (DBusTransport *transport, _dbus_verbose (" ... leaving do_iteration()\n"); } +/** + * Copy-paste from socket transport. + */ 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); } +/** + * Gets file descriptor of the kdbus bus. + * @param transport transport + * @param fd_p place to write fd to + * @returns always TRUE + */ +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. + * Copy-paste from dbus_transport_socket with needed changes. + * + * Creates a new transport for the given kdbus file descriptor and address. + * The file descriptor must be nonblocking. * * @param fd the file descriptor. * @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 *address) +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, NULL, address)) goto failed_4; -#ifdef DBUS_AUTHENTICATION -#ifdef HAVE_UNIX_FD_PASSING - _dbus_auth_set_unix_fd_possible(socket_transport->base.auth, _dbus_socket_can_pass_unix_fd(fd)); -#endif -#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 = DBUS_MAXIMUM_MESSAGE_LENGTH; - socket_transport->max_bytes_written_per_iteration = DBUS_MAXIMUM_MESSAGE_LENGTH; + kdbus_transport->max_bytes_read_per_iteration = MAX_BYTES_PER_ITERATION; + kdbus_transport->max_bytes_written_per_iteration = MAX_BYTES_PER_ITERATION; - socket_transport->kdbus_mmap_ptr = NULL; - socket_transport->memfd = -1; + kdbus_transport->kdbus_mmap_ptr = NULL; + kdbus_transport->memfd = -1; - return (DBusTransport*) socket_transport; + 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; } - /** * Opens a connection to the kdbus bus * - * This will set FD_CLOEXEC for the socket returned. - * - * @param path the path to UNIX domain socket + * @param path the path to kdbus bus * @param error return location for error code * @returns connection file descriptor or -1 on error */ @@ -2407,25 +1895,7 @@ static int _dbus_connect_kdbus (const char *path, DBusError *error) } /** - * maps memory pool for messages received by the kdbus transport - * - * @param transport transport - * @returns #TRUE on success, otherwise FALSE - */ -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. + * Connects to kdbus, creates and sets-up transport. * * @param path the path to the bus. * @param error address where an error can be returned. @@ -2462,7 +1932,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, &address); + transport = new_kdbus_transport (fd, &address); if (transport == NULL) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); @@ -2474,20 +1944,25 @@ static DBusTransport* _dbus_transport_new_for_kdbus (const char *path, DBusError return transport; failed_1: - _dbus_close_socket (fd, NULL); - failed_0: - _dbus_string_free (&address); - return NULL; + again: + if (close (fd) < 0) + { + if (errno == EINTR) + goto again; + } + failed_0: + _dbus_string_free (&address); + return NULL; } /** * Opens kdbus transport if method from address entry is kdbus * - * @param entry the address entry to try opening + * @param entry the address entry to open * @param transport_p return location for the opened transport - * @param error error to be set - * @returns result of the attempt + * @param error place to store error + * @returns result of the attempt as a DBusTransportOpenResult enum */ DBusTransportOpenResult _dbus_transport_open_kdbus(DBusAddressEntry *entry, DBusTransport **transport_p, @@ -2528,481 +2003,4 @@ DBusTransportOpenResult _dbus_transport_open_kdbus(DBusAddressEntry *entry, } } -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); -} - -/** - * Registers kdbus policy for given connection. - * - * Policy sets rights of the name (unique or well known) on the bus. Without policy it is - * not possible to send or receive messages. It must be set separately for unique id and - * well known name of the connection. It is set after registering on the bus, but before - * requesting for name. The policy is valid for the given name, not for the connection. - * - * Name of the policy equals name on the bus. - * - * @param name name of the policy = name of the connection - * @param connection the connection - * @param error place to store errors - * - * @returns #TRUE on success - */ -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 = 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; -} - -/** - * Kdbus part of dbus_bus_register. - * Shouldn't be used separately because it needs to be surrounded - * by other functions as it is done in dbus_bus_register. - * - * @param name place to store unique name given by bus - * @param connection the connection - * @param error place to store errors - * @returns #TRUE on success - */ -dbus_bool_t bus_register_kdbus(char* name, DBusConnection *connection, DBusError *error) -{ - struct kdbus_cmd_hello __attribute__ ((__aligned__(8))) hello; - int fd; - - 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; - } - - sprintf(name, "%llu", (unsigned long long)hello.id); - _dbus_verbose("-- Our peer ID is: %s\n", name); - ((DBusTransportSocket*)dbus_connection_get_transport(connection))->bloom_size = hello.bloom_size; - - 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; -} - -/** - * kdbus version of dbus_bus_request_name. - * - * Asks the bus to assign the given name to this connection. - * - * Use same flags as original dbus version with one exception below. - * Result flag #DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER is currently - * never returned by kdbus, instead DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER - * is returned by kdbus. - * - * @param connection the connection - * @param name the name to request - * @param flags flags - * @param error location to store the error - * @returns a result code, -1 if error is set - */ -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 - * because kdbus never returns it now - */ -} - -/** - * Checks if the connection's transport is kdbus on the basis of its address - * saves result in DBusConnection for performance. - * - * @param pointer to the connection - * @returns TRUE if kdbus transport, otherwise FALSE - */ -dbus_bool_t dbus_transport_is_kdbus(DBusConnection *connection) -{ - unsigned int is_kdbus; - - is_kdbus = dbus_connection_get_is_kdbus(connection); - if(is_kdbus == 0) - { - const char* address = _dbus_connection_get_address(connection); - - if(address) - { - if(address == strstr(address, "kdbus:path=")) - { - dbus_connection_set_is_kdbus(connection, 2); - return TRUE; - } else { - dbus_connection_set_is_kdbus(connection, 1); - return FALSE; - } - } - } - - if(is_kdbus == 2) return TRUE; - if(is_kdbus == 1) return FALSE; - - _dbus_verbose("is_kdbus is not 0 or 1 or 2. Should not happen! \n"); - return FALSE; -} - -/** - * Seeks key in rule string, and duplicates value of the key into pValue. - * If value is "org.freedesktop.DBus" it is indicated by returning -1, because it - * needs to be handled in different manner. - * Value is duplicated from rule string to newly allocated memory pointe by pValue, - * so it must be freed after use. - * - * @param rule rule to look through - * @param key key to look for - * @param pValue pointer to value of the key found - * @return length of the value string, 0 means not found, -1 means "org.freedesktop.DBus" - */ -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 ("found for key: %s value:'%s'\n", key, *pValue); - } - } - } - return value_length; -} - -/** - * Adds a match rule to match broadcast messages going through the message bus. - * Do no affect messages addressed directly. - * - * The "rule" argument is the string form of a match rule. - * - * In kdbus function do not blocks. - * - * Upper function returns nothing because of blocking issues - * so there is no point to return true or false here. - * - * Only part of the dbus's matching capabilities is implemented in kdbus now, because of different mechanism. - * Current mapping: - * interface match key mapped to bloom - * sender match key mapped to src_name - * also handled org.freedesktop.dbus members: NameOwnerChanged, NameLost, NameAcquired - * - * @param connection connection to the message bus - * @param rule textual form of match rule - * @param error location to store any errors - may be NULL - */ -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; - __u64 bloom_size = ((DBusTransportSocket*)dbus_connection_get_transport(connection))->bloom_size; - - 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 = ~0; - size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; /*std DBus: 3 name related items plus 2 id related items*/ - } - else if(strstr(rule, "member='NameChanged'")) - { - 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); - if((name_size == -1) && (kernel_item == 0)) //means org.freedesktop.DBus without specified member - { - kernel_item = ~0; - size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; /* 3 above name related items plus 2 id related items*/ - } - else if(name_size > 0) /*actual size is not important for interface because bloom size is defined by bus*/ - size += KDBUS_PART_HEADER_SIZE + bloom_size; - - name_size = parse_match_key(rule, "sender='", &pName); - if((name_size == -1) && (kernel_item == 0)) //means org.freedesktop.DBus without specified name - same as interface few line above - { - kernel_item = ~0; - size += KDBUS_ITEM_SIZE(1)*3 + KDBUS_ITEM_SIZE(sizeof(__u64))*2; /* 3 above name related items plus 2 id related items*/ - } - else if(name_size > 0) - { - if(!strncmp(pName, ":1.", 3)) /*if name is unique name it must be converted to unique id*/ - { - src_id = strtoull(&pName[3], NULL, 10); - free(pName); - pName = NULL; - } - else - size += KDBUS_ITEM_SIZE(name_size + 1); //well known name - } - - pCmd_match = alloca(size); - if(pCmd_match == NULL) - goto out; - - pCmd_match->id = 0; - pCmd_match->size = size; - pCmd_match->cookie = strtoull(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) //only one 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 + bloom_size; - strncpy(pItem->data, pInterface, bloom_size); - } - } - - 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); - -out: - if(pName) - free(pName); - if(pInterface) - free(pInterface); -} - -/** - * Opposing to dbus, in kdbus removes all match rules with given - * cookie, which now is equal to uniqe id. - * - * In kdbus this function will not block - * - * @param connection connection to the message bus - * @param error location to store any errors - may be NULL - */ -void dbus_bus_remove_match_kdbus (DBusConnection *connection, DBusError *error) -{ - struct kdbus_cmd_match __attribute__ ((__aligned__(8))) cmd; - int fd; - - dbus_connection_get_socket(connection, &fd); - cmd.cookie = strtoull(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"); -} +/** @} */